qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
@ 2013-11-28 16:02 armbru
  2013-11-28 16:11 ` Andreas Färber
  2013-12-18 14:54 ` Markus Armbruster
  0 siblings, 2 replies; 6+ messages in thread
From: armbru @ 2013-11-28 16:02 UTC (permalink / raw)
  To: qemu-devel; +Cc: afaerber, aliguori, qemu-stable

From: Markus Armbruster <armbru@redhat.com>

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.

Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qdev-monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qdev-monitor.c b/qdev-monitor.c
index dc37a43..90a0cea 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -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;
     }
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
  2013-11-28 16:02 [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix armbru
@ 2013-11-28 16:11 ` Andreas Färber
  2013-11-28 16:19   ` Markus Armbruster
  2013-12-18 14:54 ` Markus Armbruster
  1 sibling, 1 reply; 6+ messages in thread
From: Andreas Färber @ 2013-11-28 16:11 UTC (permalink / raw)
  To: armbru, qemu-devel; +Cc: qemu-stable, aliguori

Am 28.11.2013 17:02, schrieb armbru@redhat.com:
> From: Markus Armbruster <armbru@redhat.com>
> 
> 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.

Thanks for catching this!

> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qdev-monitor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qdev-monitor.c b/qdev-monitor.c
> index dc37a43..90a0cea 100644
> --- a/qdev-monitor.c
> +++ b/qdev-monitor.c
> @@ -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

>          qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type");
>          return NULL;
>      }
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
  2013-11-28 16:11 ` Andreas Färber
@ 2013-11-28 16:19   ` Markus Armbruster
  0 siblings, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2013-11-28 16:19 UTC (permalink / raw)
  To: Andreas Färber; +Cc: qemu-devel, aliguori, qemu-stable

Andreas Färber <afaerber@suse.de> writes:

> Am 28.11.2013 17:02, schrieb armbru@redhat.com:
>> From: Markus Armbruster <armbru@redhat.com>
>> 
>> 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.
>
> Thanks for catching this!
>
>> 
>> Cc: qemu-stable@nongnu.org
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  qdev-monitor.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/qdev-monitor.c b/qdev-monitor.c
>> index dc37a43..90a0cea 100644
>> --- a/qdev-monitor.c
>> +++ b/qdev-monitor.c
>> @@ -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, ...)?

Yes.  First thing object_class_dynamic_cast() does is

    if (!class) {
        return NULL;
    }

Makes sense to me.

[...]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
  2013-11-28 16:02 [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix armbru
  2013-11-28 16:11 ` Andreas Färber
@ 2013-12-18 14:54 ` Markus Armbruster
  2013-12-18 15:50   ` Andreas Färber
  1 sibling, 1 reply; 6+ messages in thread
From: Markus Armbruster @ 2013-12-18 14:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: afaerber, aliguori, qemu-stable

Ping?

armbru@redhat.com writes:

> From: Markus Armbruster <armbru@redhat.com>
>
> 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.
>
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qdev-monitor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/qdev-monitor.c b/qdev-monitor.c
> index dc37a43..90a0cea 100644
> --- a/qdev-monitor.c
> +++ b/qdev-monitor.c
> @@ -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;
>      }

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
  2013-12-18 14:54 ` Markus Armbruster
@ 2013-12-18 15:50   ` Andreas Färber
  2013-12-18 17:06     ` Markus Armbruster
  0 siblings, 1 reply; 6+ messages in thread
From: Andreas Färber @ 2013-12-18 15:50 UTC (permalink / raw)
  To: Markus Armbruster, qemu-devel; +Cc: qemu-stable, aliguori

Am 18.12.2013 15:54, schrieb Markus Armbruster:
> 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

> armbru@redhat.com writes:
> 
>> From: Markus Armbruster <armbru@redhat.com>
>>
>> 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.
>>
>> Cc: qemu-stable@nongnu.org
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  qdev-monitor.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/qdev-monitor.c b/qdev-monitor.c
>> index dc37a43..90a0cea 100644
>> --- a/qdev-monitor.c
>> +++ b/qdev-monitor.c
>> @@ -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;
>>      }
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix
  2013-12-18 15:50   ` Andreas Färber
@ 2013-12-18 17:06     ` Markus Armbruster
  0 siblings, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2013-12-18 17:06 UTC (permalink / raw)
  To: Andreas Färber; +Cc: qemu-devel, aliguori, qemu-stable

Andreas Färber <afaerber@suse.de> writes:

> Am 18.12.2013 15:54, schrieb Markus Armbruster:
>> Ping?
>
> Already queued on qom-next:
> https://github.com/afaerber/qemu-cpu/commits/qom-next
>
> Sorry, did the patch processing offline on a train. ;)

No problem & thanks!

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-12-18 17:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-28 16:02 [Qemu-devel] [PATCH] qdev-monitor: device_add crashes on non-device driver name, fix armbru
2013-11-28 16:11 ` Andreas Färber
2013-11-28 16:19   ` Markus Armbruster
2013-12-18 14:54 ` Markus Armbruster
2013-12-18 15:50   ` Andreas Färber
2013-12-18 17:06     ` Markus Armbruster

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).