From 0cb01a52bd8613fe7af281d8443f7ef59cf1d40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 5 Mar 2018 02:02:22 -0500 Subject: [PATCH] qom/cpu: move cpu_model null check to cpu_class_by_name() and clean every implementation. Backports commit 8301ea444abb49f7b7fb939b09c1e23b22977f30 from qemu --- qemu/qom/cpu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qemu/qom/cpu.c b/qemu/qom/cpu.c index bb2c68b8..f44a09af 100644 --- a/qemu/qom/cpu.c +++ b/qemu/qom/cpu.c @@ -203,7 +203,12 @@ static bool cpu_common_debug_check_watchpoint(CPUState *cpu, CPUWatchpoint *wp) ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename, const char *cpu_model) { - CPUClass *cc = CPU_CLASS(uc, object_class_by_name(uc, typename)); + CPUClass *cc; + + if (!cpu_model) { + return NULL; + } + cc = CPU_CLASS(uc, object_class_by_name(uc, typename)); return cc->class_by_name(uc, cpu_model); }