[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle un
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully |
Date: |
Thu, 4 Mar 2010 16:56:44 +0100 |
"device_add isa-serial,bus=pci.0" kills QEMU. Not good.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/qdev.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 25e1703..80e5c36 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -204,6 +204,11 @@ DeviceState *qdev_device_add(QemuOpts *opts)
path = qemu_opt_get(opts, "bus");
if (path != NULL) {
bus = qbus_find(path);
+ if (bus && bus->info != info->bus_info) {
+ error_report("Device '%s' can't go on a %s bus",
+ driver, bus->info->name);
+ return NULL;
+ }
} else {
bus = qbus_find_recursive(main_system_bus, NULL, info->bus_info);
}
--
1.6.6.1
- [Qemu-devel] [PATCH 01/50] usb: Remove disabled monitor_printf() in usb_read_file(), (continued)
- [Qemu-devel] [PATCH 01/50] usb: Remove disabled monitor_printf() in usb_read_file(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 05/50] tools: Remove unused cur_mon from qemu-tool.c, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 02/50] savevm: Fix -loadvm to report errors to stderr, not the monitor, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 03/50] pc: Fix error reporting for -boot once, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 10/50] error: Simplify error sink setup, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 04/50] pc: Factor common code out of pc_boot_set() and cmos_init(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 12/50] error: New error_printf() and error_vprintf(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 09/50] error: Move qemu_error() & friends from monitor.c to own file, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 11/50] error: Move qemu_error & friends into their own header, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 35/50] error: New QERR_DEVICE_MULTIPLE_BUSSES, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully,
Markus Armbruster <=
- [Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error in qbus_find(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 26/50] qdev: Hide "ptr" properties from users, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qemu_error_internal(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 41/50] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 31/50] error: New QERR_PROPERTY_VALUE_BAD, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 13/50] error: Don't abuse qemu_error() for non-error in qdev_device_help(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "can read bdrv key", Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 06/50] monitor: Separate "default monitor" and "current monitor" cleanly, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 40/50] error: New QERR_BUS_NO_HOTPLUG, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 18/50] error: Infrastructure to track locations for error reporting, Markus Armbruster, 2010/03/04