From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPt85-0005lb-Hd for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPt7z-0004KO-Ge for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPt7z-0004KJ-8H for qemu-devel@nongnu.org; Wed, 20 Jul 2016 11:09:39 -0400 From: Eduardo Habkost Date: Wed, 20 Jul 2016 12:08:28 -0300 Message-Id: <1469027314-31655-23-git-send-email-ehabkost@redhat.com> In-Reply-To: <1469027314-31655-1-git-send-email-ehabkost@redhat.com> References: <1469027314-31655-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 22/28] apic: move MAX_APICS check to 'apic' 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, Igor Mammedov From: Igor Mammedov MAX_APICS is only used by child 'apic' class and not by its parent TYPE_APIC_COMMON or any other derived class. Move check into end user 'apic' class so it won't get in the way of other APIC implementations if they support more then MAX_APICS. Signed-off-by: Igor Mammedov Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Reviewed-by: Michael S. Tsirkin Signed-off-by: Eduardo Habkost --- hw/intc/apic.c | 10 ++++++++++ hw/intc/apic_common.c | 8 -------- include/hw/i386/apic_internal.h | 4 +--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c index e1ab935..b0d237b 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -28,7 +28,9 @@ #include "trace.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" +#include "qapi/error.h" =20 +#define MAX_APICS 255 #define MAX_APIC_WORDS 8 =20 #define SYNC_FROM_VAPIC 0x1 @@ -869,6 +871,14 @@ static const MemoryRegionOps apic_io_ops =3D { static void apic_realize(DeviceState *dev, Error **errp) { APICCommonState *s =3D APIC_COMMON(dev); + static int apic_no; + + if (apic_no >=3D MAX_APICS) { + error_setg(errp, "%s initialization failed.", + object_get_typename(OBJECT(dev))); + return; + } + s->idx =3D apic_no++; =20 memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "ap= ic-msi", APIC_SPACE_SIZE); diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index e6eb694..fd425d1 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -299,14 +299,6 @@ static void apic_common_realize(DeviceState *dev, Er= ror **errp) APICCommonState *s =3D APIC_COMMON(dev); APICCommonClass *info; static DeviceState *vapic; - static int apic_no; - - if (apic_no >=3D MAX_APICS) { - error_setg(errp, "%s initialization failed.", - object_get_typename(OBJECT(dev))); - return; - } - s->idx =3D apic_no++; =20 info =3D APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_inter= nal.h index 73ce716..67348e9 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -121,8 +121,6 @@ #define VAPIC_ENABLE_BIT 0 #define VAPIC_ENABLE_MASK (1 << VAPIC_ENABLE_BIT) =20 -#define MAX_APICS 255 - typedef struct APICCommonState APICCommonState; =20 #define TYPE_APIC_COMMON "apic-common" @@ -176,7 +174,7 @@ struct APICCommonState { uint32_t initial_count; int64_t initial_count_load_time; int64_t next_time; - int idx; + int idx; /* not actually common, used only by 'apic' derived class *= / QEMUTimer *timer; int64_t timer_expiry; int sipi_vector; --=20 2.5.5