71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 27a1972d1a5961a8218d5a52fba16b67816635fe Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:38 -0500
|
|
Subject: [PATCH 41/54] failover: simplify qdev_device_add() failover case
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-19-lvivier@redhat.com>
|
|
Patchwork-id: 101255
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 18/27] failover: simplify qdev_device_add() failover case
|
|
Bugzilla: 1819991
|
|
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
|
|
BZ: https://bugzilla.redhat.com/1819991
|
|
BRANCH: rhel-av-8.4.0
|
|
UPSTREAM: Merged
|
|
|
|
Just put allthe logic inside the same if.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Message-Id: <20201118083748.1328-20-quintela@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 5f2ef3b0d032797b6bad9449dfece3a8111a8529)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
softmmu/qdev-monitor.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
|
|
index a25f5d612c..12b7540f17 100644
|
|
--- a/softmmu/qdev-monitor.c
|
|
+++ b/softmmu/qdev-monitor.c
|
|
@@ -600,7 +600,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
|
|
const char *driver, *path;
|
|
DeviceState *dev = NULL;
|
|
BusState *bus = NULL;
|
|
- bool hide;
|
|
|
|
driver = qemu_opt_get(opts, "driver");
|
|
if (!driver) {
|
|
@@ -634,14 +633,16 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
|
|
return NULL;
|
|
}
|
|
}
|
|
- hide = should_hide_device(opts);
|
|
|
|
- if ((hide || qdev_hotplug) && bus && !qbus_is_hotpluggable(bus)) {
|
|
- error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name);
|
|
+ if (should_hide_device(opts)) {
|
|
+ if (bus && !qbus_is_hotpluggable(bus)) {
|
|
+ error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name);
|
|
+ }
|
|
return NULL;
|
|
}
|
|
|
|
- if (hide) {
|
|
+ if (qdev_hotplug && bus && !qbus_is_hotpluggable(bus)) {
|
|
+ error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name);
|
|
return NULL;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|