mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop more @errp parameters after previous commit

Browse Source 
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:
Markus Armbruster 2020-05-05 17:29:23 +02:00
parent d2623129a7
commit 40c2281cc3
39 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootdevice.c
View File

@ -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));

2
hw/acpi/ich9.c
View File

@ -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;

4
hw/block/fdc.c
View File

@ -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 = {

2
hw/block/nvme.c
View File

@ -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 = {

2
hw/block/vhost-user-blk.c
View File

@ -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 = {

2
hw/block/virtio-blk.c
View File

@ -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 = {

2
hw/core/qdev-properties.c
View File

@ -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,

2
hw/core/qdev.c
View File

@ -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;

2
hw/isa/lpc_ich9.c
View File

@ -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)

2
hw/net/e1000.c
View File

@ -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 = {

2
hw/net/e1000e.c
View File

@ -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 = {

2
hw/net/eepro100.c
View File

@ -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[] = {

2
hw/net/lance.c
View File

@ -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[] = {

2
hw/net/lasi_i82596.c
View File

@ -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[] = {

2
hw/net/ne2000-pci.c
View File

@ -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[] = {

2
hw/net/pcnet-pci.c
View File

@ -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[] = {

2
hw/net/rtl8139.c
View File

@ -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[] = {

2
hw/net/spapr_llan.c
View File

@ -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++) {

2
hw/net/sungem.c
View File

@ -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[] = {

2
hw/net/sunhme.c
View File

@ -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)

2
hw/net/tulip.c
View File

@ -1001,7 +1001,7 @@ static void tulip_instance_init(Object *obj)
device_add_bootindex_property(obj, &d->c.bootindex,
"bootindex", "/ethernet-phy@0",
&pci_dev->qdev, NULL);
&pci_dev->qdev);
}
static Property tulip_properties[] = {

2
hw/net/virtio-net.c
View File

@ -3125,7 +3125,7 @@ static void virtio_net_instance_init(Object *obj)
n->config_size = sizeof(struct virtio_net_config);
device_add_bootindex_property(obj, &n->nic_conf.bootindex,
"bootindex", "/ethernet-phy@0",
DEVICE(n), NULL);
DEVICE(n));
}
static int virtio_net_pre_save(void *opaque)

2
hw/net/vmxnet3.c
View File

@ -2237,7 +2237,7 @@ static void vmxnet3_instance_init(Object *obj)
VMXNET3State *s = VMXNET3(obj);
device_add_bootindex_property(obj, &s->conf.bootindex,
"bootindex", "/ethernet-phy@0",
DEVICE(obj), NULL);
DEVICE(obj));
}
static void vmxnet3_pci_uninit(PCIDevice *pci_dev)

5
hw/ppc/spapr.c
View File

@ -3316,8 +3316,7 @@ static void spapr_instance_init(Object *obj)
" place of standard EPOW events when possible"
" (required for memory hot-unplug support)");
ppc_compat_add_property(obj, "max-cpu-compat", &spapr->max_compat_pvr,
"Maximum permitted CPU compatibility mode",
&error_fatal);
"Maximum permitted CPU compatibility mode");
object_property_add_str(obj, "resize-hpt",
spapr_get_resize_hpt, spapr_set_resize_hpt);
@ -4525,7 +4524,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON;
smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON;
smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_ON;
spapr_caps_add_properties(smc, &error_abort);
spapr_caps_add_properties(smc);
smc->irq = &spapr_irq_dual;
smc->dr_phb_enabled = true;
smc->linux_pci_probe = true;

2
hw/ppc/spapr_caps.c
View File

@ -824,7 +824,7 @@ void spapr_caps_cpu_apply(SpaprMachineState *spapr, PowerPCCPU *cpu)
}
}
void spapr_caps_add_properties(SpaprMachineClass *smc, Error **errp)
void spapr_caps_add_properties(SpaprMachineClass *smc)
{
ObjectClass *klass = OBJECT_CLASS(smc);
int i;

2
hw/s390x/s390-ccw.c
View File

@ -151,7 +151,7 @@ static void s390_ccw_instance_init(Object *obj)
S390CCWDevice *dev = S390_CCW_DEVICE(obj);
device_add_bootindex_property(obj, &dev->bootindex, "bootindex",
"/disk@0,0", DEVICE(obj), NULL);
"/disk@0,0", DEVICE(obj));
}
static void s390_ccw_class_init(ObjectClass *klass, void *data)

2
hw/scsi/scsi-bus.c
View File

@ -1738,7 +1738,7 @@ static void scsi_dev_instance_init(Object *obj)
device_add_bootindex_property(obj, &s->conf.bootindex,
"bootindex", NULL,
&s->qdev, NULL);
&s->qdev);
}
static const TypeInfo scsi_device_type_info = {

2
hw/scsi/vhost-scsi.c
View File

@ -311,7 +311,7 @@ static void vhost_scsi_instance_init(Object *obj)
vsc->feature_bits = kernel_feature_bits;
device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL,
DEVICE(vsc), NULL);
DEVICE(vsc));
}
static const TypeInfo vhost_scsi_info = {

2
hw/scsi/vhost-user-scsi.c
View File

@ -217,7 +217,7 @@ static void vhost_user_scsi_instance_init(Object *obj)
/* Add the bootindex property for this object */
device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL,
DEVICE(vsc), NULL);
DEVICE(vsc));
}
static const TypeInfo vhost_user_scsi_info = {

2
hw/usb/dev-network.c
View File

@ -1381,7 +1381,7 @@ static void usb_net_instance_init(Object *obj)
device_add_bootindex_property(obj, &s->conf.bootindex,
"bootindex", "/ethernet-phy@0",
&dev->qdev, NULL);
&dev->qdev);
}
static const VMStateDescription vmstate_usb_net = {

2
hw/usb/host-libusb.c
View File

@ -1101,7 +1101,7 @@ static void usb_host_instance_init(Object *obj)
device_add_bootindex_property(obj, &s->bootindex,
"bootindex", NULL,
&udev->qdev, NULL);
&udev->qdev);
}
static void usb_host_unrealize(USBDevice *udev, Error **errp)

2
hw/usb/redirect.c
View File

@ -2595,7 +2595,7 @@ static void usbredir_instance_init(Object *obj)
device_add_bootindex_property(obj, &dev->bootindex,
"bootindex", NULL,
&udev->qdev, NULL);
&udev->qdev);
}
static const TypeInfo usbredir_dev_info = {

2
hw/vfio/pci.c
View File

@ -3133,7 +3133,7 @@ static void vfio_instance_init(Object *obj)
device_add_bootindex_property(obj, &vdev->bootindex,
"bootindex", NULL,
&pci_dev->qdev, NULL);
&pci_dev->qdev);
vdev->host.domain = ~0U;
vdev->host.bus = ~0U;
vdev->host.slot = ~0U;

2
include/hw/acpi/ich9.h
View File

@ -72,7 +72,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
extern const VMStateDescription vmstate_ich9_pm;
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp);
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm);
void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp);

2
include/hw/ppc/spapr.h
View File

@ -921,7 +921,7 @@ static inline uint8_t spapr_get_cap(SpaprMachineState *spapr, int cap)
void spapr_caps_init(SpaprMachineState *spapr);
void spapr_caps_apply(SpaprMachineState *spapr);
void spapr_caps_cpu_apply(SpaprMachineState *spapr, PowerPCCPU *cpu);
void spapr_caps_add_properties(SpaprMachineClass *smc, Error **errp);
void spapr_caps_add_properties(SpaprMachineClass *smc);
int spapr_caps_post_migration(SpaprMachineState *spapr);
void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,

2
include/hw/qdev-core.h
View File

@ -286,7 +286,7 @@ struct PropertyInfo {
const QEnumLookup *enum_table;
int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
void (*set_default_value)(ObjectProperty *op, const Property *prop);
void (*create)(ObjectClass *oc, Property *prop, Error **errp);
void (*create)(ObjectClass *oc, Property *prop);
ObjectPropertyAccessor *get;
ObjectPropertyAccessor *set;
ObjectPropertyRelease *release;

2
include/sysemu/sysemu.h
View File

@ -92,7 +92,7 @@ void check_boot_index(int32_t bootindex, Error **errp);
void del_boot_device_path(DeviceState *dev, const char *suffix);
void device_add_bootindex_property(Object *obj, int32_t *bootindex,
const char *name, const char *suffix,
DeviceState *dev, Error **errp);
DeviceState *dev);
void restore_boot_order(void *opaque);
void validate_bootdevices(const char *devices, Error **errp);
void add_boot_device_lchs(DeviceState *dev, const char *suffix,

3
target/ppc/compat.c
View File

@ -298,8 +298,7 @@ out:
}
void ppc_compat_add_property(Object *obj, const char *name,
uint32_t *compat_pvr, const char *basedesc,
Error **errp)
uint32_t *compat_pvr, const char *basedesc)
{
gchar *namesv[ARRAY_SIZE(compat_table) + 1];
gchar *names, *desc;

3
target/ppc/cpu.h
View File

@ -1338,8 +1338,7 @@ void ppc_set_compat_all(uint32_t compat_pvr, Error **errp);
#endif
int ppc_compat_max_vthreads(PowerPCCPU *cpu);
void ppc_compat_add_property(Object *obj, const char *name,
uint32_t *compat_pvr, const char *basedesc,
Error **errp);
uint32_t *compat_pvr, const char *basedesc);
#endif /* defined(TARGET_PPC64) */
typedef CPUPPCState CPUArchState;