On Sun, 28 Apr 2013 13:22:10 +0200 Andreas Färber <[email protected]> wrote:
> Necessary to change the name of ICCDevice's parent object field. > > Signed-off-by: Andreas Färber <[email protected]> > --- > Could any of the APIC experts please review whether I'm touching any hot > path? > Not sure if this was a mix of pre- and post-QOM code or intentional... > Thanks. > > hw/i386/kvm/apic.c | 4 ++-- > hw/intc/apic.c | 20 +++++++++++--------- > hw/intc/apic_common.c | 10 +++++----- > include/hw/cpu/icc_bus.h | 2 +- > 4 files changed, 19 insertions(+), 17 deletions(-) > [...] > > diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h > index b550070..f2c8a50 100644 > --- a/include/hw/cpu/icc_bus.h > +++ b/include/hw/cpu/icc_bus.h > @@ -51,7 +51,7 @@ typedef struct ICCBus { > */ > typedef struct ICCDevice { > /*< private >*/ > - DeviceState qdev; > + DeviceState parent_obj; This hunk doesn't apply to qpm-cpu-next. It looks like it's accidentally crept in https://github.com/afaerber/qemu-cpu/commit/a7ae7cd073cc2b20de3372edc84ec5a01e88e55d > /*< public >*/ > } ICCDevice; > > -- > 1.8.1.4 > > -- Regards, Igor
