32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From 172d79d8ebb343fa144987d2c50d90655d5aa5f9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
||
|
|
Date: Thu, 29 Jul 2021 15:24:48 +0800
|
||
|
|
Subject: [PATCH] qdev/monitors: Fix reundant error_setg of qdev_add_device
|
||
|
|
|
||
|
|
There is an extra log "error_setg" in qdev_add_device(). When
|
||
|
|
hot-plug a device, if the corresponding bus doesn't exist, it
|
||
|
|
will trigger an asseration "assert(*errp == NULL)".
|
||
|
|
|
||
|
|
Fixes: 515a7970490 (log: Add some logs on VM runtime path)
|
||
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
||
|
|
Signed-off-by: Yan Wang <wangyan122@huawei.com>
|
||
|
|
---
|
||
|
|
system/qdev-monitor.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
|
||
|
|
index c885175b66..b10e483a9a 100644
|
||
|
|
--- a/system/qdev-monitor.c
|
||
|
|
+++ b/system/qdev-monitor.c
|
||
|
|
@@ -644,7 +644,6 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
|
||
|
|
if (path != NULL) {
|
||
|
|
bus = qbus_find(path, errp);
|
||
|
|
if (!bus) {
|
||
|
|
- error_setg(errp, "can not find bus for %s", driver);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
if (!object_dynamic_cast(OBJECT(bus), dc->bus_type)) {
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|