[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/44] qdev: Make error_set_from_qdev_prop_error() get Object*
From: |
Eduardo Habkost |
Subject: |
[PATCH v2 12/44] qdev: Make error_set_from_qdev_prop_error() get Object* argument |
Date: |
Wed, 4 Nov 2020 10:59:49 -0500 |
Make the code more generic and not specific to TYPE_DEVICE.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: David Hildenbrand <david@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
---
include/hw/qdev-properties.h | 2 +-
hw/core/qdev-properties-system.c | 10 +++++-----
hw/core/qdev-properties.c | 10 +++++-----
hw/s390x/css.c | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 7620095fed..530286e869 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -309,7 +309,7 @@ const GlobalProperty *qdev_find_global_prop(Object *obj,
const char *name);
int qdev_prop_check_globals(void);
void qdev_prop_set_globals(DeviceState *dev);
-void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
+void error_set_from_qdev_prop_error(Error **errp, int ret, Object *obj,
Property *prop, const char *value);
/**
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 85dd38db0f..fca1b694ca 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -352,7 +352,7 @@ static void set_mac(Object *obj, Visitor *v, const char
*name, void *opaque,
return;
inval:
- error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
g_free(str);
}
@@ -440,7 +440,7 @@ static void set_netdev(Object *obj, Visitor *v, const char
*name,
peers_ptr->queues = queues;
out:
- error_set_from_qdev_prop_error(errp, err, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, err, obj, prop, str);
g_free(str);
}
@@ -492,7 +492,7 @@ static void set_audiodev(Object *obj, Visitor *v, const
char* name,
card->state = state;
out:
- error_set_from_qdev_prop_error(errp, err, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, err, obj, prop, str);
g_free(str);
}
@@ -790,7 +790,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, const
char *name,
return;
invalid:
- error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
g_free(str);
}
@@ -913,7 +913,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v,
const char *name,
return;
inval:
- error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
g_free(str);
}
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 41482d83d1..5e010afdb8 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -581,7 +581,7 @@ static void set_uuid(Object *obj, Visitor *v, const char
*name, void *opaque,
if (!strcmp(str, UUID_VALUE_AUTO)) {
qemu_uuid_generate(uuid);
} else if (qemu_uuid_parse(str, uuid) < 0) {
- error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
}
g_free(str);
}
@@ -735,22 +735,22 @@ static Property *qdev_prop_find(DeviceState *dev, const
char *name)
return NULL;
}
-void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
+void error_set_from_qdev_prop_error(Error **errp, int ret, Object *obj,
Property *prop, const char *value)
{
switch (ret) {
case -EEXIST:
error_setg(errp, "Property '%s.%s' can't take value '%s', it's in use",
- object_get_typename(OBJECT(dev)), prop->name, value);
+ object_get_typename(obj), prop->name, value);
break;
default:
case -EINVAL:
error_setg(errp, QERR_PROPERTY_VALUE_BAD,
- object_get_typename(OBJECT(dev)), prop->name, value);
+ object_get_typename(obj), prop->name, value);
break;
case -ENOENT:
error_setg(errp, "Property '%s.%s' can't find value '%s'",
- object_get_typename(OBJECT(dev)), prop->name, value);
+ object_get_typename(obj), prop->name, value);
break;
case 0:
break;
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 2b8f33fec2..38fd46b9a9 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -2390,7 +2390,7 @@ static void set_css_devid(Object *obj, Visitor *v, const
char *name,
num = sscanf(str, "%2x.%1x%n.%4x%n", &cssid, &ssid, &n1, &devid, &n2);
if (num != 3 || (n2 - n1) != 5 || strlen(str) != n2) {
- error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
goto out;
}
if ((cssid > MAX_CSSID) || (ssid > MAX_SSID)) {
--
2.28.0
- [PATCH v2 07/44] qdev: Make PropertyInfo.print method get Object* argument, (continued)
- [PATCH v2 07/44] qdev: Make PropertyInfo.print method get Object* argument, Eduardo Habkost, 2020/11/04
- [PATCH v2 08/44] qdev: Make bit_prop_set() get Object* argument, Eduardo Habkost, 2020/11/04
- [PATCH v2 09/44] qdev: Make qdev_get_prop_ptr() get Object* arg, Eduardo Habkost, 2020/11/04
- [PATCH v2 14/44] qdev: Move softmmu properties to qdev-properties-system.h, Eduardo Habkost, 2020/11/04
- [PATCH v2 20/44] qdev: Add name argument to PropertyInfo.create method, Eduardo Habkost, 2020/11/04
- [PATCH v2 10/44] qdev: Make qdev_find_global_prop() get Object* argument, Eduardo Habkost, 2020/11/04
- [PATCH v2 13/44] qdev: Move UUID property to qdev-properties-system.c, Eduardo Habkost, 2020/11/04
- [PATCH v2 11/44] qdev: Make check_prop_still_unset() get Object* argument, Eduardo Habkost, 2020/11/04
- [PATCH v2 16/44] sparc: Use DEFINE_PROP for nwindows property, Eduardo Habkost, 2020/11/04
- [PATCH v2 17/44] qdev: Get just property name at error_set_from_qdev_prop_error(), Eduardo Habkost, 2020/11/04
- [PATCH v2 12/44] qdev: Make error_set_from_qdev_prop_error() get Object* argument,
Eduardo Habkost <=
- [PATCH v2 21/44] qdev: Wrap getters and setters in separate helpers, Eduardo Habkost, 2020/11/04
- [PATCH v2 15/44] qdev: Reuse DEFINE_PROP in all DEFINE_PROP_* macros, Eduardo Habkost, 2020/11/04
- [PATCH v2 28/44] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen(), Eduardo Habkost, 2020/11/04
- [PATCH v2 39/44] qdev: PROP_* macros, Eduardo Habkost, 2020/11/04
- [PATCH v2 32/44] qom: Add allow_set callback to ObjectProperty, Eduardo Habkost, 2020/11/04
- [PATCH v2 31/44] qdev: Reuse object_property_add_field() when adding array elements, Eduardo Habkost, 2020/11/04
- [PATCH v2 18/44] qdev: Avoid using prop->name unnecessarily, Eduardo Habkost, 2020/11/04
- [PATCH v2 22/44] qdev: Move dev->realized check to qdev_property_set(), Eduardo Habkost, 2020/11/04