mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Drop more @errp parameters after previous commit
Several functions can't fail anymore: ich9_pm_add_properties(), device_add_bootindex_property(), ppc_compat_add_property(), spapr_caps_add_properties(), PropertyInfo.create(). Drop their @errp parameter. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200505152926.18877-16-armbru@redhat.com>
This commit is contained in:
+1
-1
@@ -327,7 +327,7 @@ static void property_release_bootindex(Object *obj, const char *name,
|
||||
|
||||
void device_add_bootindex_property(Object *obj, int32_t *bootindex,
|
||||
const char *name, const char *suffix,
|
||||
DeviceState *dev, Error **errp)
|
||||
DeviceState *dev)
|
||||
{
|
||||
BootIndexProperty *prop = g_malloc0(sizeof(*prop));
|
||||
|
||||
|
||||
+1
-1
@@ -369,7 +369,7 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
|
||||
s->pm.enable_tco = value;
|
||||
}
|
||||
|
||||
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
||||
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
|
||||
{
|
||||
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
||||
pm->acpi_memory_hotplug.is_enabled = true;
|
||||
|
||||
+2
-2
@@ -2813,10 +2813,10 @@ static void isabus_fdc_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &isa->bootindexA,
|
||||
"bootindexA", "/floppy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
device_add_bootindex_property(obj, &isa->bootindexB,
|
||||
"bootindexB", "/floppy@1",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static const TypeInfo isa_fdc_info = {
|
||||
|
||||
+1
-1
@@ -1594,7 +1594,7 @@ static void nvme_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/namespace@1,0",
|
||||
DEVICE(obj), &error_abort);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static const TypeInfo nvme_info = {
|
||||
|
||||
@@ -481,7 +481,7 @@ static void vhost_user_blk_instance_init(Object *obj)
|
||||
VHostUserBlk *s = VHOST_USER_BLK(obj);
|
||||
|
||||
device_add_bootindex_property(obj, &s->bootindex, "bootindex",
|
||||
"/disk@0,0", DEVICE(obj), NULL);
|
||||
"/disk@0,0", DEVICE(obj));
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_vhost_user_blk = {
|
||||
|
||||
@@ -1248,7 +1248,7 @@ static void virtio_blk_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.conf.bootindex,
|
||||
"bootindex", "/disk@0,0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_virtio_blk = {
|
||||
|
||||
@@ -1250,7 +1250,7 @@ const PropertyInfo qdev_prop_size = {
|
||||
|
||||
/* --- object link property --- */
|
||||
|
||||
static void create_link_property(ObjectClass *oc, Property *prop, Error **errp)
|
||||
static void create_link_property(ObjectClass *oc, Property *prop)
|
||||
{
|
||||
object_class_property_add_link(oc, prop->name, prop->link_type,
|
||||
prop->offset,
|
||||
|
||||
+1
-1
@@ -782,7 +782,7 @@ static void qdev_class_add_property(DeviceClass *klass, Property *prop)
|
||||
ObjectClass *oc = OBJECT_CLASS(klass);
|
||||
|
||||
if (prop->info->create) {
|
||||
prop->info->create(oc, prop, &error_abort);
|
||||
prop->info->create(oc, prop);
|
||||
} else {
|
||||
ObjectProperty *op;
|
||||
|
||||
|
||||
+1
-1
@@ -639,7 +639,7 @@ static void ich9_lpc_initfn(Object *obj)
|
||||
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
|
||||
&acpi_disable_cmd, OBJ_PROP_FLAG_READ);
|
||||
|
||||
ich9_pm_add_properties(obj, &lpc->pm, NULL);
|
||||
ich9_pm_add_properties(obj, &lpc->pm);
|
||||
}
|
||||
|
||||
static void ich9_lpc_realize(PCIDevice *d, Error **errp)
|
||||
|
||||
+1
-1
@@ -1774,7 +1774,7 @@ static void e1000_instance_init(Object *obj)
|
||||
E1000State *n = E1000(obj);
|
||||
device_add_bootindex_property(obj, &n->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(n), NULL);
|
||||
DEVICE(n));
|
||||
}
|
||||
|
||||
static const TypeInfo e1000_base_info = {
|
||||
|
||||
+1
-1
@@ -705,7 +705,7 @@ static void e1000e_instance_init(Object *obj)
|
||||
E1000EState *s = E1000E(obj);
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static const TypeInfo e1000e_info = {
|
||||
|
||||
+1
-1
@@ -1883,7 +1883,7 @@ static void eepro100_instance_init(Object *obj)
|
||||
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, PCI_DEVICE(obj));
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(s), NULL);
|
||||
DEVICE(s));
|
||||
}
|
||||
|
||||
static E100PCIDeviceInfo e100_devices[] = {
|
||||
|
||||
+1
-1
@@ -134,7 +134,7 @@ static void lance_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static Property lance_properties[] = {
|
||||
|
||||
@@ -152,7 +152,7 @@ static void lasi_82596_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static Property lasi_82596_properties[] = {
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ static void ne2000_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->c.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
&pci_dev->qdev, NULL);
|
||||
&pci_dev->qdev);
|
||||
}
|
||||
|
||||
static Property ne2000_properties[] = {
|
||||
|
||||
+1
-1
@@ -250,7 +250,7 @@ static void pcnet_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static Property pcnet_properties[] = {
|
||||
|
||||
+1
-1
@@ -3415,7 +3415,7 @@ static void rtl8139_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static Property rtl8139_properties[] = {
|
||||
|
||||
+1
-1
@@ -340,7 +340,7 @@ static void spapr_vlan_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &dev->nicconf.bootindex,
|
||||
"bootindex", "",
|
||||
DEVICE(dev), NULL);
|
||||
DEVICE(dev));
|
||||
|
||||
if (dev->compat_flags & SPAPRVLAN_FLAG_RX_BUF_POOLS) {
|
||||
for (i = 0; i < RX_MAX_POOLS; i++) {
|
||||
|
||||
+1
-1
@@ -1378,7 +1378,7 @@ static void sungem_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static Property sungem_properties[] = {
|
||||
|
||||
+1
-1
@@ -901,7 +901,7 @@ static void sunhme_instance_init(Object *obj)
|
||||
|
||||
device_add_bootindex_property(obj, &s->conf.bootindex,
|
||||
"bootindex", "/ethernet-phy@0",
|
||||
DEVICE(obj), NULL);
|
||||
DEVICE(obj));
|
||||
}
|
||||
|
||||
static void sunhme_reset(DeviceState *ds)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user