| Message ID | 20160922210432.18680-2-rkrcmar@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Sep 22, 2016 at 11:04:28PM +0200, Radim Krčmář wrote: > 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čmář <rkrcmar@redhat.com> > --- > 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 <http://www.gnu.org/licenses/> > */ > #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) > > static const VMStateDescription vmstate_apic_common; > > +APICCommonClass *apic_class; > + > +APICCommonClass *apic_get_class(void) > +{ > + return apic_class; > +} > + > static void apic_common_realize(DeviceState *dev, Error **errp) > { > APICCommonState *s = APIC_COMMON(dev); > @@ -306,6 +314,12 @@ static void apic_common_realize(DeviceState *dev, Error **errp) > info = APIC_COMMON_GET_CLASS(s); > info->realize(dev, errp); > > + if (apic_class && apic_class != info) { > + error_report("All APICs must be of the same class."); > + exit(1); > + } Can user trigger this error? If not, I'd prefer: assert(!apic_class || apic_class == info); Thanks, -- peterx
2016-09-23 17:17+0800, Peter Xu: > On Thu, Sep 22, 2016 at 11:04:28PM +0200, Radim Krčmář wrote: >> 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čmář <rkrcmar@redhat.com> >> --- >> diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c >> @@ -306,6 +314,12 @@ static void apic_common_realize(DeviceState *dev, Error **errp) >> info = APIC_COMMON_GET_CLASS(s); >> info->realize(dev, errp); >> >> + if (apic_class && apic_class != info) { >> + error_report("All APICs must be of the same class."); >> + exit(1); >> + } > > Can user trigger this error? If not, I'd prefer: Shouldn't be able to. > assert(!apic_class || apic_class == info); I'll use that, thanks.
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 <http://www.gnu.org/licenses/> */ #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) static const VMStateDescription vmstate_apic_common; +APICCommonClass *apic_class; + +APICCommonClass *apic_get_class(void) +{ + return apic_class; +} + static void apic_common_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); @@ -306,6 +314,12 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info = APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); + if (apic_class && apic_class != info) { + error_report("All APICs must be of the same class."); + exit(1); + } + apic_class = info; + /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && ram_size >= 1024 * 1024) { diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.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 index) return !!(tab[i] & mask); } + +APICCommonClass *apic_get_class(void); + #endif /* QEMU_APIC_INTERNAL_H */
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čmář <rkrcmar@redhat.com> --- hw/intc/apic_common.c | 14 ++++++++++++++ include/hw/i386/apic_internal.h | 3 +++ 2 files changed, 17 insertions(+)