david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev-properties-system: Change set_pointer's parse callback to use Error

Browse Source 
Instead of having set_pointer() call a parse callback which returns
an error number that we then convert to an Error string with
error_set_from_qdev_prop_error(), make the parse callback take an
Error** and set the error itself. This will allow parse routines
to provide more helpful error messages than the generic ones.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435068107-12594-2-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2015-06-26 14:22:36 +01:00
parent b21ab1fc21
commit f1fb9f0dc0
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/core/qdev-properties-system.c
View File

@ -35,15 +35,15 @@ static void get_pointer(Object *obj, Visitor *v, Property *prop,
} }
static void set_pointer(Object *obj, Visitor *v, Property *prop, static void set_pointer(Object *obj, Visitor *v, Property *prop,
int (*parse)(DeviceState *dev, const char *str, void (*parse)(DeviceState *dev, const char *str,
void **ptr), void **ptr, const char *propname,
Error **errp),
const char *name, Error **errp) const char *name, Error **errp)
{ {
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
Error *local_err = NULL; Error *local_err = NULL;
void **ptr = qdev_get_prop_ptr(dev, prop); void **ptr = qdev_get_prop_ptr(dev, prop);
char *str; char *str;
int ret;
if (dev->realized) { if (dev->realized) {
qdev_prop_set_after_realize(dev, name, errp); qdev_prop_set_after_realize(dev, name, errp);
@ -60,26 +60,29 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop,
*ptr = NULL; *ptr = NULL;
return; return;
} }
ret = parse(dev, str, ptr); parse(dev, str, ptr, prop->name, errp);
error_set_from_qdev_prop_error(errp, ret, dev, prop, str);
g_free(str); g_free(str);
} }
/* --- drive --- */ /* --- drive --- */
static int parse_drive(DeviceState *dev, const char *str, void **ptr) static void parse_drive(DeviceState *dev, const char *str, void **ptr,
const char *propname, Error **errp)
{ {
BlockBackend *blk; BlockBackend *blk;
blk = blk_by_name(str); blk = blk_by_name(str);
if (!blk) { if (!blk) {
return -ENOENT; error_setg(errp, "Property '%s.%s' can't find value '%s'",
object_get_typename(OBJECT(dev)), propname, str);
return;
} }
if (blk_attach_dev(blk, dev) < 0) { if (blk_attach_dev(blk, dev) < 0) {
return -EEXIST; error_setg(errp, "Property '%s.%s' can't take value '%s', it's in use",
object_get_typename(OBJECT(dev)), propname, str);
return;
} }
*ptr = blk; *ptr = blk;
return 0;
} }
static void release_drive(Object *obj, const char *name, void *opaque) static void release_drive(Object *obj, const char *name, void *opaque)
@ -121,17 +124,21 @@ PropertyInfo qdev_prop_drive = {
/* --- character device --- */ /* --- character device --- */
static int parse_chr(DeviceState *dev, const char *str, void **ptr) static void parse_chr(DeviceState *dev, const char *str, void **ptr,
const char *propname, Error **errp)
{ {
CharDriverState *chr = qemu_chr_find(str); CharDriverState *chr = qemu_chr_find(str);
if (chr == NULL) { if (chr == NULL) {
return -ENOENT; error_setg(errp, "Property '%s.%s' can't find value '%s'",
object_get_typename(OBJECT(dev)), propname, str);
return;
} }
if (qemu_chr_fe_claim(chr) != 0) { if (qemu_chr_fe_claim(chr) != 0) {
return -EEXIST; error_setg(errp, "Property '%s.%s' can't take value '%s', it's in use",
object_get_typename(OBJECT(dev)), propname, str);
return;
} }
*ptr = chr; *ptr = chr;
return 0;
} }
static void release_chr(Object *obj, const char *name, void *opaque) static void release_chr(Object *obj, const char *name, void *opaque)