Skip to content

Commit

Permalink
qdev: Make check_prop_still_unset() get Object* argument
Browse files Browse the repository at this point in the history
Make the code more generic and not specific to TYPE_DEVICE.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201211220529.2290218-12-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  • Loading branch information
ehabkost committed Dec 15, 2020
1 parent 3950127 commit 3814815
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hw/core/qdev-properties-system.c
Expand Up @@ -32,11 +32,11 @@
#include "hw/pci/pci.h"
#include "util/block-helpers.h"

static bool check_prop_still_unset(DeviceState *dev, const char *name,
static bool check_prop_still_unset(Object *obj, const char *name,
const void *old_val, const char *new_val,
Error **errp)
{
const GlobalProperty *prop = qdev_find_global_prop(OBJECT(dev), name);
const GlobalProperty *prop = qdev_find_global_prop(obj, name);

if (!old_val) {
return true;
Expand Down Expand Up @@ -105,7 +105,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name,
* TODO Should this really be an error? If no, the old value
* needs to be released before we store the new one.
*/
if (!check_prop_still_unset(dev, name, *ptr, str, errp)) {
if (!check_prop_still_unset(obj, name, *ptr, str, errp)) {
return;
}

Expand Down Expand Up @@ -247,7 +247,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque,
* TODO Should this really be an error? If no, the old value
* needs to be released before we store the new one.
*/
if (!check_prop_still_unset(dev, name, be->chr, str, errp)) {
if (!check_prop_still_unset(obj, name, be->chr, str, errp)) {
return;
}

Expand Down Expand Up @@ -429,7 +429,7 @@ static void set_netdev(Object *obj, Visitor *v, const char *name,
* TODO Should this really be an error? If no, the old value
* needs to be released before we store the new one.
*/
if (!check_prop_still_unset(dev, name, ncs[i], str, errp)) {
if (!check_prop_still_unset(obj, name, ncs[i], str, errp)) {
goto out;
}

Expand Down

0 comments on commit 3814815

Please sign in to comment.