From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drODw-0005nt-Ex for qemu-devel@nongnu.org; Mon, 11 Sep 2017 08:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drODv-000580-LT for qemu-devel@nongnu.org; Mon, 11 Sep 2017 08:54:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drODv-00057d-FF for qemu-devel@nongnu.org; Mon, 11 Sep 2017 08:53:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CC80164837 for ; Mon, 11 Sep 2017 12:53:58 +0000 (UTC) Date: Mon, 11 Sep 2017 14:53:44 +0200 From: Igor Mammedov Message-ID: <20170911145344.4f2e192c@nial.brq.redhat.com> In-Reply-To: <1504776162-31400-1-git-send-email-thuth@redhat.com> References: <1504776162-31400-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] hw/core/qdev: Do not allow hot-plugging without hotplug controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , "Dr. David Alan Gilbert" , Juan Quintela On Thu, 7 Sep 2017 11:22:42 +0200 Thomas Huth wrote: > qdev_unplug() bails out with an assertion if the user tries to device_del > a hot-plugged device that does not have a hotplug controller. Unfortunately, > our devices are all marked with hotpluggable = true by default (see the > device_class_init() function in qdev.c), so it currently can happen that > the user runs into this situation and QEMU gets terminated unexpectedly: > > $ qemu-system-aarch64 -M virt -nographic -nodefaults -monitor stdio -S > QEMU 2.10.50 monitor - type 'help' for more information > (qemu) device_add aux-to-i2c-bridge,id=x > (qemu) device_del x > ** > ERROR:qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl) > Aborted (core dumped) > Hotplugging devices without a hotplug controller does not make much sense, > so we should disallow this during the device_add process already! > > Suggested-by: Paolo Bonzini > Signed-off-by: Thomas Huth > --- > hw/core/qdev.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 606ab53..d9ccce6 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -908,6 +908,11 @@ static void device_set_realized(Object *obj, bool value, Error **errp) > if (local_err != NULL) { > goto fail; > } > + } else if (dev->hotplugged) { > + /* Hot-plugged device without hotplug controller? No way! */ > + error_setg(&local_err, QERR_DEVICE_NO_HOTPLUG, > + object_get_typename(obj)); > + goto fail; > } > > if (dc->realize) { maybe it should be other way around, i.e, fix device so that following would work device_set_realized() if (dev->hotplugged && !dc->hotpluggable) { error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj)); return; } instead of leaving device broken, like in yours 84ebd3e watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable