From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwC53-0000uv-Pp for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwC51-0002p8-JF for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41366) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwC51-0002nv-E1 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:52:07 -0400 From: Eduardo Habkost Date: Mon, 17 Oct 2016 15:51:28 -0200 Message-Id: <1476726698-14661-12-git-send-email-ehabkost@redhat.com> In-Reply-To: <1476726698-14661-1-git-send-email-ehabkost@redhat.com> References: <1476726698-14661-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 11/21] apic: add global apic_get_class() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= From: Radim Kr=C4=8Dm=C3=A1=C5=99 Every configuration has only up to one APIC class and we'll be extending the class with a function that can be called without an instanced object, so a direct access to the class is convenient. This patch will break compilation if some code uses apic_get_class() with CONFIG_USER_ONLY. Suggested-by: Eduardo Habkost Reviewed-by: Eduardo Habkost Reviewed-by: Peter Xu Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Signed-off-by: Eduardo Habkost --- hw/intc/apic_common.c | 1 + include/hw/i386/apic_internal.h | 2 ++ target-i386/cpu.c | 13 ++++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 14ac43c..8d01c9c 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -18,6 +18,7 @@ * License along with this library; if not, see */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.h index 06c4e9f..2866848 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -222,4 +222,6 @@ static inline int apic_get_bit(uint32_t *tab, int ind= ex) return !!(tab[i] & mask); } =20 +APICCommonClass *apic_get_class(void); + #endif /* QEMU_APIC_INTERNAL_H */ diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1e8127b..5b3ad78 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2845,9 +2845,8 @@ static void mce_init(X86CPU *cpu) } =20 #ifndef CONFIG_USER_ONLY -static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) +APICCommonClass *apic_get_class(void) { - APICCommonState *apic; const char *apic_type =3D "apic"; =20 if (kvm_apic_in_kernel()) { @@ -2856,7 +2855,15 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error= **errp) apic_type =3D "xen-apic"; } =20 - cpu->apic_state =3D DEVICE(object_new(apic_type)); + return APIC_COMMON_CLASS(object_class_by_name(apic_type)); +} + +static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) +{ + APICCommonState *apic; + ObjectClass *apic_class =3D OBJECT_CLASS(apic_get_class()); + + cpu->apic_state =3D DEVICE(object_new(object_class_get_name(apic_cla= ss))); =20 object_property_add_child(OBJECT(cpu), "lapic", OBJECT(cpu->apic_state), &error_abort); --=20 2.7.4