qdev-monitor: device_add crashes on non-device driver name, fix
PATCH 1/1 qdev-monitor: device_add crashes on non-device driver name, fix
From: Markus Armbruster <[email protected]>
Watch this:
$ upstream-qemu -nodefaults -S -display none -monitor stdio
QEMU 1.7.50 monitor - type 'help' for more information
(qemu) device_add rng-egd
/work/armbru/qemu/qdev-monitor.c:491:qdev_device_add: Object 0x2089b00 is not an instance of type device
Aborted (core dumped)Crashes because "rng-egd" exists, but isn't a subtype of TYPE_DEVICE. Broken in commit 18b6dad.
--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qdev-monitor.c +1 -1
@@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } -if (!oc) { +if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {qerror_report (QERR_INVALID_PARAMETER_VALUE ,"driver" ,"device type" );return NULL ; }
Signature · 1 line
1.8.1.4
Am 28.11.2013 17:02, schrieb [email protected]:
Quoted 4 lines
From: Markus Armbruster <[email protected]>
Watch this:
Quoted 8 lines
$ upstream-qemu -nodefaults -S -display none -monitor stdio QEMU 1.7.50 monitor - type 'help' for more information (qemu) device_add rng-egd /work/armbru/qemu/qdev-monitor.c:491:qdev_device_add: Object 0x2089b00 is not an instance of type device Aborted (core dumped)Crashes because "rng-egd" exists, but isn't a subtype of
TYPE_DEVICE. Broken in commit 18b6dad.
Thanks for catching this!
Quoted 12 lines
Signed-off-by Markus Armbruster <[email protected]>--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +0
-0
qdev-monitor.c DeviceState *qdev_device_add(QemuOpts *opts) · line 480
Quoted 5 lines
qdev-monitor.c +1
-1@@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } -if (!oc) { +if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {
Are you sure we don't need !oc || !object_class_dynamic_cast(oc, ...)?
Regards,
Andreas
Quoted 4 lines
qdev-monitor.c +0
-0qerror_report (QERR_INVALID_PARAMETER_VALUE ,"driver" ,"device type" );return NULL ; }
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 32 lines · Andreas Färber
Am 28.11.2013 17:02, schrieb [email protected]:
Quoted 11 lines
From: Markus Armbruster <[email protected]>
Watch this:
$ upstream-qemu -nodefaults -S -display none -monitor stdio QEMU 1.7.50 monitor - type 'help' for more information (qemu) device_add rng-egd /work/armbru/qemu/qdev-monitor.c:491:qdev_device_add: Object 0x2089b00 is not an instance of type device Aborted (core dumped)Quoted 2 lines
Crashes because "rng-egd" exists, but isn't a subtype of
TYPE_DEVICE. Broken in commit 18b6dad.Thanks for catching this!
Quoted 15 lines
Signed-off-by Markus Armbruster <[email protected]>--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +0
-0@@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } }
Quoted 4 lines
qdev-monitor.c DeviceState *qdev_device_add(QemuOpts *opts) · line 480
Quoted 2 lines
qdev-monitor.c +1
-1-if (!oc) { +if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {Are you sure we don't need !oc || !object_class_dynamic_cast(oc, ...)?
Yes. First thing object_class_dynamic_cast() does is
if (!class) {
return NULL;
}Makes sense to me.
[...]
Ping?
Quoted 32 lines · [email protected] writes:
From: Markus Armbruster <[email protected]>
Watch this:
$ upstream-qemu -nodefaults -S -display none -monitor stdio QEMU 1.7.50 monitor - type 'help' for more information (qemu) device_add rng-egd /work/armbru/qemu/qdev-monitor.c:491:qdev_device_add: Object 0x2089b00 is not an instance of type device Aborted (core dumped)Crashes because "rng-egd" exists, but isn't a subtype of
TYPE_DEVICE. Broken in commit 18b6dad.Signed-off-by Markus Armbruster <[email protected]>--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +1
-1@@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } -if (!oc) { +if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {qerror_report (QERR_INVALID_PARAMETER_VALUE ,"driver" ,"device type" );return NULL ; }
Am 18.12.2013 15:54, schrieb Markus Armbruster:
Quoted 1 line
Ping?
Already queued on qom-next:
https://github.com/afaerber/qemu-cpu/commits/qom-next
Sorry, did the patch processing offline on a train. ;)
Thanks,
Andreas
Quoted 35 lines
Quoted 32 lines · [email protected] writes:
From: Markus Armbruster <[email protected]>
Watch this:
$ upstream-qemu -nodefaults -S -display none -monitor stdio QEMU 1.7.50 monitor - type 'help' for more information (qemu) device_add rng-egd /work/armbru/qemu/qdev-monitor.c:491:qdev_device_add: Object 0x2089b00 is not an instance of type device Aborted (core dumped)Crashes because "rng-egd" exists, but isn't a subtype of
TYPE_DEVICE. Broken in commit 18b6dad.Signed-off-by Markus Armbruster <[email protected]>--- qdev-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qdev-monitor.c +1
-1@@ -477,7 +477,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } } -if (!oc) { +if (!object_class_dynamic_cast (oc,TYPE_DEVICE )) {qerror_report (QERR_INVALID_PARAMETER_VALUE ,"driver" ,"device type" );return NULL ; }
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 7 lines · Andreas Färber
Am 18.12.2013 15:54, schrieb Markus Armbruster:
Quoted 1 line
Ping?
Already queued on qom-next:
https://github.com/afaerber/qemu-cpu/commits/qom-nextSorry, did the patch processing offline on a train. ;)
No problem & thanks!