summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-04-12 18:00:18 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-18 15:14:38 +0200
commit89bfe000433a601d30729086e88519ff36b85103 (patch)
treee0d6b15a4dff198c4eec81369a13aaa47c0d1f0e /hw
parent8cb6789a31e8c5823b36d84416433c145a1e6442 (diff)
downloadhqemu-89bfe000433a601d30729086e88519ff36b85103.zip
hqemu-89bfe000433a601d30729086e88519ff36b85103.tar.gz
qom: Push error reporting to object_property_find()
Avoids duplicated error_set(). Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> [AF: Also drop error_set() in object_property_del().] Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
-rw-r--r--hw/qdev.c2
-rw-r--r--hw/scsi-bus.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/qdev.c b/hw/qdev.c
index 654cbca..b20b34d 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -323,7 +323,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd)
if (nd->netdev)
qdev_prop_set_netdev(dev, "netdev", nd->netdev);
if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED &&
- object_property_find(OBJECT(dev), "vectors")) {
+ object_property_find(OBJECT(dev), "vectors", NULL)) {
qdev_prop_set_uint32(dev, "vectors", nd->nvectors);
}
nd->instantiated = 1;
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index a4ae44b..187bc90 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -214,7 +214,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv,
if (bootindex >= 0) {
qdev_prop_set_int32(dev, "bootindex", bootindex);
}
- if (object_property_find(OBJECT(dev), "removable")) {
+ if (object_property_find(OBJECT(dev), "removable", NULL)) {
qdev_prop_set_bit(dev, "removable", removable);
}
if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) {
OpenPOWER on IntegriCloud