On Wed, 10 Apr 2013 08:21:17 +0800 li guang <lig.f...@cn.fujitsu.com> wrote:
> 在 2013-04-09二的 13:36 +0200,Paolo Bonzini写道: > > Il 08/04/2013 13:32, Igor Mammedov ha scritto: > > > > > >> > This patch should be combined with [PATCH 07/22] > > >> > > > >> > 在 2013-04-05五的 16:37 +0200,Igor Mammedov写道: > > >>> > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > > >>> > > --- > > >>> > > hw/ioapic_common.c | 2 +- > > >>> > > 1 file changed, 1 insertion(+), 1 deletion(-) > > >>> > > > > >>> > > diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c > > >>> > > index d4aff29..561b987 100644 > > >>> > > --- a/hw/ioapic_common.c > > >>> > > +++ b/hw/ioapic_common.c > > >>> > > @@ -59,7 +59,7 @@ static int ioapic_dispatch_post_load(void > > >>> > > *opaque, int version_id) > > >>> > > static int ioapic_init_common(SysBusDevice *dev) > > >>> > > { > > >>> > > - IOAPICCommonState *s = FROM_SYSBUS(IOAPICCommonState, dev); > > >>> > > + IOAPICCommonState *s = IOAPIC_COMMON(dev); > > >>> > > IOAPICCommonClass *info; > > >>> > > static int ioapic_no; > > >>> > > > > >> > > > >> > > > >> > > > > sure, will do this on the next respin. > > > > Actually no, why? It's two different files. > > because they do the same trivial thing, > do you want some mechanic changes separated? There is no point arguing, Andreas applied the first patch to qom-cpu tree already, and seems he is fine taking them as separate patches.