[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions |
Date: |
Tue, 16 Apr 2013 03:50:21 +0200 |
Drop an unreachable fallback bus assignment to SysBus.
If no ,bus= is specified, only search busses recursively for bus type if
the DeviceClass has a bus_type specified. Handle resulting NULL cases.
Signed-off-by: Andreas Färber <address@hidden>
---
qdev-monitor.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 9a78ccf..73d7946 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -18,6 +18,7 @@
*/
#include "hw/qdev.h"
+#include "hw/sysbus.h"
#include "monitor/monitor.h"
#include "monitor/qdev.h"
#include "qmp-commands.h"
@@ -415,7 +416,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
DeviceClass *k;
const char *driver, *path, *id;
DeviceState *qdev;
- BusState *bus;
+ BusState *bus = NULL;
driver = qemu_opt_get(opts, "driver");
if (!driver) {
@@ -453,7 +454,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
driver, object_get_typename(OBJECT(bus)));
return NULL;
}
- } else {
+ } else if (k->bus_type != NULL) {
bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type);
if (!bus) {
qerror_report(QERR_NO_BUS_FOR_DEVICE,
@@ -461,18 +462,17 @@ DeviceState *qdev_device_add(QemuOpts *opts)
return NULL;
}
}
- if (qdev_hotplug && !bus->allow_hotplug) {
+ if (qdev_hotplug && bus && !bus->allow_hotplug) {
qerror_report(QERR_BUS_NO_HOTPLUG, bus->name);
return NULL;
}
- if (!bus) {
- bus = sysbus_get_default();
- }
-
/* create device, set properties */
qdev = DEVICE(object_new(driver));
- qdev_set_parent_bus(qdev, bus);
+
+ if (bus) {
+ qdev_set_parent_bus(qdev, bus);
+ }
id = qemu_opts_id(opts);
if (id) {
--
1.8.1.4
- [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions,
Andreas Färber <=
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Igor Mammedov, 2013/04/18
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Igor Mammedov, 2013/04/18
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Libaiqing, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Andreas Färber, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, KONRAD Frédéric, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Andreas Färber, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, KONRAD Frédéric, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Andreas Färber, 2013/04/22
- Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, KONRAD Frédéric, 2013/04/22
Re: [Qemu-devel] [PATCH] qdev: Fix device_add bus assumptions, Andreas Färber, 2013/04/22