From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFo59-0005ZS-Lo for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:03:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFo52-0002u2-Pq for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:03:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFo52-0002to-IF for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:03:36 -0500 From: Igor Mammedov Date: Tue, 18 Feb 2014 17:56:53 +0100 Message-Id: <1392742613-15434-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] qdev: set DeviceClass.hotpluggable default in class_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, afaerber@suse.de, anthony@codemonkey.ws, mst@redhat.com Move setting DeviceClass.hotpluggable default from class_base_init() to device's own class_init(). Reported-by: Andreas F=C3=A4rber Signed-off-by: Igor Mammedov --- hw/core/qdev.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 64b66e0..dcf331c 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -816,14 +816,6 @@ static void device_class_base_init(ObjectClass *clas= s, void *data) * so do not propagate them to the subclasses. */ klass->props =3D NULL; - - /* by default all devices were considered as hotpluggable, - * so with intent to check it in generic qdev_unplug() / - * device_set_realized() functions make every device - * hotpluggable. Devices that shouldn't be hotpluggable, - * should override it in their class_init() - */ - klass->hotpluggable =3D true; } =20 static void device_unparent(Object *obj) @@ -869,6 +861,14 @@ static void device_class_init(ObjectClass *class, vo= id *data) class->unparent =3D device_unparent; dc->realize =3D device_realize; dc->unrealize =3D device_unrealize; + + /* by default all devices were considered as hotpluggable, + * so with intent to check it in generic qdev_unplug() / + * device_set_realized() functions make every device + * hotpluggable. Devices that shouldn't be hotpluggable, + * should override it in their class_init() + */ + dc->hotpluggable =3D true; } =20 void device_reset(DeviceState *dev) --=20 1.7.1