From nobody Mon Apr 29 03:45:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504776509120783.7356935333942; Thu, 7 Sep 2017 02:28:29 -0700 (PDT) Received: from localhost ([::1]:39543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpt6q-0007cY-5V for importer@patchew.org; Thu, 07 Sep 2017 05:28:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpt1S-000334-KS for qemu-devel@nongnu.org; Thu, 07 Sep 2017 05:22:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpt1N-00011k-OQ for qemu-devel@nongnu.org; Thu, 07 Sep 2017 05:22:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpt1N-00011K-Hz for qemu-devel@nongnu.org; Thu, 07 Sep 2017 05:22:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A70FDC0587D6 for ; Thu, 7 Sep 2017 09:22:48 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-66.ams2.redhat.com [10.36.116.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D10B5D6A4; Thu, 7 Sep 2017 09:22:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A70FDC0587D6 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Date: Thu, 7 Sep 2017 11:22:42 +0200 Message-Id: <1504776162-31400-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Sep 2017 09:22:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/core/qdev: Do not allow hot-plugging without hotplug controller X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D 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=3Dx (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 Reviewed-by: Igor Mammedov --- 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 valu= e, Error **errp) if (local_err !=3D 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; } =20 if (dc->realize) { --=20 1.8.3.1