Am 23.04.2013 17:59, schrieb Andreas Färber:
> Am 23.04.2013 10:29, schrieb Igor Mammedov:
>> ... to synchronize CPU state to KVM
>>
>> Signed-off-by: Igor Mammedov <[email protected]>
>> Reviewed-by: Eduardo Habkost <[email protected]>
>> ---
>> v2:
>> * linking kvm-stub.o to *-user target moved in separate patch
>
> Thanks, applied to qom-cpu:
> https://github.com/afaerber/qemu-cpu/commits/qom-cpu
To facilitate conflict resolution for future patches, I have modified
this to match other functions in there and to spare refactorings:
diff --git a/qom/cpu.c b/qom/cpu.c
index 0c76712..66f7c00 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -58,8 +58,10 @@ static ObjectClass *cpu_common_class_by_name(const
char *cpu_model)
static void cpu_common_realizefn(DeviceState *dev, Error **errp)
{
+ CPUState *cpu = CPU(dev);
+
if (dev->hotplugged) {
- cpu_synchronize_post_init(CPU(dev));
+ cpu_synchronize_post_init(cpu);
}
}
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg