From e378acb4047fbec4f89031dbba7fb7851042f6ee Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 26 Sep 2014 09:28:23 +0000 Subject: [PATCH] qdev: Drop hotplug check from bus_add_child() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Check is too restrictive and does not allow to add children to just created bus during hotplug when the bus is part of composite device. Removing check from bus_add_child() doesn't affect devices creatable with device_add/del commands since they have a similar builtin check and patch will allow to create complex composite devices during hotplug. Signed-off-by: Igor Mammedov Reviewed-by: Paolo Bonzini Signed-off-by: Andreas Färber --- hw/core/qdev.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index b1da409..6439a23 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -85,10 +85,6 @@ static void bus_add_child(BusState *bus, DeviceState *child) char name[32]; BusChild *kid = g_malloc0(sizeof(*kid)); - if (qdev_hotplug) { - assert(qbus_is_hotpluggable(bus)); - } - kid->index = bus->max_index++; kid->child = child; object_ref(OBJECT(kid->child)); -- 2.7.4