summary refs log tree commit diff stats
path: root/hw/core
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2014-07-03 16:45:35 -0300
committerMichael S. Tsirkin <mst@redhat.com>2014-07-06 09:13:54 +0300
commitdd98b71f4885814de9a64e7acc0e17b38ab7c38b (patch)
treecceed6b43b0744ced141be3455dbbabe2ba3c756 /hw/core
parent319627006a8f4c43b3618932ccac615c4662dfdc (diff)
downloadfocaccia-qemu-dd98b71f4885814de9a64e7acc0e17b38ab7c38b.tar.gz
focaccia-qemu-dd98b71f4885814de9a64e7acc0e17b38ab7c38b.zip
qdev: Fix crash when using non-device class name on -global
This fixes the following crash:

    $ qemu-system-x86_64 -global container.xxx=y
    hw/core/qdev-properties-system.c:399:qdev_add_one_global: Object 0x7f7eff234100 is not an instance of type device
    Aborted (core dumped)

New behavior will be to just warn, just like when non-existing clas
names are used:

    $ qemu-system-x86_64 -global container.xxx=y
    qemu-system-x86_64: Warning: "-global container.xxx=y" not used

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Don Slutz <dslutz@verizon.com>
Diffstat (limited to 'hw/core')
-rw-r--r--hw/core/qdev-properties-system.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 8e140af46f..ae0900f651 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -394,7 +394,8 @@ static int qdev_add_one_global(QemuOpts *opts, void *opaque)
     g->driver   = qemu_opt_get(opts, "driver");
     g->property = qemu_opt_get(opts, "property");
     g->value    = qemu_opt_get(opts, "value");
-    oc = object_class_by_name(g->driver);
+    oc = object_class_dynamic_cast(object_class_by_name(g->driver),
+                                   TYPE_DEVICE);
     if (oc) {
         DeviceClass *dc = DEVICE_CLASS(oc);