[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 4/6] qapi/device_add: compute is_hotplug flag
From: |
Damien Hedde |
Subject: |
[PATCH v5 4/6] qapi/device_add: compute is_hotplug flag |
Date: |
Thu, 19 May 2022 17:34:00 +0200 |
Instead of checking the phase everytime, just store the result
in a flag. We will use more of it in the following commit.
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
softmmu/qdev-monitor.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 12fe60c467..d68ef883b5 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -619,6 +619,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
char *id;
DeviceState *dev = NULL;
BusState *bus = NULL;
+ bool is_hotplug = phase_check(PHASE_MACHINE_READY);
driver = qdict_get_try_str(opts, "driver");
if (!driver) {
@@ -662,7 +663,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
return NULL;
}
- if (phase_check(PHASE_MACHINE_READY) && bus && !qbus_is_hotpluggable(bus))
{
+ if (is_hotplug && bus && !qbus_is_hotpluggable(bus)) {
error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name);
return NULL;
}
@@ -676,7 +677,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
dev = qdev_new(driver);
/* Check whether the hotplug is allowed by the machine */
- if (phase_check(PHASE_MACHINE_READY)) {
+ if (is_hotplug) {
if (!qdev_hotplug_allowed(dev, errp)) {
goto err_del_dev;
}
--
2.36.1
- [PATCH v5 0/6] QAPI support for device cold-plug, Damien Hedde, 2022/05/19
- [PATCH v5 3/6] vl: support machine-initialized target in phase_until(), Damien Hedde, 2022/05/19
- [PATCH v5 2/6] machine&vl: introduce phase_until() to handle phase transitions, Damien Hedde, 2022/05/19
- [PATCH v5 1/6] machine: add phase_get() and document phase_check()/advance(), Damien Hedde, 2022/05/19
- [PATCH v5 6/6] qapi/device_add: Allow execution in machine initialized phase, Damien Hedde, 2022/05/19
- [PATCH v5 4/6] qapi/device_add: compute is_hotplug flag,
Damien Hedde <=
- [PATCH v5 5/6] RFC qapi/device_add: handle the rom_order_override when cold-plugging, Damien Hedde, 2022/05/19