[Qemu-devel] [PATCH 0/2] Two small QOM fixes

[Qemu-devel] [PATCH 0/2] Two small QOM fixes

[Paolo Bonzini]

Two fixes for bugs that were reported on the list.

Paolo Bonzini (2):
  qdev: accept empty string properties
  qom: fix device hot-unplug

 hw/qdev-properties.c |    4 ----
 qom/object.c         |    7 ++-----
 2 files changed, 2 insertions(+), 9 deletions(-)

-- 
1.7.7.6

[Qemu-devel] [PATCH 1/2] qdev: accept empty string properties

[Paolo Bonzini]

These were stored as NULL due to wrong cut-and-paste from set_pointer.

Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/qdev-properties.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 0423af1..bff9152 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -421,10 +421,6 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
         error_propagate(errp, local_err);
         return;
     }
-    if (!*str) {
-        g_free(str);
-        str = NULL;
-    }
     if (*ptr) {
         g_free(*ptr);
     }
-- 
1.7.7.6

Re: [Qemu-devel] [PATCH 1/2] qdev: accept empty string properties

[Gerhard Wiesinger]

Works well,

Tested-by: Gerhard Wiesinger <lists@wiesinger.com>

Ciao,
Gerhard

--
http://www.wiesinger.com/


On Tue, 28 Feb 2012, Paolo Bonzini wrote:

> These were stored as NULL due to wrong cut-and-paste from set_pointer.
>
> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hw/qdev-properties.c |    4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index 0423af1..bff9152 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -421,10 +421,6 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
>         error_propagate(errp, local_err);
>         return;
>     }
> -    if (!*str) {
> -        g_free(str);
> -        str = NULL;
> -    }
>     if (*ptr) {
>         g_free(*ptr);
>     }
> -- 
> 1.7.7.6
>
>
>

Re: [Qemu-devel] [PATCH 1/2] qdev: accept empty string properties

[Andreas Färber]

Am 28.02.2012 09:54, schrieb Paolo Bonzini:
> These were stored as NULL due to wrong cut-and-paste from set_pointer.
> 
> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

/-F

> ---
>  hw/qdev-properties.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index 0423af1..bff9152 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -421,10 +421,6 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
>          error_propagate(errp, local_err);
>          return;
>      }
> -    if (!*str) {
> -        g_free(str);
> -        str = NULL;
> -    }
>      if (*ptr) {
>          g_free(*ptr);
>      }

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

[Qemu-devel] [PATCH 2/2] qom: fix device hot-unplug

[Paolo Bonzini]

Property removal modifies the list, so it is not safe to continue
iteration.  We know anyway that each object can have only one
parent (see object_property_add_child), so exit after finding
the requested object.

Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qom/object.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/qom/object.c b/qom/object.c
index aa037d2..39cbcb9 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -304,12 +304,9 @@ static void object_property_del_child(Object *obj, Object *child, Error **errp)
     ObjectProperty *prop;
 
     QTAILQ_FOREACH(prop, &obj->properties, node) {
-        if (!strstart(prop->type, "child<", NULL)) {
-            continue;
-        }
-
-        if (prop->opaque == child) {
+        if (strstart(prop->type, "child<", NULL) && prop->opaque == child) {
             object_property_del(obj, prop->name, errp);
+            break;
         }
     }
 }
-- 
1.7.7.6

Re: [Qemu-devel] [PATCH 2/2] qom: fix device hot-unplug

[Andreas Färber]

Am 28.02.2012 09:54, schrieb Paolo Bonzini:
> Property removal modifies the list, so it is not safe to continue
> iteration.  We know anyway that each object can have only one
> parent (see object_property_add_child), so exit after finding
> the requested object.
> 
> Reported-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  qom/object.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index aa037d2..39cbcb9 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -304,12 +304,9 @@ static void object_property_del_child(Object *obj, Object *child, Error **errp)
>      ObjectProperty *prop;
>  
>      QTAILQ_FOREACH(prop, &obj->properties, node) {
> -        if (!strstart(prop->type, "child<", NULL)) {
> -            continue;
> -        }
> -
> -        if (prop->opaque == child) {
> +        if (strstart(prop->type, "child<", NULL) && prop->opaque == child) {

Didn't someone post a patch introducing an object_property_is_child() or
so? Would be handy here.

Otherwise looks okay.

Andreas

>              object_property_del(obj, prop->name, errp);
> +            break;
>          }
>      }
>  }

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

Re: [Qemu-devel] [PATCH 0/2] Two small QOM fixes

[Paolo Bonzini]

Il 28/02/2012 09:54, Paolo Bonzini ha scritto:
> Two fixes for bugs that were reported on the list.
> 
> Paolo Bonzini (2):
>   qdev: accept empty string properties
>   qom: fix device hot-unplug
> 
>  hw/qdev-properties.c |    4 ----
>  qom/object.c         |    7 ++-----
>  2 files changed, 2 insertions(+), 9 deletions(-)
> 

Ping.

Paolo

Re: [Qemu-devel] [PATCH 0/2] Two small QOM fixes

[Anthony Liguori]

On 02/28/2012 02:54 AM, Paolo Bonzini wrote:
> Two fixes for bugs that were reported on the list.

Applied.  Thanks.

Regards,

Anthony Liguori

>
> Paolo Bonzini (2):
>    qdev: accept empty string properties
>    qom: fix device hot-unplug
>
>   hw/qdev-properties.c |    4 ----
>   qom/object.c         |    7 ++-----
>   2 files changed, 2 insertions(+), 9 deletions(-)
>