From 837d37167dc446af8a91189108b363c04609e296 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 28 Nov 2013 17:26:55 +0100 Subject: sysbus: Set cannot_instantiate_with_device_add_yet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit device_add plugs devices into suitable bus. For "real" buses, that actually connects the device. For sysbus, the connections need to be made separately, and device_add can't do that. The device would be left unconnected, and could not possibly work. Quite a few, but not all sysbus devices already set cannot_instantiate_with_device_add_yet in their class init function. Set it in their abstract base's class init function sysbus_device_class_init(), and remove the now redundant assignments from device class init functions. Signed-off-by: Markus Armbruster Reviewed-by: Marcel Apfelbaum Signed-off-by: Andreas Färber --- hw/i386/kvm/clock.c | 1 - hw/i386/kvmvapic.c | 1 - 2 files changed, 2 deletions(-) (limited to 'hw/i386') diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index abd2ce8..892aa02 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -114,7 +114,6 @@ static void kvmclock_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = kvmclock_realize; - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ dc->vmsd = &kvmclock_vmsd; } diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index f1a0a9d..44ee62a 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -827,7 +827,6 @@ static void vapic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */ dc->reset = vapic_reset; dc->vmsd = &vmstate_vapic; dc->realize = vapic_realize; -- cgit v1.1