From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPBVx-0000Hi-VM for qemu-devel@nongnu.org; Mon, 18 Jul 2016 12:35:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPBVt-0005F3-Kf for qemu-devel@nongnu.org; Mon, 18 Jul 2016 12:35:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPBVt-0005DQ-C7 for qemu-devel@nongnu.org; Mon, 18 Jul 2016 12:35:25 -0400 Date: Mon, 18 Jul 2016 18:35:20 +0200 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Message-ID: <20160718163519.GA23807@potion> References: <1468515285-173356-1-git-send-email-imammedo@redhat.com> <1468515285-173356-9-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1468515285-173356-9-git-send-email-imammedo@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 08/16] apic: move MAX_APICS check to 'apic' class List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, pkrempa@redhat.com, ehabkost@redhat.com, mst@redhat.com, eduardo.otubo@profitbricks.com, Bandan Das , pbonzini@redhat.com 2016-07-14 18:54+0200, 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. >=20 > Signed-off-by: Igor Mammedov > --- The other two APIC implementations, for KVM a Xen, don't seem to need this extra check. Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > CC: Radim Kr=C4=8Dm=C3=A1=C5=99 > CC: pbonzini@redhat.com > --- > include/hw/i386/apic_internal.h | 4 +--- > hw/intc/apic.c | 10 ++++++++++ > hw/intc/apic_common.c | 8 -------- > 3 files changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_int= ernal.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; > 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, "= apic-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, = Error **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); > --=20 > 2.7.4 >=20