qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

+41 -44
+1 -1
bootdevice.c
··· 327 327 328 328 void device_add_bootindex_property(Object *obj, int32_t *bootindex, 329 329 const char *name, const char *suffix, 330 - DeviceState *dev, Error **errp) 330 + DeviceState *dev) 331 331 { 332 332 BootIndexProperty *prop = g_malloc0(sizeof(*prop)); 333 333
+1 -1
hw/acpi/ich9.c
··· 369 369 s->pm.enable_tco = value; 370 370 } 371 371 372 - void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) 372 + void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) 373 373 { 374 374 static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; 375 375 pm->acpi_memory_hotplug.is_enabled = true;
+2 -2
hw/block/fdc.c
··· 2813 2813 2814 2814 device_add_bootindex_property(obj, &isa->bootindexA, 2815 2815 "bootindexA", "/floppy@0", 2816 - DEVICE(obj), NULL); 2816 + DEVICE(obj)); 2817 2817 device_add_bootindex_property(obj, &isa->bootindexB, 2818 2818 "bootindexB", "/floppy@1", 2819 - DEVICE(obj), NULL); 2819 + DEVICE(obj)); 2820 2820 } 2821 2821 2822 2822 static const TypeInfo isa_fdc_info = {
+1 -1
hw/block/nvme.c
··· 1594 1594 1595 1595 device_add_bootindex_property(obj, &s->conf.bootindex, 1596 1596 "bootindex", "/namespace@1,0", 1597 - DEVICE(obj), &error_abort); 1597 + DEVICE(obj)); 1598 1598 } 1599 1599 1600 1600 static const TypeInfo nvme_info = {
+1 -1
hw/block/vhost-user-blk.c
··· 481 481 VHostUserBlk *s = VHOST_USER_BLK(obj); 482 482 483 483 device_add_bootindex_property(obj, &s->bootindex, "bootindex", 484 - "/disk@0,0", DEVICE(obj), NULL); 484 + "/disk@0,0", DEVICE(obj)); 485 485 } 486 486 487 487 static const VMStateDescription vmstate_vhost_user_blk = {
+1 -1
hw/block/virtio-blk.c
··· 1248 1248 1249 1249 device_add_bootindex_property(obj, &s->conf.conf.bootindex, 1250 1250 "bootindex", "/disk@0,0", 1251 - DEVICE(obj), NULL); 1251 + DEVICE(obj)); 1252 1252 } 1253 1253 1254 1254 static const VMStateDescription vmstate_virtio_blk = {
+1 -1
hw/core/qdev-properties.c
··· 1250 1250 1251 1251 /* --- object link property --- */ 1252 1252 1253 - static void create_link_property(ObjectClass *oc, Property *prop, Error **errp) 1253 + static void create_link_property(ObjectClass *oc, Property *prop) 1254 1254 { 1255 1255 object_class_property_add_link(oc, prop->name, prop->link_type, 1256 1256 prop->offset,
+1 -1
hw/core/qdev.c
··· 782 782 ObjectClass *oc = OBJECT_CLASS(klass); 783 783 784 784 if (prop->info->create) { 785 - prop->info->create(oc, prop, &error_abort); 785 + prop->info->create(oc, prop); 786 786 } else { 787 787 ObjectProperty *op; 788 788
+1 -1
hw/isa/lpc_ich9.c
··· 639 639 object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD, 640 640 &acpi_disable_cmd, OBJ_PROP_FLAG_READ); 641 641 642 - ich9_pm_add_properties(obj, &lpc->pm, NULL); 642 + ich9_pm_add_properties(obj, &lpc->pm); 643 643 } 644 644 645 645 static void ich9_lpc_realize(PCIDevice *d, Error **errp)
+1 -1
hw/net/e1000.c
··· 1774 1774 E1000State *n = E1000(obj); 1775 1775 device_add_bootindex_property(obj, &n->conf.bootindex, 1776 1776 "bootindex", "/ethernet-phy@0", 1777 - DEVICE(n), NULL); 1777 + DEVICE(n)); 1778 1778 } 1779 1779 1780 1780 static const TypeInfo e1000_base_info = {
+1 -1
hw/net/e1000e.c
··· 705 705 E1000EState *s = E1000E(obj); 706 706 device_add_bootindex_property(obj, &s->conf.bootindex, 707 707 "bootindex", "/ethernet-phy@0", 708 - DEVICE(obj), NULL); 708 + DEVICE(obj)); 709 709 } 710 710 711 711 static const TypeInfo e1000e_info = {
+1 -1
hw/net/eepro100.c
··· 1883 1883 EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, PCI_DEVICE(obj)); 1884 1884 device_add_bootindex_property(obj, &s->conf.bootindex, 1885 1885 "bootindex", "/ethernet-phy@0", 1886 - DEVICE(s), NULL); 1886 + DEVICE(s)); 1887 1887 } 1888 1888 1889 1889 static E100PCIDeviceInfo e100_devices[] = {
+1 -1
hw/net/lance.c
··· 134 134 135 135 device_add_bootindex_property(obj, &s->conf.bootindex, 136 136 "bootindex", "/ethernet-phy@0", 137 - DEVICE(obj), NULL); 137 + DEVICE(obj)); 138 138 } 139 139 140 140 static Property lance_properties[] = {
+1 -1
hw/net/lasi_i82596.c
··· 152 152 153 153 device_add_bootindex_property(obj, &s->conf.bootindex, 154 154 "bootindex", "/ethernet-phy@0", 155 - DEVICE(obj), NULL); 155 + DEVICE(obj)); 156 156 } 157 157 158 158 static Property lasi_82596_properties[] = {
+1 -1
hw/net/ne2000-pci.c
··· 92 92 93 93 device_add_bootindex_property(obj, &s->c.bootindex, 94 94 "bootindex", "/ethernet-phy@0", 95 - &pci_dev->qdev, NULL); 95 + &pci_dev->qdev); 96 96 } 97 97 98 98 static Property ne2000_properties[] = {
+1 -1
hw/net/pcnet-pci.c
··· 250 250 251 251 device_add_bootindex_property(obj, &s->conf.bootindex, 252 252 "bootindex", "/ethernet-phy@0", 253 - DEVICE(obj), NULL); 253 + DEVICE(obj)); 254 254 } 255 255 256 256 static Property pcnet_properties[] = {
+1 -1
hw/net/rtl8139.c
··· 3415 3415 3416 3416 device_add_bootindex_property(obj, &s->conf.bootindex, 3417 3417 "bootindex", "/ethernet-phy@0", 3418 - DEVICE(obj), NULL); 3418 + DEVICE(obj)); 3419 3419 } 3420 3420 3421 3421 static Property rtl8139_properties[] = {
+1 -1
hw/net/spapr_llan.c
··· 340 340 341 341 device_add_bootindex_property(obj, &dev->nicconf.bootindex, 342 342 "bootindex", "", 343 - DEVICE(dev), NULL); 343 + DEVICE(dev)); 344 344 345 345 if (dev->compat_flags & SPAPRVLAN_FLAG_RX_BUF_POOLS) { 346 346 for (i = 0; i < RX_MAX_POOLS; i++) {
+1 -1
hw/net/sungem.c
··· 1378 1378 1379 1379 device_add_bootindex_property(obj, &s->conf.bootindex, 1380 1380 "bootindex", "/ethernet-phy@0", 1381 - DEVICE(obj), NULL); 1381 + DEVICE(obj)); 1382 1382 } 1383 1383 1384 1384 static Property sungem_properties[] = {
+1 -1
hw/net/sunhme.c
··· 901 901 902 902 device_add_bootindex_property(obj, &s->conf.bootindex, 903 903 "bootindex", "/ethernet-phy@0", 904 - DEVICE(obj), NULL); 904 + DEVICE(obj)); 905 905 } 906 906 907 907 static void sunhme_reset(DeviceState *ds)
+1 -1
hw/net/tulip.c
··· 1001 1001 1002 1002 device_add_bootindex_property(obj, &d->c.bootindex, 1003 1003 "bootindex", "/ethernet-phy@0", 1004 - &pci_dev->qdev, NULL); 1004 + &pci_dev->qdev); 1005 1005 } 1006 1006 1007 1007 static Property tulip_properties[] = {
+1 -1
hw/net/virtio-net.c
··· 3125 3125 n->config_size = sizeof(struct virtio_net_config); 3126 3126 device_add_bootindex_property(obj, &n->nic_conf.bootindex, 3127 3127 "bootindex", "/ethernet-phy@0", 3128 - DEVICE(n), NULL); 3128 + DEVICE(n)); 3129 3129 } 3130 3130 3131 3131 static int virtio_net_pre_save(void *opaque)
+1 -1
hw/net/vmxnet3.c
··· 2237 2237 VMXNET3State *s = VMXNET3(obj); 2238 2238 device_add_bootindex_property(obj, &s->conf.bootindex, 2239 2239 "bootindex", "/ethernet-phy@0", 2240 - DEVICE(obj), NULL); 2240 + DEVICE(obj)); 2241 2241 } 2242 2242 2243 2243 static void vmxnet3_pci_uninit(PCIDevice *pci_dev)
+2 -3
hw/ppc/spapr.c
··· 3316 3316 " place of standard EPOW events when possible" 3317 3317 " (required for memory hot-unplug support)"); 3318 3318 ppc_compat_add_property(obj, "max-cpu-compat", &spapr->max_compat_pvr, 3319 - "Maximum permitted CPU compatibility mode", 3320 - &error_fatal); 3319 + "Maximum permitted CPU compatibility mode"); 3321 3320 3322 3321 object_property_add_str(obj, "resize-hpt", 3323 3322 spapr_get_resize_hpt, spapr_set_resize_hpt); ··· 4525 4524 smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON; 4526 4525 smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON; 4527 4526 smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_ON; 4528 - spapr_caps_add_properties(smc, &error_abort); 4527 + spapr_caps_add_properties(smc); 4529 4528 smc->irq = &spapr_irq_dual; 4530 4529 smc->dr_phb_enabled = true; 4531 4530 smc->linux_pci_probe = true;
+1 -1
hw/ppc/spapr_caps.c
··· 824 824 } 825 825 } 826 826 827 - void spapr_caps_add_properties(SpaprMachineClass *smc, Error **errp) 827 + void spapr_caps_add_properties(SpaprMachineClass *smc) 828 828 { 829 829 ObjectClass *klass = OBJECT_CLASS(smc); 830 830 int i;
+1 -1
hw/s390x/s390-ccw.c
··· 151 151 S390CCWDevice *dev = S390_CCW_DEVICE(obj); 152 152 153 153 device_add_bootindex_property(obj, &dev->bootindex, "bootindex", 154 - "/disk@0,0", DEVICE(obj), NULL); 154 + "/disk@0,0", DEVICE(obj)); 155 155 } 156 156 157 157 static void s390_ccw_class_init(ObjectClass *klass, void *data)
+1 -1
hw/scsi/scsi-bus.c
··· 1738 1738 1739 1739 device_add_bootindex_property(obj, &s->conf.bootindex, 1740 1740 "bootindex", NULL, 1741 - &s->qdev, NULL); 1741 + &s->qdev); 1742 1742 } 1743 1743 1744 1744 static const TypeInfo scsi_device_type_info = {
+1 -1
hw/scsi/vhost-scsi.c
··· 311 311 vsc->feature_bits = kernel_feature_bits; 312 312 313 313 device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL, 314 - DEVICE(vsc), NULL); 314 + DEVICE(vsc)); 315 315 } 316 316 317 317 static const TypeInfo vhost_scsi_info = {
+1 -1
hw/scsi/vhost-user-scsi.c
··· 217 217 218 218 /* Add the bootindex property for this object */ 219 219 device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL, 220 - DEVICE(vsc), NULL); 220 + DEVICE(vsc)); 221 221 } 222 222 223 223 static const TypeInfo vhost_user_scsi_info = {
+1 -1
hw/usb/dev-network.c
··· 1381 1381 1382 1382 device_add_bootindex_property(obj, &s->conf.bootindex, 1383 1383 "bootindex", "/ethernet-phy@0", 1384 - &dev->qdev, NULL); 1384 + &dev->qdev); 1385 1385 } 1386 1386 1387 1387 static const VMStateDescription vmstate_usb_net = {
+1 -1
hw/usb/host-libusb.c
··· 1101 1101 1102 1102 device_add_bootindex_property(obj, &s->bootindex, 1103 1103 "bootindex", NULL, 1104 - &udev->qdev, NULL); 1104 + &udev->qdev); 1105 1105 } 1106 1106 1107 1107 static void usb_host_unrealize(USBDevice *udev, Error **errp)
+1 -1
hw/usb/redirect.c
··· 2595 2595 2596 2596 device_add_bootindex_property(obj, &dev->bootindex, 2597 2597 "bootindex", NULL, 2598 - &udev->qdev, NULL); 2598 + &udev->qdev); 2599 2599 } 2600 2600 2601 2601 static const TypeInfo usbredir_dev_info = {
+1 -1
hw/vfio/pci.c
··· 3133 3133 3134 3134 device_add_bootindex_property(obj, &vdev->bootindex, 3135 3135 "bootindex", NULL, 3136 - &pci_dev->qdev, NULL); 3136 + &pci_dev->qdev); 3137 3137 vdev->host.domain = ~0U; 3138 3138 vdev->host.bus = ~0U; 3139 3139 vdev->host.slot = ~0U;
+1 -1
include/hw/acpi/ich9.h
··· 72 72 void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base); 73 73 extern const VMStateDescription vmstate_ich9_pm; 74 74 75 - void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp); 75 + void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm); 76 76 77 77 void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, 78 78 Error **errp);
+1 -1
include/hw/ppc/spapr.h
··· 921 921 void spapr_caps_init(SpaprMachineState *spapr); 922 922 void spapr_caps_apply(SpaprMachineState *spapr); 923 923 void spapr_caps_cpu_apply(SpaprMachineState *spapr, PowerPCCPU *cpu); 924 - void spapr_caps_add_properties(SpaprMachineClass *smc, Error **errp); 924 + void spapr_caps_add_properties(SpaprMachineClass *smc); 925 925 int spapr_caps_post_migration(SpaprMachineState *spapr); 926 926 927 927 void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,
+1 -1
include/hw/qdev-core.h
··· 286 286 const QEnumLookup *enum_table; 287 287 int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); 288 288 void (*set_default_value)(ObjectProperty *op, const Property *prop); 289 - void (*create)(ObjectClass *oc, Property *prop, Error **errp); 289 + void (*create)(ObjectClass *oc, Property *prop); 290 290 ObjectPropertyAccessor *get; 291 291 ObjectPropertyAccessor *set; 292 292 ObjectPropertyRelease *release;
+1 -1
include/sysemu/sysemu.h
··· 92 92 void del_boot_device_path(DeviceState *dev, const char *suffix); 93 93 void device_add_bootindex_property(Object *obj, int32_t *bootindex, 94 94 const char *name, const char *suffix, 95 - DeviceState *dev, Error **errp); 95 + DeviceState *dev); 96 96 void restore_boot_order(void *opaque); 97 97 void validate_bootdevices(const char *devices, Error **errp); 98 98 void add_boot_device_lchs(DeviceState *dev, const char *suffix,
+1 -2
target/ppc/compat.c
··· 298 298 } 299 299 300 300 void ppc_compat_add_property(Object *obj, const char *name, 301 - uint32_t *compat_pvr, const char *basedesc, 302 - Error **errp) 301 + uint32_t *compat_pvr, const char *basedesc) 303 302 { 304 303 gchar *namesv[ARRAY_SIZE(compat_table) + 1]; 305 304 gchar *names, *desc;
+1 -2
target/ppc/cpu.h
··· 1338 1338 #endif 1339 1339 int ppc_compat_max_vthreads(PowerPCCPU *cpu); 1340 1340 void ppc_compat_add_property(Object *obj, const char *name, 1341 - uint32_t *compat_pvr, const char *basedesc, 1342 - Error **errp); 1341 + uint32_t *compat_pvr, const char *basedesc); 1343 1342 #endif /* defined(TARGET_PPC64) */ 1344 1343 1345 1344 typedef CPUPPCState CPUArchState;