openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/qdev-properties.c: Improve diagnostic for setting property after realize 

Now we have error_setg() we can improve the error message emitted if
you attempt to set a property of a device after the device is realized
(the previous message was "permission denied" which was not very
informative).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1364218844-7509-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Peter Maydell 2013-03-25 13:40:44 +00:00 committed by Anthony Liguori
parent c19f806e01
commit b000dfbd42
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/qdev-addr.c
View File

@ -42,7 +42,7 @@ static void set_taddr(Object *obj, Visitor *v, void *opaque,
int64_t value; int64_t value;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }

4
hw/qdev-properties-system.c
View File

@ -43,7 +43,7 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop,
int ret; int ret;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -287,7 +287,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
NetClientState *hubport; NetClientState *hubport;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }

40
hw/qdev-properties.c
View File

@ -7,6 +7,20 @@
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "char/char.h" #include "char/char.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
{
if (dev->id) {
error_setg(errp, "Attempt to set property '%s' on device '%s' "
"(type '%s') after it was realized", name, dev->id,
object_get_typename(OBJECT(dev)));
} else {
error_setg(errp, "Attempt to set property '%s' on anonymous device "
"(type '%s') after it was realized", name,
object_get_typename(OBJECT(dev)));
}
}
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
{ {
void *ptr = dev; void *ptr = dev;
@ -33,7 +47,7 @@ static void set_enum(Object *obj, Visitor *v, void *opaque,
int *ptr = qdev_get_prop_ptr(dev, prop); int *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -86,7 +100,7 @@ static void set_bit(Object *obj, Visitor *v, void *opaque,
bool value; bool value;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -126,7 +140,7 @@ static void set_uint8(Object *obj, Visitor *v, void *opaque,
uint8_t *ptr = qdev_get_prop_ptr(dev, prop); uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -193,7 +207,7 @@ static void set_uint16(Object *obj, Visitor *v, void *opaque,
uint16_t *ptr = qdev_get_prop_ptr(dev, prop); uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -226,7 +240,7 @@ static void set_uint32(Object *obj, Visitor *v, void *opaque,
uint32_t *ptr = qdev_get_prop_ptr(dev, prop); uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -251,7 +265,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque,
int32_t *ptr = qdev_get_prop_ptr(dev, prop); int32_t *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -324,7 +338,7 @@ static void set_uint64(Object *obj, Visitor *v, void *opaque,
uint64_t *ptr = qdev_get_prop_ptr(dev, prop); uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -414,7 +428,7 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
char *str; char *str;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -478,7 +492,7 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
char *str, *p; char *str, *p;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -570,7 +584,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
char *str; char *str;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -641,7 +655,7 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque,
const int64_t max = 32768; const int64_t max = 32768;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -709,7 +723,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, void *opaque,
unsigned int slot = 0, func = 0; unsigned int slot = 0, func = 0;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
@ -824,7 +838,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, void *opaque,
int i; int i;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }
if (*alenptr) { if (*alenptr) {

12
hw/qdev-properties.h
View File

@ -167,4 +167,16 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
*/ */
void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp); void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp);
/**
* @qdev_prop_set_after_realize:
* @dev: device
* @name: name of property
* @errp: indirect pointer to Error to be set
* Set the Error object to report that an attempt was made to set a property
* on a device after it has already been realized. This is a utility function
* which allows property-setter functions to easily report the error in
* a friendly format identifying both the device and the property.
*/
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp);
#endif #endif

2
hw/qdev.c
View File

@ -562,7 +562,7 @@ static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque,
int ret; int ret;
if (dev->realized) { if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED); qdev_prop_set_after_realize(dev, name, errp);
return; return;
} }