Commit 31bed550 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

qdev: Use qdev_get_device_class() for -device <type>,help 



Make sure we try to list properties from classes that can be safely used
with "-device".

Fixes the following crashes:

  $ qemu-system-x86_64 -device x86_64-cpu,help
  **
  ERROR:qom/object.c:336:object_initialize_with_type: assertion failed: (type->abstract == false)
  Aborted (core dumped)
  $ qemu-system-x86_64 -device host-x86_64-cpu,help
  qemu-system-x86_64: [...]/target-i386/cpu.c:1329: host_x86_cpu_initfn: Assertion `(kvm_allowed)' failed.
  Aborted (core dumped)

After applying this patch:

  $ qemu-system-x86_64 -device x86_64-cpu,help
  Parameter 'driver' expects non-abstract device type
  $ qemu-system-x86_64 -device host-x86_64-cpu,help
  Parameter 'driver' expects pluggable device type

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 5185f0e0

qdev-monitor.c

+3 −6
Original line number Diff line number Diff line
@@ -235,12 +235,9 @@ int qdev_device_help(QemuOpts *opts) 
        return 0;

    }



    if (!object_class_by_name(driver)) {

        const char *typename = find_typename_by_alias(driver);



        if (typename) {

            driver = typename;

        }

    qdev_get_device_class(&driver, &local_err);

    if (local_err) {

        goto error;

    }



    prop_list = qmp_device_list_properties(driver, &local_err);