From nobody Sun May 12 15:54:07 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; dmarc=fail(p=none dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544718527790718.1343304688687; Thu, 13 Dec 2018 08:28:47 -0800 (PST) Received: from localhost ([::1]:53572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXTqr-0007dM-AO for importer@patchew.org; Thu, 13 Dec 2018 11:28:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXTpA-0005xT-Ve for qemu-devel@nongnu.org; Thu, 13 Dec 2018 11:26:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXTp7-0001mB-M8 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 11:26:56 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:49766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXTp7-0001k6-D4 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 11:26:53 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wBDGOSb0033748 for ; Thu, 13 Dec 2018 11:26:52 -0500 Received: from e16.ny.us.ibm.com (e16.ny.us.ibm.com [129.33.205.206]) by mx0a-001b2d01.pphosted.com with ESMTP id 2pbtgt9wd8-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 13 Dec 2018 11:26:51 -0500 Received: from localhost by e16.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Dec 2018 16:26:50 -0000 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e16.ny.us.ibm.com (146.89.104.203) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 13 Dec 2018 16:26:47 -0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wBDGQkas12976358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 13 Dec 2018 16:26:46 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EE16228075; Thu, 13 Dec 2018 16:26:45 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C1D122806E; Thu, 13 Dec 2018 16:26:45 +0000 (GMT) Received: from akrowiak-ThinkPad-P50.endicott.ibm.com (unknown [9.60.75.235]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTPS; Thu, 13 Dec 2018 16:26:45 +0000 (GMT) From: Tony Krowiak To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 11:26:42 -0500 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18121316-0072-0000-0000-000003D8EB26 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010219; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000271; SDB=6.01131236; UDB=6.00582089; IPR=6.00911368; MB=3.00024682; MTD=3.00000008; XFM=3.00000015; UTC=2018-12-13 16:26:48 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18121316-0073-0000-0000-00004A6ECAD1 Message-Id: <1544718402-8703-1-git-send-email-akrowiak@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-12-13_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1812130141 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v2] qdev/core: Can not replug device on bus that allows one device 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: pasic@linux.ibm.com, mammedo@redhat.com, Tony Krowiak Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the maximum number of devices allowed on a bus is 1 and a device which is plugged into the bus is subsequently unplugged, attempting to repl= ug the device fails with error "Bus 'xxx' does not support hotplugging". The "error" is detected in the qbus_is_full(BusState *bus) function (qdev_monitor.c) because bus->max_index >=3D bus_class->max_dev. The root of the problem is that the bus->max_index is not decremented when a de= vice is unplugged from the bus. This patch fixes that problem. Signed-off-by: Tony Krowiak Reviewed-by: Halil Pasic Reviewed-by: Pierre Morel --- hw/core/qdev.c | 3 +++ include/hw/qdev-core.h | 1 + qdev-monitor.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6b3cc55b27c2..956923f33520 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -59,6 +59,8 @@ static void bus_remove_child(BusState *bus, DeviceState *= child) snprintf(name, sizeof(name), "child[%d]", kid->index); QTAILQ_REMOVE(&bus->children, kid, sibling); =20 + bus->num_children--; + /* This gives back ownership of kid->child back to us. */ object_property_del(OBJECT(bus), name, NULL); object_unref(OBJECT(kid->child)); @@ -73,6 +75,7 @@ static void bus_add_child(BusState *bus, DeviceState *chi= ld) char name[32]; BusChild *kid =3D g_malloc0(sizeof(*kid)); =20 + bus->num_children++; kid->index =3D bus->max_index++; kid->child =3D child; object_ref(OBJECT(kid->child)); diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index a24d0dd566e3..521f0a947ead 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -206,6 +206,7 @@ struct BusState { HotplugHandler *hotplug_handler; int max_index; bool realized; + int num_children; QTAILQ_HEAD(ChildrenHead, BusChild) children; QLIST_ENTRY(BusState) sibling; }; diff --git a/qdev-monitor.c b/qdev-monitor.c index 07147c63bf8b..45a8ba49644c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -414,7 +414,7 @@ static DeviceState *qbus_find_dev(BusState *bus, char *= elem) static inline bool qbus_is_full(BusState *bus) { BusClass *bus_class =3D BUS_GET_CLASS(bus); - return bus_class->max_dev && bus->max_index >=3D bus_class->max_dev; + return bus_class->max_dev && bus->num_children >=3D bus_class->max_dev; } =20 /* --=20 2.7.4