From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBBA-0005Io-HB for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnBB3-0007Vg-Pe for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBB2-0007Uv-OP for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:05 -0400 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Thu, 22 Sep 2016 23:04:28 +0200 Message-Id: <20160922210432.18680-2-rkrcmar@redhat.com> In-Reply-To: <20160922210432.18680-1-rkrcmar@redhat.com> References: <20160922210432.18680-1-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/5] apic: add global apic_get_class() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Xu , Igor Mammedov , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" 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. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- hw/intc/apic_common.c | 14 ++++++++++++++ include/hw/i386/apic_internal.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 14ac43c18666..86ef9c43e6df 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" @@ -296,6 +297,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, = int version_id) =20 static const VMStateDescription vmstate_apic_common; =20 +APICCommonClass *apic_class; + +APICCommonClass *apic_get_class(void) +{ + return apic_class; +} + static void apic_common_realize(DeviceState *dev, Error **errp) { APICCommonState *s =3D APIC_COMMON(dev); @@ -306,6 +314,12 @@ static void apic_common_realize(DeviceState *dev, Er= ror **errp) info =3D APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); =20 + if (apic_class && apic_class !=3D info) { + error_report("All APICs must be of the same class."); + exit(1); + } + apic_class =3D info; + /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && ram_size >=3D 1024 * 1024) { diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.h index 06c4e9f6f95b..9ba8a5c87f90 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -222,4 +222,7 @@ 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 */ --=20 2.10.0