[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v2 08/16] qdev-monitor: Check sysbus device type before creat
From: |
Damien Hedde |
Subject: |
[RFC PATCH v2 08/16] qdev-monitor: Check sysbus device type before creating it |
Date: |
Wed, 22 Sep 2021 18:13:57 +0200 |
Add an early check to test if the requested sysbus device type
is allowed by the current machine before creating the device. This
impacts both -device cli option and device_add qmp command.
Before this patch, the check was done well after the device has
been created (in a machine init done notifier). We can now report
the error right away.
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
---
softmmu/qdev-monitor.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 47ccd90be8..f1c9242855 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -40,6 +40,7 @@
#include "qemu/cutils.h"
#include "hw/qdev-properties.h"
#include "hw/clock.h"
+#include "hw/boards.h"
/*
* Aliases were a bad idea from the start. Let's keep them
@@ -268,6 +269,16 @@ static DeviceClass *qdev_get_device_class(const char
**driver, Error **errp)
return NULL;
}
+ if (object_class_dynamic_cast(oc, TYPE_SYS_BUS_DEVICE)) {
+ /* sysbus devices need to be allowed by the machine */
+ MachineClass *mc = MACHINE_CLASS(object_get_class(qdev_get_machine()));
+ if (!machine_class_is_dynamic_sysbus_dev_allowed(mc, *driver)) {
+ error_setg(errp, "'%s' is not an allowed pluggable sysbus device "
+ " type for the machine", *driver);
+ return NULL;
+ }
+ }
+
return dc;
}
--
2.33.0
- Re: [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command, (continued)
- [RFC PATCH v2 01/16] rename MachineInitPhase enum constants for QAPI compatibility, Damien Hedde, 2021/09/22
- [RFC PATCH v2 07/16] hw/core/machine: add machine_class_is_dynamic_sysbus_dev_allowed, Damien Hedde, 2021/09/22
- [RFC PATCH v2 03/16] qapi: Implement x-machine-init QMP command, Damien Hedde, 2021/09/22
- [RFC PATCH v2 09/16] hw/core/machine: Remove the dynamic sysbus devices type check, Damien Hedde, 2021/09/22
- [RFC PATCH v2 04/16] softmmu/qdev-monitor: add error handling in qdev_set_id, Damien Hedde, 2021/09/22
- [RFC PATCH v2 06/16] qapi: Allow device_add to execute in machine initialized phase, Damien Hedde, 2021/09/22
- [RFC PATCH v2 05/16] qdev-monitor: prevent conflicts between qmp/device_add and cli/-device, Damien Hedde, 2021/09/22
- [RFC PATCH v2 08/16] qdev-monitor: Check sysbus device type before creating it,
Damien Hedde <=
- [RFC PATCH v2 11/16] softmmu/memory: add memory_region_try_add_subregion function, Damien Hedde, 2021/09/22
- [RFC PATCH v2 14/16] docs/system: add doc about the initialized machine phase and an example, Damien Hedde, 2021/09/22
- [RFC PATCH v2 12/16] add x-sysbus-mmio-map qmp command, Damien Hedde, 2021/09/22
- [RFC PATCH v2 10/16] qdev-monitor: allow adding any sysbus device before machine is ready, Damien Hedde, 2021/09/22
- [RFC PATCH v2 16/16] hw/intc/ibex_plic: set user_creatable, Damien Hedde, 2021/09/22