From: Andreas Färber Date: Fri, 7 Mar 2014 18:04:13 +0000 (+0100) Subject: qdev: Fix bus dependency of DeviceState::hotpluggable getter X-Git-Tag: qemu-xen-4.5.0-rc1~118^2~30 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2b81b35f8f18d6874d1a0605ac5e40028966051b;p=qemu-upstream-4.5-testing.git qdev: Fix bus dependency of DeviceState::hotpluggable getter Commit 1a37eca107cece3ed454bae29eef0bd1fac4a244 (qdev: add "hotpluggable" property to Device) added a property "hotpluggable" to each device, with its getter accessing parent_bus->allow_hotplug. Add a NULL check. Cc: Igor Mammedov Signed-off-by: Andreas Färber --- diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 380976a06..53778938e 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -735,7 +735,8 @@ static bool device_get_hotpluggable(Object *obj, Error **err) DeviceClass *dc = DEVICE_GET_CLASS(obj); DeviceState *dev = DEVICE(obj); - return dc->hotpluggable && dev->parent_bus->allow_hotplug; + return dc->hotpluggable && (dev->parent_bus == NULL || + dev->parent_bus->allow_hotplug); } static void device_initfn(Object *obj)