From nobody Sun Feb 8 14:08:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497373608358326.00728926025204; Tue, 13 Jun 2017 10:06:48 -0700 (PDT) Received: from localhost ([::1]:44366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKpHB-0007I9-Bx for importer@patchew.org; Tue, 13 Jun 2017 13:06:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKp4c-0004Wc-1r for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:54:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKp4J-0000Pq-Sb for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56442) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKp4I-0000PG-Vt for qemu-devel@nongnu.org; Tue, 13 Jun 2017 12:53:27 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E15D97D4E0; Tue, 13 Jun 2017 16:53:25 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72258C58C; Tue, 13 Jun 2017 16:53:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E15D97D4E0 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E15D97D4E0 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 13:53:02 -0300 Message-Id: <20170613165313.20954-5-ehabkost@redhat.com> In-Reply-To: <20170613165313.20954-1-ehabkost@redhat.com> References: <20170613165313.20954-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 13 Jun 2017 16:53:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 04/15] [coccinelle] Use IGNORE_ERRORS instead of NULL as errp argument X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This was generated by the following Coccinelle script with hardcoded function names. Probably there's a better way to catch calls to functions that accept an Error** argument, but I didn't find a reliable way to do that. (Script can't be copied verbatim. The huge regexp below was split in multiple lines to make Git happy.) @@ identifier F =3D~ "object(|_class)_property_(add|get|set|del|find).*|\ device_add_bootindex_property|memory_region_init_.*|\ object_property_find|qemu_chr_fe_init|numa_get_node|\ qbus_set_hotplug_handler|qdev_unplug|\ vmstate_register_with_alias_id|bdrv_refresh_limits|\ bdrv_create_dirty_bitmap|bdrv_reclaim_dirty_bitmap|\ blk_dev_change_media_cb|bdrv_lookup_bs|reopen_backing_fi= le|\ bdrv_find_protocol|sd_truncate|qio_channel_socket_accept= |\ block_job_finish_sync|qio_channel_(read|write)(|v)(|_ful= l)|\ qio_channel_close|qio_channel_io_seek|qio_channel_comman= d_abort|\ qio_channel_websock_(read|write)_wire|qio_task_propagate= _error|\ qio_channel_socket_listen_sync|qio_channel_socket_new_fd= |\ bdrv_reopen|blk_truncate|bdrv_truncate|bdrv_op_is_blocke= d|\ qcrypto_block_decrypt|qcrypto_block_get_info|raw_handle_= perm_lock|\ qapi_enum_parse|qmp_(qom_list|query_.*|quit|stop|cont|sy= stem_.*|\ migrate_.*|change_vnc_password|nbd_server_stop|inject_nm= i|\ guest_fsfreeze_thaw|marshal_.*)|qio_channel_shutdown|\ qio_channel_set_blocking|cryptodev_backend_cleanup|\ bdrv_dirty_bitmap_abdicate|qcrypto_block_decrypt|\ qcrypto_block_encrypt|iscsi_open|qcow2_read_extensions|\ qcrypto_hash_bytesv|replication_stop|visit_type_.*|\ qemu_opt(|s)_(set|create|foreach)$|v9fs_device_realize_c= ommon|\ msix_init_exclusive_bar|msi_init|qemu_input_handler_bind= |\ pcie_aer_init|pci_qdev_unrealize|msix_init|usb_qdev_unre= alize|\ usb_try_create_simple|usb_ehci_realize|.*_(|un)realize(|= _common)|\ qdev_unplug|qapi_event_send_migration_pass|nbd_send_opti= on_request|\ blk_invalidate_cache|socket_local_address|json_parser_pa= rse_err|\ object_set_propv|vnc_socket_ip_addr_string|inet_connect_= addr|\ opts_parse|migrate_add_blocker|nbd_wr_syncv|(read|write)= _sync"; @@ F(..., - NULL + IGNORE_ERRORS ) @@ expression T, P, ID, ERR; @@ object_new_with_props(T, P, ID, - NULL + IGNORE_ERRORS ) @@ expression O, ERR; @@ object_set_propv(O, - NULL + IGNORE_ERRORS ) Signed-off-by: Eduardo Habkost --- include/hw/audio/pcspk.h | 2 +- include/hw/isa/isa.h | 3 +- include/migration/vmstate.h | 2 +- target/s390x/cpu.h | 2 +- backends/cryptodev.c | 6 ++-- backends/rng-egd.c | 2 +- backends/rng-random.c | 2 +- backends/rng.c | 2 +- backends/tpm.c | 2 +- block.c | 4 +-- block/backup.c | 6 ++-- block/block-backend.c | 2 +- block/commit.c | 14 ++++---- block/crypto.c | 2 +- block/file-posix.c | 4 +-- block/gluster.c | 2 +- block/iscsi.c | 4 +-- block/mirror.c | 6 ++-- block/nbd-client.c | 10 +++--- block/parallels.c | 7 ++-- block/qcow.c | 6 ++-- block/qcow2.c | 2 +- block/quorum.c | 2 +- block/replication.c | 10 +++--- block/sheepdog.c | 4 +-- block/stream.c | 4 +-- block/vhdx-log.c | 2 +- block/vhdx.c | 2 +- blockdev-nbd.c | 2 +- blockdev.c | 10 +++--- blockjob.c | 4 +-- bootdevice.c | 2 +- bsd-user/elfload.c | 3 +- chardev/char-fd.c | 2 +- chardev/char-io.c | 2 +- chardev/char-pty.c | 2 +- chardev/char-socket.c | 20 ++++++----- chardev/char-udp.c | 4 +-- crypto/secret.c | 12 +++---- crypto/tlscreds.c | 8 ++--- crypto/tlscredsanon.c | 2 +- crypto/tlscredsx509.c | 6 ++-- dump.c | 2 +- exec.c | 2 +- hmp.c | 68 ++++++++++++++++++---------------= ---- hw/9pfs/xen-9p-backend.c | 11 +++--- hw/acpi/ich9.c | 14 ++++---- hw/acpi/memory_hotplug.c | 10 +++--- hw/acpi/nvdimm.c | 16 ++++----- hw/acpi/piix4.c | 14 ++++---- hw/acpi/vmgenid.c | 4 +-- hw/arm/allwinner-a10.c | 2 +- hw/arm/aspeed_soc.c | 23 +++++++------ hw/arm/bcm2835_peripherals.c | 30 +++++++++------- hw/arm/bcm2836.c | 3 +- hw/arm/digic.c | 7 ++-- hw/arm/exynos4210.c | 2 +- hw/arm/fsl-imx6.c | 32 ++++++++++------- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 8 ++--- hw/arm/virt.c | 41 +++++++++++----------- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-zynqmp.c | 4 +-- hw/block/fdc.c | 4 +-- hw/block/nvme.c | 2 +- hw/block/virtio-blk.c | 4 +-- hw/core/bus.c | 8 +++-- hw/core/platform-bus.c | 5 +-- hw/core/qdev-properties-system.c | 4 +-- hw/core/qdev.c | 24 +++++++------ hw/core/sysbus.c | 5 +-- hw/cpu/a15mpcore.c | 2 +- hw/cpu/a9mpcore.c | 2 +- hw/cpu/core.c | 4 +-- hw/display/vga-pci.c | 6 ++-- hw/i386/acpi-build.c | 51 ++++++++++++++++------------ hw/i386/kvm/pci-assign.c | 2 +- hw/i386/pc.c | 4 +-- hw/i386/pc_q35.c | 15 ++++---- hw/ide/ich.c | 2 +- hw/ide/qdev.c | 4 +-- hw/input/virtio-input-hid.c | 3 +- hw/intc/apic_common.c | 4 +-- hw/intc/arm_gicv3_common.c | 3 +- hw/intc/s390_flic.c | 2 +- hw/intc/s390_flic_kvm.c | 2 +- hw/ipmi/ipmi.c | 2 +- hw/isa/lpc_ich9.c | 6 ++-- hw/mem/nvdimm.c | 2 +- hw/mem/pc-dimm.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 14 ++++---- hw/mips/boston.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/misc/auxbus.c | 2 +- hw/misc/edu.c | 2 +- hw/misc/macio/macio.c | 4 +-- hw/misc/pvpanic.c | 2 +- hw/misc/tmp105.c | 2 +- hw/net/e1000.c | 2 +- hw/net/e1000e.c | 8 ++--- hw/net/eepro100.c | 2 +- hw/net/lance.c | 2 +- hw/net/ne2000-isa.c | 4 +-- hw/net/ne2000.c | 2 +- hw/net/pcnet-pci.c | 2 +- hw/net/rtl8139.c | 2 +- hw/net/spapr_llan.c | 2 +- hw/net/virtio-net.c | 2 +- hw/net/vmxnet3.c | 6 ++-- hw/nvram/fw_cfg.c | 3 +- hw/pci-host/gpex.c | 2 +- hw/pci-host/piix.c | 13 +++---- hw/pci-host/prep.c | 2 +- hw/pci-host/q35.c | 25 ++++++++------ hw/pci-host/xilinx-pcie.c | 4 +-- hw/pci/pci.c | 2 +- hw/pci/pcie.c | 2 +- hw/pci/shpc.c | 2 +- hw/pcmcia/pxa2xx.c | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/pnv.c | 10 +++--- hw/ppc/pnv_core.c | 2 +- hw/ppc/pnv_psi.c | 3 +- hw/ppc/prep.c | 6 ++-- hw/ppc/spapr.c | 14 ++++---- hw/ppc/spapr_drc.c | 19 ++++++----- hw/ppc/spapr_iommu.c | 4 +-- hw/ppc/spapr_pci.c | 4 +-- hw/ppc/spapr_rng.c | 4 +-- hw/ppc/spapr_rtc.c | 3 +- hw/s390x/event-facility.c | 4 +-- hw/s390x/ipl.c | 3 +- hw/s390x/s390-pci-bus.c | 8 ++--- hw/s390x/s390-skeys.c | 6 ++-- hw/s390x/s390-virtio-ccw.c | 24 ++++++------- hw/s390x/s390-virtio.c | 2 +- hw/s390x/sclp.c | 7 ++-- hw/s390x/virtio-ccw.c | 4 +-- hw/scsi/megasas.c | 2 +- hw/scsi/scsi-bus.c | 8 ++--- hw/scsi/vhost-scsi.c | 2 +- hw/scsi/vmw_pvscsi.c | 2 +- hw/timer/mc146818rtc.c | 6 ++-- hw/usb/bus.c | 8 ++--- hw/usb/dev-hid.c | 3 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-storage.c | 6 ++-- hw/usb/hcd-ehci-pci.c | 4 +-- hw/usb/hcd-xhci.c | 2 +- hw/usb/host-libusb.c | 2 +- hw/usb/redirect.c | 2 +- hw/vfio/pci.c | 2 +- hw/virtio/virtio-balloon.c | 4 +-- hw/virtio/virtio-crypto-pci.c | 2 +- hw/virtio/virtio-crypto.c | 2 +- hw/virtio/virtio-pci.c | 4 +-- hw/virtio/virtio-rng.c | 6 ++-- hw/virtio/virtio.c | 3 +- hw/xen/xen_pvdev.c | 2 +- io/channel-command.c | 2 +- io/channel-tls.c | 4 +-- linux-user/elfload.c | 3 +- linux-user/uname.c | 2 +- migration/block.c | 3 +- migration/colo.c | 4 +-- migration/qemu-file-channel.c | 10 +++--- migration/ram.c | 3 +- migration/socket.c | 2 +- monitor.c | 10 +++--- nbd/client.c | 4 +-- nbd/server.c | 18 +++++----- net/colo-compare.c | 6 ++-- net/dump.c | 4 +-- net/filter-buffer.c | 2 +- net/filter-mirror.c | 6 ++-- net/filter.c | 6 ++-- net/net.c | 6 ++-- numa.c | 7 ++-- qdev-monitor.c | 6 ++-- qemu-img.c | 24 ++++++------- qemu-io.c | 2 +- qemu-nbd.c | 4 +-- qga/commands-posix.c | 2 +- qga/main.c | 2 +- qobject/json-parser.c | 2 +- qom/container.c | 2 +- qom/object.c | 18 +++++----- qom/object_interfaces.c | 2 +- target/alpha/cpu.c | 2 +- target/arm/cpu64.c | 4 +-- target/hppa/cpu.c | 2 +- target/i386/cpu.c | 25 ++++++++------ target/m68k/helper.c | 2 +- target/microblaze/translate.c | 2 +- target/mips/translate.c | 2 +- target/nios2/cpu.c | 2 +- target/ppc/kvm.c | 3 +- target/s390x/cpu.c | 2 +- target/s390x/cpu_models.c | 17 ++++++---- target/s390x/kvm.c | 4 +-- target/sparc/cpu.c | 2 +- target/tilegx/cpu.c | 2 +- target/xtensa/helper.c | 2 +- tests/check-qom-proplist.c | 17 +++++----- tests/io-channel-helpers.c | 4 +-- tests/test-char.c | 2 +- tests/test-crypto-hash.c | 2 +- tests/test-io-channel-socket.c | 2 +- tests/test-io-channel-tls.c | 8 +++-- tests/test-qdev-global-props.c | 4 +-- tests/test-qemu-opts.c | 4 +-- tests/test-string-input-visitor.c | 12 +++---- tpm.c | 2 +- ui/gtk.c | 12 +++---- ui/input-linux.c | 6 ++-- ui/spice-core.c | 2 +- ui/vnc-auth-sasl.c | 4 +-- ui/vnc.c | 8 ++--- util/qemu-config.c | 6 ++-- util/qemu-option.c | 2 +- util/qemu-sockets.c | 3 +- vl.c | 5 +-- 225 files changed, 712 insertions(+), 628 deletions(-) diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 1a626d718d..fe9a738a49 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -39,7 +39,7 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevic= e *pit) isadev =3D isa_create(bus, TYPE_PC_SPEAKER); dev =3D DEVICE(isadev); qdev_prop_set_uint32(dev, "iobase", 0x61); - object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL); + object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", IGNORE_ERROR= S); qdev_init_nofail(dev); =20 return isadev; diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index f0574a04e2..4b8c13532c 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -30,7 +30,8 @@ static inline uint16_t applesmc_port(void) Object *obj =3D object_resolve_path_type("", TYPE_APPLE_SMC, NULL); =20 if (obj) { - return object_property_get_int(obj, APPLESMC_PROP_IO_BASE, NULL); + return object_property_get_int(obj, APPLESMC_PROP_IO_BASE, + IGNORE_ERRORS); } return 0; } diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 26ab616c8a..13fb10797a 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -1033,7 +1033,7 @@ static inline int vmstate_register(DeviceState *dev, = int instance_id, void *opaque) { return vmstate_register_with_alias_id(dev, instance_id, vmsd, - opaque, -1, 0, NULL); + opaque, -1, 0, IGNORE_ERRORS); } =20 void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index c1aa087e8d..2ce509f601 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -1267,7 +1267,7 @@ static inline void s390_crypto_reset(void) static inline bool s390_get_squash_mcss(void) { if (object_property_get_bool(OBJECT(qdev_get_machine()), "s390-squash-= mcss", - NULL)) { + IGNORE_ERRORS)) { return true; } =20 diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 832f056266..03a78f269f 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -225,16 +225,16 @@ static void cryptodev_backend_instance_init(Object *o= bj) object_property_add(obj, "queues", "int", cryptodev_backend_get_queues, cryptodev_backend_set_queues, - NULL, NULL, NULL); + NULL, NULL, IGNORE_ERRORS); /* Initialize devices' queues property to 1 */ - object_property_set_int(obj, 1, "queues", NULL); + object_property_set_int(obj, 1, "queues", IGNORE_ERRORS); } =20 static void cryptodev_backend_finalize(Object *obj) { CryptoDevBackend *backend =3D CRYPTODEV_BACKEND(obj); =20 - cryptodev_backend_cleanup(backend, NULL); + cryptodev_backend_cleanup(backend, IGNORE_ERRORS); } =20 static void diff --git a/backends/rng-egd.c b/backends/rng-egd.c index e7ce2cac80..8c2acae177 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -138,7 +138,7 @@ static void rng_egd_init(Object *obj) { object_property_add_str(obj, "chardev", rng_egd_get_chardev, rng_egd_set_chardev, - NULL); + IGNORE_ERRORS); } =20 static void rng_egd_finalize(Object *obj) diff --git a/backends/rng-random.c b/backends/rng-random.c index e2a49b0571..029f6b9b01 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -110,7 +110,7 @@ static void rng_random_init(Object *obj) object_property_add_str(obj, "filename", rng_random_get_filename, rng_random_set_filename, - NULL); + IGNORE_ERRORS); =20 s->filename =3D g_strdup("/dev/random"); s->fd =3D -1; diff --git a/backends/rng.c b/backends/rng.c index 398ebe4a7d..59b7503efb 100644 --- a/backends/rng.c +++ b/backends/rng.c @@ -108,7 +108,7 @@ static void rng_backend_init(Object *obj) object_property_add_bool(obj, "opened", rng_backend_prop_get_opened, rng_backend_prop_set_opened, - NULL); + IGNORE_ERRORS); } =20 static void rng_backend_finalize(Object *obj) diff --git a/backends/tpm.c b/backends/tpm.c index 536f262bb7..ef3e20a3cb 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -155,7 +155,7 @@ static void tpm_backend_instance_init(Object *obj) object_property_add_bool(obj, "opened", tpm_backend_prop_get_opened, tpm_backend_prop_set_opened, - NULL); + IGNORE_ERRORS); } =20 void tpm_backend_thread_deliver_request(TPMBackendThread *tbt) diff --git a/block.c b/block.c index 1750a1838e..ecb5be9a32 100644 --- a/block.c +++ b/block.c @@ -2096,7 +2096,7 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockD= riverState *backing_hd, bdrv_refresh_filename(bs); =20 out: - bdrv_refresh_limits(bs, NULL); + bdrv_refresh_limits(bs, IGNORE_ERRORS); } =20 /* @@ -3002,7 +3002,7 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) reopen_state->bs->open_flags =3D reopen_state->flags; reopen_state->bs->read_only =3D !(reopen_state->flags & BDRV_O_RDWR); =20 - bdrv_refresh_limits(reopen_state->bs, NULL); + bdrv_refresh_limits(reopen_state->bs, IGNORE_ERRORS); } =20 /* diff --git a/block/backup.c b/block/backup.c index 5387fbd84e..6976129e7d 100644 --- a/block/backup.c +++ b/block/backup.c @@ -218,11 +218,11 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob= *job, int ret) =20 if (ret < 0 || block_job_is_cancelled(&job->common)) { /* Merge the successor back into the parent, delete nothing. */ - bm =3D bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL); + bm =3D bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, IGNORE_ERRO= RS); assert(bm); } else { /* Everything is fine, delete this bitmap and install the backup. = */ - bm =3D bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL); + bm =3D bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, IGNORE_ERR= ORS); assert(bm); } } @@ -688,7 +688,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDr= iverState *bs, =20 error: if (sync_bitmap) { - bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, NULL); + bdrv_reclaim_dirty_bitmap(bs, sync_bitmap, IGNORE_ERRORS); } if (job) { backup_clean(&job->common); diff --git a/block/block-backend.c b/block/block-backend.c index 7a885031e2..9b9ca2eb35 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -819,7 +819,7 @@ void blk_dev_change_media_cb(BlockBackend *blk, bool lo= ad, Error **errp) =20 static void blk_root_change_media(BdrvChild *child, bool load) { - blk_dev_change_media_cb(child->opaque, load, NULL); + blk_dev_change_media_cb(child->opaque, load, IGNORE_ERRORS); } =20 /* diff --git a/block/commit.c b/block/commit.c index af6fa68cf3..264495177e 100644 --- a/block/commit.c +++ b/block/commit.c @@ -112,10 +112,10 @@ static void commit_complete(BlockJob *job, void *opaq= ue) * to r/o). These reopens do not need to be atomic, since we won't abo= rt * even on failure here */ if (s->base_flags !=3D bdrv_get_flags(base)) { - bdrv_reopen(base, s->base_flags, NULL); + bdrv_reopen(base, s->base_flags, IGNORE_ERRORS); } if (overlay_bs && s->orig_overlay_flags !=3D bdrv_get_flags(overlay_bs= )) { - bdrv_reopen(overlay_bs, s->orig_overlay_flags, NULL); + bdrv_reopen(overlay_bs, s->orig_overlay_flags, IGNORE_ERRORS); } g_free(s->backing_file_str); blk_unref(s->top); @@ -158,7 +158,7 @@ static void coroutine_fn commit_run(void *opaque) } =20 if (base_len < s->common.len) { - ret =3D blk_truncate(s->base, s->common.len, NULL); + ret =3D blk_truncate(s->base, s->common.len, IGNORE_ERRORS); if (ret) { goto out; } @@ -459,8 +459,8 @@ int bdrv_commit(BlockDriverState *bs) return -ENOTSUP; } =20 - if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT_SOURCE, NULL) || - bdrv_op_is_blocked(bs->backing->bs, BLOCK_OP_TYPE_COMMIT_TARGET, N= ULL)) { + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT_SOURCE, IGNORE_ERRORS)= || + bdrv_op_is_blocked(bs->backing->bs, BLOCK_OP_TYPE_COMMIT_TARGET, I= GNORE_ERRORS)) { return -EBUSY; } =20 @@ -468,7 +468,7 @@ int bdrv_commit(BlockDriverState *bs) open_flags =3D bs->backing->bs->open_flags; =20 if (ro) { - if (bdrv_reopen(bs->backing->bs, open_flags | BDRV_O_RDWR, NULL)) { + if (bdrv_reopen(bs->backing->bs, open_flags | BDRV_O_RDWR, IGNORE_= ERRORS)) { return -EACCES; } } @@ -582,7 +582,7 @@ ro_cleanup: =20 if (ro) { /* ignoring error return here */ - bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, NULL); + bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, IGNORE_ERR= ORS); } =20 return ret; diff --git a/block/crypto.c b/block/crypto.c index 10e5ddccaa..f317eda83f 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -601,7 +601,7 @@ block_crypto_get_specific_info_luks(BlockDriverState *b= s) ImageInfoSpecific *spec_info; QCryptoBlockInfo *info; =20 - info =3D qcrypto_block_get_info(crypto->block, NULL); + info =3D qcrypto_block_get_info(crypto->block, IGNORE_ERRORS); if (!info) { return NULL; } diff --git a/block/file-posix.c b/block/file-posix.c index de2d3a2e3c..5e30164be3 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2175,14 +2175,14 @@ static int raw_check_perm(BlockDriverState *bs, uin= t64_t perm, uint64_t shared, static void raw_set_perm(BlockDriverState *bs, uint64_t perm, uint64_t sha= red) { BDRVRawState *s =3D bs->opaque; - raw_handle_perm_lock(bs, RAW_PL_COMMIT, perm, shared, NULL); + raw_handle_perm_lock(bs, RAW_PL_COMMIT, perm, shared, IGNORE_ERRORS); s->perm =3D perm; s->shared_perm =3D shared; } =20 static void raw_abort_perm_update(BlockDriverState *bs) { - raw_handle_perm_lock(bs, RAW_PL_ABORT, 0, 0, NULL); + raw_handle_perm_lock(bs, RAW_PL_ABORT, 0, 0, IGNORE_ERRORS); } =20 BlockDriver bdrv_file =3D { diff --git a/block/gluster.c b/block/gluster.c index 031596adbc..6179195620 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -547,7 +547,7 @@ static int qemu_gluster_parse_json(BlockdevOptionsGlust= er *gconf, ptr =3D "inet"; /* accept legacy "tcp" */ } type =3D qapi_enum_parse(SocketAddressType_lookup, ptr, - SOCKET_ADDRESS_TYPE__MAX, -1, NULL); + SOCKET_ADDRESS_TYPE__MAX, -1, IGNORE_ERRORS= ); if (type !=3D SOCKET_ADDRESS_TYPE_INET && type !=3D SOCKET_ADDRESS_TYPE_UNIX) { error_setg(&local_err, diff --git a/block/iscsi.c b/block/iscsi.c index 9f1d94f7f1..0116fe97ce 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1362,7 +1362,7 @@ static char *get_initiator_name(QemuOpts *opts) return g_strdup(name); } =20 - uuid_info =3D qmp_query_uuid(NULL); + uuid_info =3D qmp_query_uuid(IGNORE_ERRORS); if (strcmp(uuid_info->UUID, UUID_NONE) =3D=3D 0) { name =3D qemu_get_vm_name(); } else { @@ -2111,7 +2111,7 @@ static int iscsi_create(const char *filename, QemuOpt= s *opts, Error **errp) error_propagate(errp, local_err); ret =3D -EINVAL; } else { - ret =3D iscsi_open(bs, bs_options, 0, NULL); + ret =3D iscsi_open(bs, bs_options, 0, IGNORE_ERRORS); } QDECREF(bs_options); =20 diff --git a/block/mirror.c b/block/mirror.c index a2a970301c..2d5d7dbbc2 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -550,7 +550,7 @@ static void mirror_exit(BlockJob *job, void *opaque) } =20 if (bdrv_get_flags(target_bs) !=3D bdrv_get_flags(to_replace)) { - bdrv_reopen(target_bs, bdrv_get_flags(to_replace), NULL); + bdrv_reopen(target_bs, bdrv_get_flags(to_replace), IGNORE_ERRO= RS); } =20 /* The mirror job has no requests in flight any more, but we need = to @@ -729,7 +729,7 @@ static void coroutine_fn mirror_run(void *opaque) } =20 if (s->bdev_length > base_length) { - ret =3D blk_truncate(s->target, s->bdev_length, NULL); + ret =3D blk_truncate(s->target, s->bdev_length, IGNORE_ERRORS); if (ret < 0) { goto immediate_exit; } @@ -1322,6 +1322,6 @@ void commit_active_start(const char *job_id, BlockDri= verState *bs, error_restore_flags: /* ignore error and errp for bdrv_reopen, because we want to propagate * the original error */ - bdrv_reopen(base, orig_base_flags, NULL); + bdrv_reopen(base, orig_base_flags, IGNORE_ERRORS); return; } diff --git a/block/nbd-client.c b/block/nbd-client.c index 87d19c7253..ac3f735d27 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -56,7 +56,7 @@ static void nbd_teardown_connection(BlockDriverState *bs) /* finish any pending coroutines */ qio_channel_shutdown(client->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, - NULL); + IGNORE_ERRORS); BDRV_POLL_WHILE(bs, client->read_reply_co); =20 nbd_client_detach_aio_context(bs); @@ -145,7 +145,7 @@ static int nbd_co_send_request(BlockDriverState *bs, rc =3D nbd_send_request(s->ioc, request); if (rc >=3D 0) { ret =3D nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->l= en, - false, NULL); + false, IGNORE_ERRORS); if (ret !=3D request->len) { rc =3D -EIO; } @@ -174,7 +174,7 @@ static void nbd_co_receive_reply(NBDClientSession *s, } else { if (qiov && reply->error =3D=3D 0) { ret =3D nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->l= en, - true, NULL); + true, IGNORE_ERRORS); if (ret !=3D request->len) { reply->error =3D EIO; } @@ -382,7 +382,7 @@ int nbd_client_init(BlockDriverState *bs, =20 /* NBD handshake */ logout("session init %s\n", export); - qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL); + qio_channel_set_blocking(QIO_CHANNEL(sioc), true, IGNORE_ERRORS); =20 ret =3D nbd_receive_negotiate(QIO_CHANNEL(sioc), export, &client->nbdflags, @@ -413,7 +413,7 @@ int nbd_client_init(BlockDriverState *bs, =20 /* Now that we're connected, set the socket to be non-blocking and * kick the reply mechanism. */ - qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); + qio_channel_set_blocking(QIO_CHANNEL(sioc), false, IGNORE_ERRORS); client->read_reply_co =3D qemu_coroutine_create(nbd_read_reply_entry, = client); nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs)); =20 diff --git a/block/parallels.c b/block/parallels.c index 8be46a7d48..d4125a6220 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -224,7 +224,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, = int64_t sector_num, } else { ret =3D bdrv_truncate(bs->file, (s->data_end + space) << BDRV_SECTOR_BITS, - NULL); + IGNORE_ERRORS); } if (ret < 0) { return ret; @@ -699,7 +699,7 @@ static int parallels_open(BlockDriverState *bs, QDict *= options, int flags, } =20 if (!(flags & BDRV_O_RESIZE) || !bdrv_has_zero_init(bs->file->bs) || - bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs), NULL) != =3D 0) { + bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs), IGNORE_E= RRORS) !=3D 0) { s->prealloc_mode =3D PRL_PREALLOC_MODE_FALLOCATE; } =20 @@ -742,7 +742,8 @@ static void parallels_close(BlockDriverState *bs) } =20 if (bs->open_flags & BDRV_O_RDWR) { - bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, NULL); + bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, + IGNORE_ERRORS); } =20 g_free(s->bat_dirty_bmap); diff --git a/block/qcow.c b/block/qcow.c index 7bd94dcd46..13d7842db3 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -473,7 +473,8 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, /* round to cluster size */ cluster_offset =3D (cluster_offset + s->cluster_size - 1) & ~(s->cluster_size - 1); - bdrv_truncate(bs->file, cluster_offset + s->cluster_size, = NULL); + bdrv_truncate(bs->file, cluster_offset + s->cluster_size, + IGNORE_ERRORS); /* if encrypted, we must initialize the cluster content which won't be written */ if (bs->encrypted && @@ -917,7 +918,8 @@ static int qcow_make_empty(BlockDriverState *bs) if (bdrv_pwrite_sync(bs->file, s->l1_table_offset, s->l1_table, l1_length) < 0) return -1; - ret =3D bdrv_truncate(bs->file, s->l1_table_offset + l1_length, NULL); + ret =3D bdrv_truncate(bs->file, s->l1_table_offset + l1_length, + IGNORE_ERRORS); if (ret < 0) return ret; =20 diff --git a/block/qcow2.c b/block/qcow2.c index b3ba5daa93..aa0dc46162 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -929,7 +929,7 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *o= ptions, int flags, if (s->incompatible_features & ~QCOW2_INCOMPAT_MASK) { void *feature_table =3D NULL; qcow2_read_extensions(bs, header.header_length, ext_end, - &feature_table, NULL); + &feature_table, IGNORE_ERRORS); report_unsupported_feature(errp, feature_table, s->incompatible_features & ~QCOW2_INCOMPAT_MASK); diff --git a/block/quorum.c b/block/quorum.c index 1b2a8c3937..ab9f253c96 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -385,7 +385,7 @@ static int quorum_compute_hash(QuorumAIOCB *acb, int i,= QuorumVoteValue *hash) if (qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_SHA256, qiov->iov, qiov->niov, &data, &len, - NULL) < 0) { + IGNORE_ERRORS) < 0) { return -EINVAL; } =20 diff --git a/block/replication.c b/block/replication.c index 3885f04c31..c4ac17201a 100644 --- a/block/replication.c +++ b/block/replication.c @@ -142,7 +142,7 @@ static void replication_close(BlockDriverState *bs) BDRVReplicationState *s =3D bs->opaque; =20 if (s->stage =3D=3D BLOCK_REPLICATION_RUNNING) { - replication_stop(s->rs, false, NULL); + replication_stop(s->rs, false, IGNORE_ERRORS); } if (s->stage =3D=3D BLOCK_REPLICATION_FAILOVER) { block_job_cancel_sync(s->active_disk->bs->job); @@ -389,13 +389,13 @@ static void backup_job_cleanup(BlockDriverState *bs) BDRVReplicationState *s =3D bs->opaque; BlockDriverState *top_bs; =20 - top_bs =3D bdrv_lookup_bs(s->top_id, s->top_id, NULL); + top_bs =3D bdrv_lookup_bs(s->top_id, s->top_id, IGNORE_ERRORS); if (!top_bs) { return; } bdrv_op_unblock_all(top_bs, s->blocker); error_free(s->blocker); - reopen_backing_file(bs, false, NULL); + reopen_backing_file(bs, false, IGNORE_ERRORS); } =20 static void backup_job_completed(void *opaque, int ret) @@ -516,11 +516,11 @@ static void replication_start(ReplicationState *rs, R= eplicationMode mode, error_setg(&s->blocker, "Block device is in use by internal backup job"); =20 - top_bs =3D bdrv_lookup_bs(s->top_id, s->top_id, NULL); + top_bs =3D bdrv_lookup_bs(s->top_id, s->top_id, IGNORE_ERRORS); if (!top_bs || !bdrv_is_root_node(top_bs) || !check_top_bs(top_bs, bs)) { error_setg(errp, "No top_bs or it is invalid"); - reopen_backing_file(bs, false, NULL); + reopen_backing_file(bs, false, IGNORE_ERRORS); aio_context_release(aio_context); return; } diff --git a/block/sheepdog.c b/block/sheepdog.c index a18315a1ca..dd75571435 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2020,7 +2020,7 @@ static int sd_create(const char *filename, QemuOpts *= opts, BlockDriver *drv; =20 /* Currently, only Sheepdog backing image is supported. */ - drv =3D bdrv_find_protocol(backing_file, true, NULL); + drv =3D bdrv_find_protocol(backing_file, true, IGNORE_ERRORS); if (!drv || strcmp(drv->protocol_name, "sheepdog") !=3D 0) { error_setg(errp, "backing_file must be a sheepdog image"); ret =3D -EINVAL; @@ -2448,7 +2448,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState= *bs, int64_t sector_num, BDRVSheepdogState *s =3D bs->opaque; =20 if (offset > s->inode.vdi_size) { - ret =3D sd_truncate(bs, offset, NULL); + ret =3D sd_truncate(bs, offset, IGNORE_ERRORS); if (ret < 0) { return ret; } diff --git a/block/stream.c b/block/stream.c index 52d329f5c6..826783635a 100644 --- a/block/stream.c +++ b/block/stream.c @@ -93,7 +93,7 @@ out: if (s->bs_flags !=3D bdrv_get_flags(bs)) { /* Give up write permissions before making it read-only */ blk_set_perm(job->blk, 0, BLK_PERM_ALL, &error_abort); - bdrv_reopen(bs, s->bs_flags, NULL); + bdrv_reopen(bs, s->bs_flags, IGNORE_ERRORS); } =20 g_free(s->backing_file_str); @@ -280,6 +280,6 @@ void stream_start(const char *job_id, BlockDriverState = *bs, =20 fail: if (orig_bs_flags !=3D bdrv_get_flags(bs)) { - bdrv_reopen(bs, orig_bs_flags, NULL); + bdrv_reopen(bs, orig_bs_flags, IGNORE_ERRORS); } } diff --git a/block/vhdx-log.c b/block/vhdx-log.c index 3f4c2aa095..906d5439fb 100644 --- a/block/vhdx-log.c +++ b/block/vhdx-log.c @@ -548,7 +548,7 @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHD= XState *s, if (new_file_size % (1024*1024)) { /* round up to nearest 1MB boundary */ new_file_size =3D ((new_file_size >> 20) + 1) << 20; - bdrv_truncate(bs->file, new_file_size, NULL); + bdrv_truncate(bs->file, new_file_size, IGNORE_ERRORS); } } qemu_vfree(desc_entries); diff --git a/block/vhdx.c b/block/vhdx.c index 8b270b57c9..890afe064b 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1171,7 +1171,7 @@ static int vhdx_allocate_block(BlockDriverState *bs, = BDRVVHDXState *s, /* per the spec, the address for a block is in units of 1MB */ *new_offset =3D ROUND_UP(*new_offset, 1024 * 1024); =20 - return bdrv_truncate(bs->file, *new_offset + s->block_size, NULL); + return bdrv_truncate(bs->file, *new_offset + s->block_size, IGNORE_ERR= ORS); } =20 /* diff --git a/blockdev-nbd.c b/blockdev-nbd.c index dd0860f4a6..e7bf14a8ed 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -38,7 +38,7 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOCondition = condition, } =20 cioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), - NULL); + IGNORE_ERRORS); if (!cioc) { return TRUE; } diff --git a/blockdev.c b/blockdev.c index 6472548186..fdbf33aa3d 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1377,7 +1377,7 @@ static BdrvDirtyBitmap *block_dirty_bitmap_lookup(con= st char *node, error_setg(errp, "Bitmap name cannot be NULL"); return NULL; } - bs =3D bdrv_lookup_bs(node, node, NULL); + bs =3D bdrv_lookup_bs(node, node, IGNORE_ERRORS); if (!bs) { error_setg(errp, "Node '%s' not found", node); return NULL; @@ -1707,7 +1707,7 @@ static void external_snapshot_prepare(BlkActionState = *common, } =20 if (snapshot_node_name && - bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) { + bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, IGNORE_= ERRORS)) { error_setg(errp, "New snapshot node name already in use"); return; } @@ -1793,7 +1793,7 @@ static void external_snapshot_commit(BlkActionState *= common) * don't want to abort all of them if one of them fails the reopen */ if (!state->old_bs->copy_on_read) { bdrv_reopen(state->old_bs, state->old_bs->open_flags & ~BDRV_O_RDW= R, - NULL); + IGNORE_ERRORS); } } =20 @@ -2916,7 +2916,7 @@ void qmp_block_resize(bool has_device, const char *de= vice, goto out; } =20 - if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, NULL)) { + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, IGNORE_ERRORS)) { error_setg(errp, QERR_DEVICE_IN_USE, device); goto out; } @@ -3055,7 +3055,7 @@ void qmp_block_commit(bool has_job_id, const char *jo= b_id, const char *device, * scenario in which all optional arguments are omitted. */ bs =3D qmp_get_root_bs(device, &local_err); if (!bs) { - bs =3D bdrv_lookup_bs(device, device, NULL); + bs =3D bdrv_lookup_bs(device, device, IGNORE_ERRORS); if (!bs) { error_free(local_err); error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, diff --git a/blockjob.c b/blockjob.c index a0d7e29b83..69ad28dd65 100644 --- a/blockjob.c +++ b/blockjob.c @@ -419,7 +419,7 @@ static void block_job_completed_txn_abort(BlockJob *job) ctx =3D blk_get_aio_context(other_job->blk); if (!other_job->completed) { assert(other_job->cancelled); - block_job_finish_sync(other_job, NULL, NULL); + block_job_finish_sync(other_job, NULL, IGNORE_ERRORS); } block_job_completed_single(other_job); aio_context_release(ctx); @@ -523,7 +523,7 @@ static void block_job_cancel_err(BlockJob *job, Error *= *errp) =20 int block_job_cancel_sync(BlockJob *job) { - return block_job_finish_sync(job, &block_job_cancel_err, NULL); + return block_job_finish_sync(job, &block_job_cancel_err, IGNORE_ERRORS= ); } =20 void block_job_cancel_sync_all(void) diff --git a/bootdevice.c b/bootdevice.c index 33e3029e40..29ebbb1c48 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -338,5 +338,5 @@ void device_add_bootindex_property(Object *obj, int32_t= *bootindex, return; } /* initialize devices' bootindex property to -1 */ - object_property_set_int(obj, -1, name, NULL); + object_property_set_int(obj, -1, name, IGNORE_ERRORS); } diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 0d626a418a..6362238dbf 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -93,7 +93,8 @@ enum { static const char *get_elf_platform(void) { static char elf_platform[] =3D "i386"; - int family =3D object_property_get_int(OBJECT(thread_cpu), "family", N= ULL); + int family =3D object_property_get_int(OBJECT(thread_cpu), "family", + IGNORE_ERRORS); if (family > 6) family =3D 6; if (family >=3D 3) diff --git a/chardev/char-fd.c b/chardev/char-fd.c index 1584a3de20..b0ebccf0c6 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -56,7 +56,7 @@ static gboolean fd_chr_read(QIOChannel *chan, GIOConditio= n cond, void *opaque) } =20 ret =3D qio_channel_read( - chan, (gchar *)buf, len, NULL); + chan, (gchar *)buf, len, IGNORE_ERRORS); if (ret =3D=3D 0) { remove_fd_in_watch(chr); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); diff --git a/chardev/char-io.c b/chardev/char-io.c index a017af784d..13a2431b34 100644 --- a/chardev/char-io.c +++ b/chardev/char-io.c @@ -161,7 +161,7 @@ int io_channel_send_full(QIOChannel *ioc, =20 ret =3D qio_channel_writev_full( ioc, &iov, 1, - fds, nfds, NULL); + fds, nfds, IGNORE_ERRORS); if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { if (offset) { return offset; diff --git a/chardev/char-pty.c b/chardev/char-pty.c index e5d20a0e6a..09609d397d 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -168,7 +168,7 @@ static gboolean pty_chr_read(QIOChannel *chan, GIOCondi= tion cond, void *opaque) if (len =3D=3D 0) { return TRUE; } - ret =3D qio_channel_read(s->ioc, (char *)buf, len, NULL); + ret =3D qio_channel_read(s->ioc, (char *)buf, len, IGNORE_ERRORS); if (ret <=3D 0) { pty_chr_state(chr, 0); return FALSE; diff --git a/chardev/char-socket.c b/chardev/char-socket.c index ccc499cfa1..7ca9863631 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -276,11 +276,11 @@ static ssize_t tcp_chr_recv(Chardev *chr, char *buf, = size_t len) if (qio_channel_has_feature(s->ioc, QIO_CHANNEL_FEATURE_FD_PASS)) { ret =3D qio_channel_readv_full(s->ioc, &iov, 1, &msgfds, &msgfds_num, - NULL); + IGNORE_ERRORS); } else { ret =3D qio_channel_readv_full(s->ioc, &iov, 1, NULL, NULL, - NULL); + IGNORE_ERRORS); } =20 if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { @@ -550,7 +550,7 @@ static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc, TCPChardevTelnetInit *init =3D user_data; ssize_t ret; =20 - ret =3D qio_channel_write(ioc, init->buf, init->buflen, NULL); + ret =3D qio_channel_write(ioc, init->buf, init->buflen, IGNORE_ERRORS); if (ret < 0) { if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { ret =3D 0; @@ -620,7 +620,7 @@ static void tcp_chr_tls_handshake(QIOTask *task, Chardev *chr =3D user_data; SocketChardev *s =3D user_data; =20 - if (qio_task_propagate_error(task, NULL)) { + if (qio_task_propagate_error(task, IGNORE_ERRORS)) { tcp_chr_disconnect(chr); } else { /* tn3270 does not support TLS yet */ @@ -697,7 +697,7 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelS= ocket *sioc) s->sioc =3D sioc; object_ref(OBJECT(sioc)); =20 - qio_channel_set_blocking(s->ioc, false, NULL); + qio_channel_set_blocking(s->ioc, false, IGNORE_ERRORS); =20 if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); @@ -726,7 +726,7 @@ static int tcp_chr_add_client(Chardev *chr, int fd) int ret; QIOChannelSocket *sioc; =20 - sioc =3D qio_channel_socket_new_fd(fd, NULL); + sioc =3D qio_channel_socket_new_fd(fd, IGNORE_ERRORS); if (!sioc) { return -1; } @@ -744,7 +744,7 @@ static gboolean tcp_chr_accept(QIOChannel *channel, QIOChannelSocket *sioc; =20 sioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(channel), - NULL); + IGNORE_ERRORS); if (!sioc) { return TRUE; } @@ -767,9 +767,11 @@ static int tcp_chr_wait_connected(Chardev *chr, Error = **errp) if (s->is_listen) { error_report("QEMU waiting for connection on: %s", chr->filename); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NUL= L); + qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, + IGNORE_ERRORS); tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NU= LL); + qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, + IGNORE_ERRORS); } else { sioc =3D qio_channel_socket_new(); tcp_chr_set_client_ioc_name(chr, sioc); diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 4ee11d3ebf..d8766b1fd0 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -48,7 +48,7 @@ static int udp_chr_write(Chardev *chr, const uint8_t *buf= , int len) UdpChardev *s =3D UDP_CHARDEV(chr); =20 return qio_channel_write( - s->ioc, (const char *)buf, len, NULL); + s->ioc, (const char *)buf, len, IGNORE_ERRORS); } =20 static void udp_chr_flush_buffer(UdpChardev *s) @@ -88,7 +88,7 @@ static gboolean udp_chr_read(QIOChannel *chan, GIOConditi= on cond, void *opaque) return TRUE; } ret =3D qio_channel_read( - s->ioc, (char *)s->buf, sizeof(s->buf), NULL); + s->ioc, (char *)s->buf, sizeof(s->buf), IGNORE_ERRORS); if (ret <=3D 0) { remove_fd_in_watch(chr); return FALSE; diff --git a/crypto/secret.c b/crypto/secret.c index 285ab7a63c..e5631b9dd2 100644 --- a/crypto/secret.c +++ b/crypto/secret.c @@ -375,29 +375,29 @@ qcrypto_secret_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, "loaded", qcrypto_secret_prop_get_loaded, qcrypto_secret_prop_set_loaded, - NULL); + IGNORE_ERRORS); object_class_property_add_enum(oc, "format", "QCryptoSecretFormat", QCryptoSecretFormat_lookup, qcrypto_secret_prop_get_format, qcrypto_secret_prop_set_format, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "data", qcrypto_secret_prop_get_data, qcrypto_secret_prop_set_data, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "file", qcrypto_secret_prop_get_file, qcrypto_secret_prop_set_file, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "keyid", qcrypto_secret_prop_get_keyid, qcrypto_secret_prop_set_keyid, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "iv", qcrypto_secret_prop_get_iv, qcrypto_secret_prop_set_iv, - NULL); + IGNORE_ERRORS); } =20 =20 diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c index a8965531b6..21bd388769 100644 --- a/crypto/tlscreds.c +++ b/crypto/tlscreds.c @@ -226,21 +226,21 @@ qcrypto_tls_creds_class_init(ObjectClass *oc, void *d= ata) object_class_property_add_bool(oc, "verify-peer", qcrypto_tls_creds_prop_get_verify, qcrypto_tls_creds_prop_set_verify, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "dir", qcrypto_tls_creds_prop_get_dir, qcrypto_tls_creds_prop_set_dir, - NULL); + IGNORE_ERRORS); object_class_property_add_enum(oc, "endpoint", "QCryptoTLSCredsEndpoint", QCryptoTLSCredsEndpoint_lookup, qcrypto_tls_creds_prop_get_endpoint, qcrypto_tls_creds_prop_set_endpoint, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "priority", qcrypto_tls_creds_prop_get_priority, qcrypto_tls_creds_prop_set_priority, - NULL); + IGNORE_ERRORS); } =20 =20 diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index 1464220080..ad6f331aca 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -191,7 +191,7 @@ qcrypto_tls_creds_anon_class_init(ObjectClass *oc, void= *data) object_class_property_add_bool(oc, "loaded", qcrypto_tls_creds_anon_prop_get_loaded, qcrypto_tls_creds_anon_prop_set_loaded, - NULL); + IGNORE_ERRORS); } =20 =20 diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 50eb54f6bb..f4dc85cb75 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -833,15 +833,15 @@ qcrypto_tls_creds_x509_class_init(ObjectClass *oc, vo= id *data) object_class_property_add_bool(oc, "loaded", qcrypto_tls_creds_x509_prop_get_loaded, qcrypto_tls_creds_x509_prop_set_loaded, - NULL); + IGNORE_ERRORS); object_class_property_add_bool(oc, "sanity-check", qcrypto_tls_creds_x509_prop_get_sanity, qcrypto_tls_creds_x509_prop_set_sanity, - NULL); + IGNORE_ERRORS); object_class_property_add_str(oc, "passwordid", qcrypto_tls_creds_x509_prop_get_password= id, qcrypto_tls_creds_x509_prop_set_password= id, - NULL); + IGNORE_ERRORS); } =20 =20 diff --git a/dump.c b/dump.c index d9090a24cc..dc78c98b23 100644 --- a/dump.c +++ b/dump.c @@ -1681,7 +1681,7 @@ static void dump_process(DumpState *s, Error **errp) (local_err ? DUMP_STATUS_FAILED : DUMP_STATUS_COMPLETED)); =20 /* send DUMP_COMPLETED message (unconditionally) */ - result =3D qmp_query_dump(NULL); + result =3D qmp_query_dump(IGNORE_ERRORS); /* should never fail */ assert(result); qapi_event_send_dump_completed(result, !!local_err, (local_err ? \ diff --git a/exec.c b/exec.c index 67fc5b92b9..9d73a63f1c 100644 --- a/exec.c +++ b/exec.c @@ -1404,7 +1404,7 @@ static int find_max_supported_pagesize(Object *obj, v= oid *opaque) long *hpsize_min =3D opaque; =20 if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { - mem_path =3D object_property_get_str(obj, "mem-path", NULL); + mem_path =3D object_property_get_str(obj, "mem-path", IGNORE_ERROR= S); if (mem_path) { long hpsize =3D qemu_mempath_getpagesize(mem_path); if (hpsize < *hpsize_min) { diff --git a/hmp.c b/hmp.c index f92445827c..cd87d7dfd6 100644 --- a/hmp.c +++ b/hmp.c @@ -59,7 +59,7 @@ void hmp_info_name(Monitor *mon, const QDict *qdict) { NameInfo *info; =20 - info =3D qmp_query_name(NULL); + info =3D qmp_query_name(IGNORE_ERRORS); if (info->has_name) { monitor_printf(mon, "%s\n", info->name); } @@ -70,7 +70,7 @@ void hmp_info_version(Monitor *mon, const QDict *qdict) { VersionInfo *info; =20 - info =3D qmp_query_version(NULL); + info =3D qmp_query_version(IGNORE_ERRORS); =20 monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n", info->qemu->major, info->qemu->minor, info->qemu->micro, @@ -83,7 +83,7 @@ void hmp_info_kvm(Monitor *mon, const QDict *qdict) { KvmInfo *info; =20 - info =3D qmp_query_kvm(NULL); + info =3D qmp_query_kvm(IGNORE_ERRORS); monitor_printf(mon, "kvm support: "); if (info->present) { monitor_printf(mon, "%s\n", info->enabled ? "enabled" : "disabled"= ); @@ -98,7 +98,7 @@ void hmp_info_status(Monitor *mon, const QDict *qdict) { StatusInfo *info; =20 - info =3D qmp_query_status(NULL); + info =3D qmp_query_status(IGNORE_ERRORS); =20 monitor_printf(mon, "VM status: %s%s", info->running ? "running" : "paused", @@ -117,7 +117,7 @@ void hmp_info_uuid(Monitor *mon, const QDict *qdict) { UuidInfo *info; =20 - info =3D qmp_query_uuid(NULL); + info =3D qmp_query_uuid(IGNORE_ERRORS); monitor_printf(mon, "%s\n", info->UUID); qapi_free_UuidInfo(info); } @@ -126,7 +126,7 @@ void hmp_info_chardev(Monitor *mon, const QDict *qdict) { ChardevInfoList *char_info, *info; =20 - char_info =3D qmp_query_chardev(NULL); + char_info =3D qmp_query_chardev(IGNORE_ERRORS); for (info =3D char_info; info; info =3D info->next) { monitor_printf(mon, "%s: filename=3D%s\n", info->value->label, info->value->filename); @@ -139,7 +139,7 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict) { MouseInfoList *mice_list, *mouse; =20 - mice_list =3D qmp_query_mice(NULL); + mice_list =3D qmp_query_mice(IGNORE_ERRORS); if (!mice_list) { monitor_printf(mon, "No mouse devices connected\n"); return; @@ -160,8 +160,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) MigrationInfo *info; MigrationCapabilityStatusList *caps, *cap; =20 - info =3D qmp_query_migrate(NULL); - caps =3D qmp_query_migrate_capabilities(NULL); + info =3D qmp_query_migrate(IGNORE_ERRORS); + caps =3D qmp_query_migrate_capabilities(IGNORE_ERRORS); =20 /* do not display parameters during setup */ if (info->has_status && caps) { @@ -269,7 +269,7 @@ void hmp_info_migrate_capabilities(Monitor *mon, const = QDict *qdict) { MigrationCapabilityStatusList *caps, *cap; =20 - caps =3D qmp_query_migrate_capabilities(NULL); + caps =3D qmp_query_migrate_capabilities(IGNORE_ERRORS); =20 if (caps) { for (cap =3D caps; cap; cap =3D cap->next) { @@ -286,7 +286,7 @@ void hmp_info_migrate_parameters(Monitor *mon, const QD= ict *qdict) { MigrationParameters *params; =20 - params =3D qmp_query_migrate_parameters(NULL); + params =3D qmp_query_migrate_parameters(IGNORE_ERRORS); =20 if (params) { assert(params->has_compress_level); @@ -339,14 +339,14 @@ void hmp_info_migrate_parameters(Monitor *mon, const = QDict *qdict) void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict) { monitor_printf(mon, "xbzrel cache size: %" PRId64 " kbytes\n", - qmp_query_migrate_cache_size(NULL) >> 10); + qmp_query_migrate_cache_size(IGNORE_ERRORS) >> 10); } =20 void hmp_info_cpus(Monitor *mon, const QDict *qdict) { CpuInfoList *cpu_list, *cpu; =20 - cpu_list =3D qmp_query_cpus(NULL); + cpu_list =3D qmp_query_cpus(IGNORE_ERRORS); =20 for (cpu =3D cpu_list; cpu; cpu =3D cpu->next) { int active =3D ' '; @@ -513,7 +513,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) =20 /* Print BlockBackend information */ if (!nodes) { - block_list =3D qmp_query_block(NULL); + block_list =3D qmp_query_block(IGNORE_ERRORS); } else { block_list =3D NULL; } @@ -540,7 +540,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) } =20 /* Print node information */ - blockdev_list =3D qmp_query_named_block_nodes(NULL); + blockdev_list =3D qmp_query_named_block_nodes(IGNORE_ERRORS); for (blockdev =3D blockdev_list; blockdev; blockdev =3D blockdev->next= ) { assert(blockdev->value->has_node_name); if (device && strcmp(device, blockdev->value->node_name)) { @@ -560,7 +560,7 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdi= ct) { BlockStatsList *stats_list, *stats; =20 - stats_list =3D qmp_query_blockstats(false, false, NULL); + stats_list =3D qmp_query_blockstats(false, false, IGNORE_ERRORS); =20 for (stats =3D stats_list; stats; stats =3D stats->next) { if (!stats->value->has_device) { @@ -667,7 +667,7 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict) #endif }; =20 - info =3D qmp_query_spice(NULL); + info =3D qmp_query_spice(IGNORE_ERRORS); =20 if (!info->enabled) { monitor_printf(mon, "Server: disabled\n"); @@ -985,22 +985,22 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) void hmp_quit(Monitor *mon, const QDict *qdict) { monitor_suspend(mon); - qmp_quit(NULL); + qmp_quit(IGNORE_ERRORS); } =20 void hmp_stop(Monitor *mon, const QDict *qdict) { - qmp_stop(NULL); + qmp_stop(IGNORE_ERRORS); } =20 void hmp_system_reset(Monitor *mon, const QDict *qdict) { - qmp_system_reset(NULL); + qmp_system_reset(IGNORE_ERRORS); } =20 void hmp_system_powerdown(Monitor *mon, const QDict *qdict) { - qmp_system_powerdown(NULL); + qmp_system_powerdown(IGNORE_ERRORS); } =20 void hmp_cpu(Monitor *mon, const QDict *qdict) @@ -1087,7 +1087,7 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdic= t) static void hmp_cont_cb(void *opaque, int err) { if (!err) { - qmp_cont(NULL); + qmp_cont(IGNORE_ERRORS); } } =20 @@ -1101,7 +1101,7 @@ void hmp_cont(Monitor *mon, const QDict *qdict) BlockInfoList *bdev_list, *bdev; Error *err =3D NULL; =20 - bdev_list =3D qmp_query_block(NULL); + bdev_list =3D qmp_query_block(IGNORE_ERRORS); for (bdev =3D bdev_list; bdev; bdev =3D bdev->next) { if (key_is_missing(bdev->value)) { monitor_read_block_device_key(mon, bdev->value->device, @@ -1119,7 +1119,7 @@ out: =20 void hmp_system_wakeup(Monitor *mon, const QDict *qdict) { - qmp_system_wakeup(NULL); + qmp_system_wakeup(IGNORE_ERRORS); } =20 void hmp_nmi(Monitor *mon, const QDict *qdict) @@ -1456,7 +1456,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qd= ict) =20 void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) { - qmp_migrate_cancel(NULL); + qmp_migrate_cancel(IGNORE_ERRORS); } =20 void hmp_migrate_incoming(Monitor *mon, const QDict *qdict) @@ -1473,7 +1473,7 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *= qdict) void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) { double value =3D qdict_get_double(qdict, "value"); - qmp_migrate_set_downtime(value, NULL); + qmp_migrate_set_downtime(value, IGNORE_ERRORS); } =20 void hmp_migrate_set_cache_size(Monitor *mon, const QDict *qdict) @@ -1492,7 +1492,7 @@ void hmp_migrate_set_cache_size(Monitor *mon, const Q= Dict *qdict) void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) { int64_t value =3D qdict_get_int(qdict, "value"); - qmp_migrate_set_speed(value, NULL); + qmp_migrate_set_speed(value, IGNORE_ERRORS); } =20 void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict) @@ -1695,7 +1695,7 @@ void hmp_eject(Monitor *mon, const QDict *qdict) static void hmp_change_read_arg(void *opaque, const char *password, void *readline_opaque) { - qmp_change_vnc_password(password, NULL); + qmp_change_vnc_password(password, IGNORE_ERRORS); monitor_read_command(opaque, 1); } =20 @@ -1844,7 +1844,7 @@ static void hmp_migrate_status_cb(void *opaque) HMPMigrationStatus *status =3D opaque; MigrationInfo *info; =20 - info =3D qmp_query_migrate(NULL); + info =3D qmp_query_migrate(IGNORE_ERRORS); if (!info->has_status || info->status =3D=3D MIGRATION_STATUS_ACTIVE || info->status =3D=3D MIGRATION_STATUS_SETUP) { if (info->has_disk) { @@ -2154,7 +2154,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *= qdict) /* Then try adding all block devices. If one fails, close all and * exit. */ - block_list =3D qmp_query_block(NULL); + block_list =3D qmp_query_block(IGNORE_ERRORS); =20 for (info =3D block_list; info; info =3D info->next) { if (!info->value->has_inserted) { @@ -2164,7 +2164,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *= qdict) qmp_nbd_server_add(info->value->device, true, writable, &local_err= ); =20 if (local_err !=3D NULL) { - qmp_nbd_server_stop(NULL); + qmp_nbd_server_stop(IGNORE_ERRORS); break; } } @@ -2308,7 +2308,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) =20 while (m) { v =3D string_output_visitor_new(false, &str); - visit_type_uint16List(v, NULL, &m->value->host_nodes, NULL); + visit_type_uint16List(v, NULL, &m->value->host_nodes, IGNORE_ERROR= S); monitor_printf(mon, "memory backend: %s\n", m->value->id); monitor_printf(mon, " size: %" PRId64 "\n", m->value->size); monitor_printf(mon, " merge: %s\n", @@ -2372,7 +2372,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDic= t *qdict) =20 void hmp_info_iothreads(Monitor *mon, const QDict *qdict) { - IOThreadInfoList *info_list =3D qmp_query_iothreads(NULL); + IOThreadInfoList *info_list =3D qmp_query_iothreads(IGNORE_ERRORS); IOThreadInfoList *info; IOThreadInfo *value; =20 @@ -2740,7 +2740,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDi= ct *qdict) =20 void hmp_info_dump(Monitor *mon, const QDict *qdict) { - DumpQueryResult *result =3D qmp_query_dump(NULL); + DumpQueryResult *result =3D qmp_query_dump(IGNORE_ERRORS); =20 assert(result && result->status < DUMP_STATUS__MAX); monitor_printf(mon, "Status: %s\n", DumpStatus_lookup[result->status]); diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 6ab999d2ce..5c7dcfd61b 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -401,13 +401,14 @@ static int xen_9pfs_connect(struct XenDevice *xendev) v9fs_register_transport(s, &xen_9p_transport); fsdev =3D qemu_opts_create(qemu_find_opts("fsdev"), s->fsconf.tag, - 1, NULL); - qemu_opt_set(fsdev, "fsdriver", "local", NULL); - qemu_opt_set(fsdev, "path", xen_9pdev->path, NULL); - qemu_opt_set(fsdev, "security_model", xen_9pdev->security_model, NULL); + 1, IGNORE_ERRORS); + qemu_opt_set(fsdev, "fsdriver", "local", IGNORE_ERRORS); + qemu_opt_set(fsdev, "path", xen_9pdev->path, IGNORE_ERRORS); + qemu_opt_set(fsdev, "security_model", xen_9pdev->security_model, + IGNORE_ERRORS); qemu_opts_set_id(fsdev, s->fsconf.fsdev_id); qemu_fsdev_add(fsdev); - v9fs_device_realize_common(s, NULL); + v9fs_device_realize_common(s, IGNORE_ERRORS); =20 return 0; =20 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 5c279bbaca..54e422a39f 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -455,33 +455,33 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMReg= s *pm, Error **errp) &pm->pm_io_base, errp); object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32", ich9_pm_get_gpe0_blk, - NULL, NULL, pm, NULL); + NULL, NULL, pm, IGNORE_ERRORS); object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN, &gpe0_len, errp); object_property_add_bool(obj, "memory-hotplug-support", ich9_pm_get_memory_hotplug_support, ich9_pm_set_memory_hotplug_support, - NULL); + IGNORE_ERRORS); object_property_add_bool(obj, "cpu-hotplug-legacy", ich9_pm_get_cpu_hotplug_legacy, ich9_pm_set_cpu_hotplug_legacy, - NULL); + IGNORE_ERRORS); object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8", ich9_pm_get_disable_s3, ich9_pm_set_disable_s3, - NULL, pm, NULL); + NULL, pm, IGNORE_ERRORS); object_property_add(obj, ACPI_PM_PROP_S4_DISABLED, "uint8", ich9_pm_get_disable_s4, ich9_pm_set_disable_s4, - NULL, pm, NULL); + NULL, pm, IGNORE_ERRORS); object_property_add(obj, ACPI_PM_PROP_S4_VAL, "uint8", ich9_pm_get_s4_val, ich9_pm_set_s4_val, - NULL, pm, NULL); + NULL, pm, IGNORE_ERRORS); object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED, ich9_pm_get_enable_tco, ich9_pm_set_enable_tco, - NULL); + IGNORE_ERRORS); } =20 void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index f28c6766e5..f4b6a096c0 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -84,23 +84,23 @@ static uint64_t acpi_memory_hotplug_read(void *opaque, = hwaddr addr, o =3D OBJECT(mdev->dimm); switch (addr) { case 0x0: /* Lo part of phys address where DIMM is mapped */ - val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) : = 0; + val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, IGNORE_E= RRORS) : 0; trace_mhp_acpi_read_addr_lo(mem_st->selector, val); break; case 0x4: /* Hi part of phys address where DIMM is mapped */ - val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) >>= 32 : 0; + val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, IGNORE_E= RRORS) >> 32 : 0; trace_mhp_acpi_read_addr_hi(mem_st->selector, val); break; case 0x8: /* Lo part of DIMM size */ - val =3D o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) : = 0; + val =3D o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, IGNORE_E= RRORS) : 0; trace_mhp_acpi_read_size_lo(mem_st->selector, val); break; case 0xc: /* Hi part of DIMM size */ - val =3D o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) >>= 32 : 0; + val =3D o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, IGNORE_E= RRORS) >> 32 : 0; trace_mhp_acpi_read_size_hi(mem_st->selector, val); break; case 0x10: /* node proximity for _PXM method */ - val =3D o ? object_property_get_int(o, PC_DIMM_NODE_PROP, NULL) : = 0; + val =3D o ? object_property_get_int(o, PC_DIMM_NODE_PROP, IGNORE_E= RRORS) : 0; trace_mhp_acpi_read_pxm(mem_st->selector, val); break; case 0x14: /* pack and return is_* fields */ diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index c691a1de5b..a8c3a9e7f0 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -220,7 +220,7 @@ static NVDIMMDevice *nvdimm_get_device_by_handle(uint32= _t handle) for (list =3D device_list; list; list =3D list->next) { NVDIMMDevice *nvd =3D list->data; int slot =3D object_property_get_int(OBJECT(nvd), PC_DIMM_SLOT_PRO= P, - NULL); + IGNORE_ERRORS); =20 if (nvdimm_slot_to_handle(slot) =3D=3D handle) { nvdimm =3D nvd; @@ -238,13 +238,13 @@ nvdimm_build_structure_spa(GArray *structures, Device= State *dev) { NvdimmNfitSpa *nfit_spa; uint64_t addr =3D object_property_get_int(OBJECT(dev), PC_DIMM_ADDR_PR= OP, - NULL); + IGNORE_ERRORS); uint64_t size =3D object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PR= OP, - NULL); + IGNORE_ERRORS); uint32_t node =3D object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PR= OP, - NULL); + IGNORE_ERRORS); int slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, - NULL); + IGNORE_ERRORS); =20 nfit_spa =3D acpi_data_push(structures, sizeof(*nfit_spa)); =20 @@ -286,9 +286,9 @@ nvdimm_build_structure_memdev(GArray *structures, Devic= eState *dev) { NvdimmNfitMemDev *nfit_memdev; uint64_t size =3D object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PR= OP, - NULL); + IGNORE_ERRORS); int slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, - NULL); + IGNORE_ERRORS); uint32_t handle =3D nvdimm_slot_to_handle(slot); =20 nfit_memdev =3D acpi_data_push(structures, sizeof(*nfit_memdev)); @@ -322,7 +322,7 @@ static void nvdimm_build_structure_dcr(GArray *structur= es, DeviceState *dev) { NvdimmNfitControlRegion *nfit_dcr; int slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, - NULL); + IGNORE_ERRORS); uint32_t sn =3D nvdimm_slot_to_sn(slot); =20 nfit_dcr =3D acpi_data_push(structures, sizeof(*nfit_dcr)); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index f276967365..f3c5f03d35 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -480,17 +480,17 @@ static void piix4_pm_add_propeties(PIIX4PMState *s) static const uint16_t sci_int =3D 9; =20 object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, IGNORE_ERRORS); object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, IGNORE_ERRORS); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK, - &gpe0_blk, NULL); + &gpe0_blk, IGNORE_ERRORS); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN, - &gpe0_blk_len, NULL); + &gpe0_blk_len, IGNORE_ERRORS); object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT, - &sci_int, NULL); + &sci_int, IGNORE_ERRORS); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, - &s->io_base, NULL); + &s->io_base, IGNORE_ERRORS); } =20 static void piix4_pm_realize(PCIDevice *dev, Error **errp) @@ -646,7 +646,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion= *parent, object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", piix4_get_cpu_hotplug_legacy, piix4_set_cpu_hotplug_legacy, - NULL); + IGNORE_ERRORS); legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu, PIIX4_CPU_HOTPLUG_IO_BASE); =20 diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 780637028e..5bc495960c 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -243,11 +243,11 @@ static void vmgenid_device_class_init(ObjectClass *kl= ass, void *data) dc->props =3D vmgenid_properties; =20 object_class_property_add_str(klass, VMGENID_GUID, NULL, - vmgenid_set_guid, NULL); + vmgenid_set_guid, IGNORE_ERRORS); object_class_property_set_description(klass, VMGENID_GUID, "Set Global Unique Identifier " "(big-endian) or auto for random value= ", - NULL); + IGNORE_ERRORS); } =20 static const TypeInfo vmgenid_device_info =3D { diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index f62a9a3541..651409094c 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -28,7 +28,7 @@ static void aw_a10_init(Object *obj) AwA10State *s =3D AW_A10(obj); =20 object_initialize(&s->cpu, sizeof(s->cpu), "cortex-a8-" TYPE_ARM_CPU); - object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL); + object_property_add_child(obj, "cpu", OBJECT(&s->cpu), IGNORE_ERRORS); =20 object_initialize(&s->intc, sizeof(s->intc), TYPE_AW_A10_PIC); qdev_set_parent_bus(DEVICE(&s->intc), sysbus_get_default()); diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 4937e2bc83..d546b6af91 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -129,23 +129,24 @@ static void aspeed_soc_init(Object *obj) =20 cpu_typename =3D g_strdup_printf("%s-" TYPE_ARM_CPU, sc->info->cpu_mod= el); object_initialize(&s->cpu, sizeof(s->cpu), cpu_typename); - object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL); + object_property_add_child(obj, "cpu", OBJECT(&s->cpu), IGNORE_ERRORS); g_free(cpu_typename); =20 object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC); - object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL); + object_property_add_child(obj, "vic", OBJECT(&s->vic), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->vic), sysbus_get_default()); =20 object_initialize(&s->timerctrl, sizeof(s->timerctrl), TYPE_ASPEED_TIM= ER); - object_property_add_child(obj, "timerctrl", OBJECT(&s->timerctrl), NUL= L); + object_property_add_child(obj, "timerctrl", OBJECT(&s->timerctrl), + IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->timerctrl), sysbus_get_default()); =20 object_initialize(&s->i2c, sizeof(s->i2c), TYPE_ASPEED_I2C); - object_property_add_child(obj, "i2c", OBJECT(&s->i2c), NULL); + object_property_add_child(obj, "i2c", OBJECT(&s->i2c), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->i2c), sysbus_get_default()); =20 object_initialize(&s->scu, sizeof(s->scu), TYPE_ASPEED_SCU); - object_property_add_child(obj, "scu", OBJECT(&s->scu), NULL); + object_property_add_child(obj, "scu", OBJECT(&s->scu), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->scu), sysbus_get_default()); qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", sc->info->silicon_rev); @@ -155,7 +156,7 @@ static void aspeed_soc_init(Object *obj) "hw-strap2", &error_abort); =20 object_initialize(&s->fmc, sizeof(s->fmc), sc->info->fmc_typename); - object_property_add_child(obj, "fmc", OBJECT(&s->fmc), NULL); + object_property_add_child(obj, "fmc", OBJECT(&s->fmc), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->fmc), sysbus_get_default()); object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs", &error_abort); @@ -163,12 +164,13 @@ static void aspeed_soc_init(Object *obj) for (i =3D 0; i < sc->info->spis_num; i++) { object_initialize(&s->spi[i], sizeof(s->spi[i]), sc->info->spi_typename[i]); - object_property_add_child(obj, "spi[*]", OBJECT(&s->spi[i]), NULL); + object_property_add_child(obj, "spi[*]", OBJECT(&s->spi[i]), + IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default()); } =20 object_initialize(&s->sdmc, sizeof(s->sdmc), TYPE_ASPEED_SDMC); - object_property_add_child(obj, "sdmc", OBJECT(&s->sdmc), NULL); + object_property_add_child(obj, "sdmc", OBJECT(&s->sdmc), IGNORE_ERRORS= ); qdev_set_parent_bus(DEVICE(&s->sdmc), sysbus_get_default()); qdev_prop_set_uint32(DEVICE(&s->sdmc), "silicon-rev", sc->info->silicon_rev); @@ -176,11 +178,12 @@ static void aspeed_soc_init(Object *obj) "ram-size", &error_abort); =20 object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT); - object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL); + object_property_add_child(obj, "wdt", OBJECT(&s->wdt), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default()); =20 object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100); - object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NUL= L); + object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), + IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->ftgmac100), sysbus_get_default()); } =20 diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 502f04c02a..447870b5a7 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -27,12 +27,14 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* Memory region for peripheral devices, which we export to our parent= */ memory_region_init(&s->peri_mr, obj,"bcm2835-peripherals", 0x1000000); - object_property_add_child(obj, "peripheral-io", OBJECT(&s->peri_mr), N= ULL); + object_property_add_child(obj, "peripheral-io", OBJECT(&s->peri_mr), + IGNORE_ERRORS); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->peri_mr); =20 /* Internal memory region for peripheral bus addresses (not exported) = */ memory_region_init(&s->gpu_bus_mr, obj, "bcm2835-gpu", (uint64_t)1 << = 32); - object_property_add_child(obj, "gpu-bus", OBJECT(&s->gpu_bus_mr), NULL= ); + object_property_add_child(obj, "gpu-bus", OBJECT(&s->gpu_bus_mr), + IGNORE_ERRORS); =20 /* Internal memory region for request/response communication with * mailbox-addressable peripherals (not exported) @@ -42,22 +44,22 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* Interrupt Controller */ object_initialize(&s->ic, sizeof(s->ic), TYPE_BCM2835_IC); - object_property_add_child(obj, "ic", OBJECT(&s->ic), NULL); + object_property_add_child(obj, "ic", OBJECT(&s->ic), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default()); =20 /* UART0 */ s->uart0 =3D SYS_BUS_DEVICE(object_new("pl011")); - object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL); + object_property_add_child(obj, "uart0", OBJECT(s->uart0), IGNORE_ERROR= S); qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default()); =20 /* AUX / UART1 */ object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX); - object_property_add_child(obj, "aux", OBJECT(&s->aux), NULL); + object_property_add_child(obj, "aux", OBJECT(&s->aux), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->aux), sysbus_get_default()); =20 /* Mailboxes */ object_initialize(&s->mboxes, sizeof(s->mboxes), TYPE_BCM2835_MBOX); - object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), NULL); + object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), IGNORE_ERRO= RS); qdev_set_parent_bus(DEVICE(&s->mboxes), sysbus_get_default()); =20 object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr", @@ -65,7 +67,7 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* Framebuffer */ object_initialize(&s->fb, sizeof(s->fb), TYPE_BCM2835_FB); - object_property_add_child(obj, "fb", OBJECT(&s->fb), NULL); + object_property_add_child(obj, "fb", OBJECT(&s->fb), IGNORE_ERRORS); object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-si= ze", &error_abort); qdev_set_parent_bus(DEVICE(&s->fb), sysbus_get_default()); @@ -75,7 +77,8 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* Property channel */ object_initialize(&s->property, sizeof(s->property), TYPE_BCM2835_PROP= ERTY); - object_property_add_child(obj, "property", OBJECT(&s->property), NULL); + object_property_add_child(obj, "property", OBJECT(&s->property), + IGNORE_ERRORS); object_property_add_alias(obj, "board-rev", OBJECT(&s->property), "board-rev", &error_abort); qdev_set_parent_bus(DEVICE(&s->property), sysbus_get_default()); @@ -87,22 +90,23 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* Random Number Generator */ object_initialize(&s->rng, sizeof(s->rng), TYPE_BCM2835_RNG); - object_property_add_child(obj, "rng", OBJECT(&s->rng), NULL); + object_property_add_child(obj, "rng", OBJECT(&s->rng), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->rng), sysbus_get_default()); =20 /* Extended Mass Media Controller */ object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI); - object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL); + object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), IGNORE_ERRO= RS); qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default()); =20 /* SDHOST */ object_initialize(&s->sdhost, sizeof(s->sdhost), TYPE_BCM2835_SDHOST); - object_property_add_child(obj, "sdhost", OBJECT(&s->sdhost), NULL); + object_property_add_child(obj, "sdhost", OBJECT(&s->sdhost), + IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->sdhost), sysbus_get_default()); =20 /* DMA Channels */ object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA); - object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL); + object_property_add_child(obj, "dma", OBJECT(&s->dma), IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->dma), sysbus_get_default()); =20 object_property_add_const_link(OBJECT(&s->dma), "dma-mr", @@ -110,7 +114,7 @@ static void bcm2835_peripherals_init(Object *obj) =20 /* GPIO */ object_initialize(&s->gpio, sizeof(s->gpio), TYPE_BCM2835_GPIO); - object_property_add_child(obj, "gpio", OBJECT(&s->gpio), NULL); + object_property_add_child(obj, "gpio", OBJECT(&s->gpio), IGNORE_ERRORS= ); qdev_set_parent_bus(DEVICE(&s->gpio), sysbus_get_default()); =20 object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 8c43291112..2c6a082395 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -36,7 +36,8 @@ static void bcm2836_init(Object *obj) } =20 object_initialize(&s->control, sizeof(s->control), TYPE_BCM2836_CONTRO= L); - object_property_add_child(obj, "control", OBJECT(&s->control), NULL); + object_property_add_child(obj, "control", OBJECT(&s->control), + IGNORE_ERRORS); qdev_set_parent_bus(DEVICE(&s->control), sysbus_get_default()); =20 object_initialize(&s->peripherals, sizeof(s->peripherals), diff --git a/hw/arm/digic.c b/hw/arm/digic.c index 94f32637f0..f22fae73c3 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -36,7 +36,7 @@ static void digic_init(Object *obj) int i; =20 object_initialize(&s->cpu, sizeof(s->cpu), "arm946-" TYPE_ARM_CPU); - object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL); + object_property_add_child(obj, "cpu", OBJECT(&s->cpu), IGNORE_ERRORS); =20 for (i =3D 0; i < DIGIC4_NB_TIMERS; i++) { #define DIGIC_TIMER_NAME_MLEN 11 @@ -46,13 +46,14 @@ static void digic_init(Object *obj) dev =3D DEVICE(&s->timer[i]); qdev_set_parent_bus(dev, sysbus_get_default()); snprintf(name, DIGIC_TIMER_NAME_MLEN, "timer[%d]", i); - object_property_add_child(obj, name, OBJECT(&s->timer[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->timer[i]), + IGNORE_ERRORS); } =20 object_initialize(&s->uart, sizeof(s->uart), TYPE_DIGIC_UART); dev =3D DEVICE(&s->uart); qdev_set_parent_bus(dev, sysbus_get_default()); - object_property_add_child(obj, "uart", OBJECT(&s->uart), NULL); + object_property_add_child(obj, "uart", OBJECT(&s->uart), IGNORE_ERRORS= ); } =20 static void digic_realize(DeviceState *dev, Error **errp) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 960f27e45a..4a712a58b0 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -180,7 +180,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_m= em, /* By default A9 CPUs have EL3 enabled. This board does not curre= ntly * support EL3 so the CPU EL3 property is disabled before realizat= ion. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3", IGNORE_ERRORS)) { object_property_set_bool(cpuobj, false, "has_el3", &error_fata= l); } =20 diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 27773c9c47..73610d48a5 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -45,70 +45,78 @@ static void fsl_imx6_init(Object *obj) object_initialize(&s->cpu[i], sizeof(s->cpu[i]), "cortex-a9-" TYPE_ARM_CPU); snprintf(name, NAME_SIZE, "cpu%d", i); - object_property_add_child(obj, name, OBJECT(&s->cpu[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->cpu[i]), + IGNORE_ERRORS); } =20 object_initialize(&s->a9mpcore, sizeof(s->a9mpcore), TYPE_A9MPCORE_PRI= V); qdev_set_parent_bus(DEVICE(&s->a9mpcore), sysbus_get_default()); - object_property_add_child(obj, "a9mpcore", OBJECT(&s->a9mpcore), NULL); + object_property_add_child(obj, "a9mpcore", OBJECT(&s->a9mpcore), + IGNORE_ERRORS); =20 object_initialize(&s->ccm, sizeof(s->ccm), TYPE_IMX6_CCM); qdev_set_parent_bus(DEVICE(&s->ccm), sysbus_get_default()); - object_property_add_child(obj, "ccm", OBJECT(&s->ccm), NULL); + object_property_add_child(obj, "ccm", OBJECT(&s->ccm), IGNORE_ERRORS); =20 object_initialize(&s->src, sizeof(s->src), TYPE_IMX6_SRC); qdev_set_parent_bus(DEVICE(&s->src), sysbus_get_default()); - object_property_add_child(obj, "src", OBJECT(&s->src), NULL); + object_property_add_child(obj, "src", OBJECT(&s->src), IGNORE_ERRORS); =20 for (i =3D 0; i < FSL_IMX6_NUM_UARTS; i++) { object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_IMX_SERIAL= ); qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "uart%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->uart[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->uart[i]), + IGNORE_ERRORS); } =20 object_initialize(&s->gpt, sizeof(s->gpt), TYPE_IMX6_GPT); qdev_set_parent_bus(DEVICE(&s->gpt), sysbus_get_default()); - object_property_add_child(obj, "gpt", OBJECT(&s->gpt), NULL); + object_property_add_child(obj, "gpt", OBJECT(&s->gpt), IGNORE_ERRORS); =20 for (i =3D 0; i < FSL_IMX6_NUM_EPITS; i++) { object_initialize(&s->epit[i], sizeof(s->epit[i]), TYPE_IMX_EPIT); qdev_set_parent_bus(DEVICE(&s->epit[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "epit%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->epit[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->epit[i]), + IGNORE_ERRORS); } =20 for (i =3D 0; i < FSL_IMX6_NUM_I2CS; i++) { object_initialize(&s->i2c[i], sizeof(s->i2c[i]), TYPE_IMX_I2C); qdev_set_parent_bus(DEVICE(&s->i2c[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "i2c%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->i2c[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->i2c[i]), + IGNORE_ERRORS); } =20 for (i =3D 0; i < FSL_IMX6_NUM_GPIOS; i++) { object_initialize(&s->gpio[i], sizeof(s->gpio[i]), TYPE_IMX_GPIO); qdev_set_parent_bus(DEVICE(&s->gpio[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "gpio%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->gpio[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->gpio[i]), + IGNORE_ERRORS); } =20 for (i =3D 0; i < FSL_IMX6_NUM_ESDHCS; i++) { object_initialize(&s->esdhc[i], sizeof(s->esdhc[i]), TYPE_SYSBUS_S= DHCI); qdev_set_parent_bus(DEVICE(&s->esdhc[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "sdhc%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->esdhc[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->esdhc[i]), + IGNORE_ERRORS); } =20 for (i =3D 0; i < FSL_IMX6_NUM_ECSPIS; i++) { object_initialize(&s->spi[i], sizeof(s->spi[i]), TYPE_IMX_SPI); qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "spi%d", i + 1); - object_property_add_child(obj, name, OBJECT(&s->spi[i]), NULL); + object_property_add_child(obj, name, OBJECT(&s->spi[i]), + IGNORE_ERRORS); } =20 object_initialize(&s->eth, sizeof(s->eth), TYPE_IMX_ENET); qdev_set_parent_bus(DEVICE(&s->eth), sysbus_get_default()); - object_property_add_child(obj, "eth", OBJECT(&s->eth), NULL); + object_property_add_child(obj, "eth", OBJECT(&s->eth), IGNORE_ERRORS); } =20 static void fsl_imx6_realize(DeviceState *dev, Error **errp) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index d209b97dee..b7016c7c20 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -260,7 +260,7 @@ static void calxeda_init(MachineState *machine, enum cx= machines machine_id) "start-powered-off", &error_abort); } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar", IGNORE_ERRORS)) { object_property_set_int(cpuobj, MPCORE_PERIPHBASE, "reset-cbar", &error_abort); } diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index ca3eca1d16..5af0d7fe5b 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -618,7 +618,7 @@ static void integratorcp_init(MachineState *machine) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3", IGNORE_ERRORS)) { object_property_set_bool(cpuobj, false, "has_el3", &error_fatal); } =20 diff --git a/hw/arm/realview.c b/hw/arm/realview.c index b7d4753400..d5f307432b 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -109,7 +109,7 @@ static void realview_init(MachineState *machine, * does not currently support EL3 so the CPU EL3 property is disab= led * before realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3", IGNORE_ERRORS)) { object_property_set_bool(cpuobj, false, "has_el3", &error_fata= l); } =20 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index b0e9f5be65..a7385f9232 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -223,7 +223,7 @@ static void versatile_init(MachineState *machine, int b= oard_id) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(cpuobj, "has_el3", NULL)) { + if (object_property_find(cpuobj, "has_el3", IGNORE_ERRORS)) { object_property_set_bool(cpuobj, false, "has_el3", &error_fatal); } =20 diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index c6b1e674b4..d1e294f969 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -218,10 +218,10 @@ static void init_cpus(const char *cpu_model, const ch= ar *privdev, Object *cpuobj =3D object_new(object_class_get_name(cpu_oc)); =20 if (!secure) { - object_property_set_bool(cpuobj, false, "has_el3", NULL); + object_property_set_bool(cpuobj, false, "has_el3", IGNORE_ERRO= RS); } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar", IGNORE_ERRORS)) { object_property_set_int(cpuobj, periphbase, "reset-cbar", &error_abort); } @@ -739,11 +739,11 @@ static void vexpress_instance_init(Object *obj) /* EL3 is enabled by default on vexpress */ vms->secure =3D true; object_property_add_bool(obj, "secure", vexpress_get_secure, - vexpress_set_secure, NULL); + vexpress_set_secure, IGNORE_ERRORS); object_property_set_description(obj, "secure", "Set on/off to enable/disable the ARM " "Security Extensions (TrustZone)", - NULL); + IGNORE_ERRORS); } =20 static void vexpress_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 010f7244bf..4c187bba59 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1379,7 +1379,7 @@ static void machvirt_init(MachineState *machine) =20 cpuobj =3D object_new(typename); object_property_set_int(cpuobj, possible_cpus->cpus[n].arch_id, - "mp-affinity", NULL); + "mp-affinity", IGNORE_ERRORS); =20 cs =3D CPU(cpuobj); cs->cpu_index =3D n; @@ -1388,29 +1388,29 @@ static void machvirt_init(MachineState *machine) &error_fatal); =20 if (!vms->secure) { - object_property_set_bool(cpuobj, false, "has_el3", NULL); + object_property_set_bool(cpuobj, false, "has_el3", IGNORE_ERRO= RS); } =20 - if (!vms->virt && object_property_find(cpuobj, "has_el2", NULL)) { - object_property_set_bool(cpuobj, false, "has_el2", NULL); + if (!vms->virt && object_property_find(cpuobj, "has_el2", IGNORE_E= RRORS)) { + object_property_set_bool(cpuobj, false, "has_el2", IGNORE_ERRO= RS); } =20 if (vms->psci_conduit !=3D QEMU_PSCI_CONDUIT_DISABLED) { object_property_set_int(cpuobj, vms->psci_conduit, - "psci-conduit", NULL); + "psci-conduit", IGNORE_ERRORS); =20 /* Secondary CPUs start in PSCI powered-down state */ if (n > 0) { object_property_set_bool(cpuobj, true, - "start-powered-off", NULL); + "start-powered-off", IGNORE_ERROR= S); } } =20 - if (vmc->no_pmu && object_property_find(cpuobj, "pmu", NULL)) { - object_property_set_bool(cpuobj, false, "pmu", NULL); + if (vmc->no_pmu && object_property_find(cpuobj, "pmu", IGNORE_ERRO= RS)) { + object_property_set_bool(cpuobj, false, "pmu", IGNORE_ERRORS); } =20 - if (object_property_find(cpuobj, "reset-cbar", NULL)) { + if (object_property_find(cpuobj, "reset-cbar", IGNORE_ERRORS)) { object_property_set_int(cpuobj, vms->memmap[VIRT_CPUPERIPHS].b= ase, "reset-cbar", &error_abort); } @@ -1422,7 +1422,7 @@ static void machvirt_init(MachineState *machine) "secure-memory", &error_abort); } =20 - object_property_set_bool(cpuobj, true, "realized", NULL); + object_property_set_bool(cpuobj, true, "realized", IGNORE_ERRORS); object_unref(cpuobj); } fdt_add_timer_nodes(vms); @@ -1650,37 +1650,38 @@ static void virt_2_9_instance_init(Object *obj) */ vms->secure =3D false; object_property_add_bool(obj, "secure", virt_get_secure, - virt_set_secure, NULL); + virt_set_secure, IGNORE_ERRORS); object_property_set_description(obj, "secure", "Set on/off to enable/disable the ARM " "Security Extensions (TrustZone)", - NULL); + IGNORE_ERRORS); =20 /* EL2 is also disabled by default, for similar reasons */ vms->virt =3D false; object_property_add_bool(obj, "virtualization", virt_get_virt, - virt_set_virt, NULL); + virt_set_virt, IGNORE_ERRORS); object_property_set_description(obj, "virtualization", "Set on/off to enable/disable emulatin= g a " "guest CPU which implements the ARM " "Virtualization Extensions", - NULL); + IGNORE_ERRORS); =20 /* High memory is enabled by default */ vms->highmem =3D true; object_property_add_bool(obj, "highmem", virt_get_highmem, - virt_set_highmem, NULL); + virt_set_highmem, IGNORE_ERRORS); object_property_set_description(obj, "highmem", "Set on/off to enable/disable using " "physical address space above 32 bits", - NULL); + IGNORE_ERRORS); /* Default GIC type is v2 */ vms->gic_version =3D 2; object_property_add_str(obj, "gic-version", virt_get_gic_version, - virt_set_gic_version, NULL); + virt_set_gic_version, IGNORE_ERRORS); object_property_set_description(obj, "gic-version", "Set GIC version. " - "Valid values are 2, 3 and host", NULL= ); + "Valid values are 2, 3 and host", + IGNORE_ERRORS); =20 if (vmc->no_its) { vms->its =3D false; @@ -1688,11 +1689,11 @@ static void virt_2_9_instance_init(Object *obj) /* Default allows ITS instantiation */ vms->its =3D true; object_property_add_bool(obj, "its", virt_get_its, - virt_set_its, NULL); + virt_set_its, IGNORE_ERRORS); object_property_set_description(obj, "its", "Set on/off to enable/disable " "ITS instantiation", - NULL); + IGNORE_ERRORS); } =20 vms->memmap =3D a15memmap; diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 3985356fc2..623043239d 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -183,7 +183,7 @@ static void zynq_init(MachineState *machine) * currently support EL3 so the CPU EL3 property is disabled before * realization. */ - if (object_property_find(OBJECT(cpu), "has_el3", NULL)) { + if (object_property_find(OBJECT(cpu), "has_el3", IGNORE_ERRORS)) { object_property_set_bool(OBJECT(cpu), false, "has_el3", &error_fat= al); } =20 diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 64f52f80a5..38f9577284 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -259,9 +259,9 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) g_free(name); =20 object_property_set_bool(OBJECT(&s->apu_cpu[i]), - s->secure, "has_el3", NULL); + s->secure, "has_el3", IGNORE_ERRORS); object_property_set_bool(OBJECT(&s->apu_cpu[i]), - false, "has_el2", NULL); + false, "has_el2", IGNORE_ERRORS); object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, "reset-cbar", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 2e629b398b..5fed23c774 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2835,10 +2835,10 @@ static void isabus_fdc_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &isa->bootindexA, "bootindexA", "/floppy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); device_add_bootindex_property(obj, &isa->bootindexB, "bootindexB", "/floppy@1", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static const TypeInfo isa_fdc_info =3D { diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 381dc7c5fb..656b0f8c48 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -943,7 +943,7 @@ static int nvme_init(PCIDevice *pci_dev) pci_register_bar(&n->parent_obj, 0, PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64, &n->iomem); - msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4, NULL); + msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4, IGNORE_ERROR= S); =20 id->vid =3D cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID)); id->ssvid =3D cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR= _ID)); diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 604d37dfc8..ce9cf63c3e 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -984,10 +984,10 @@ static void virtio_blk_instance_init(Object *obj) object_property_add_link(obj, "iothread", TYPE_IOTHREAD, (Object **)&s->conf.iothread, qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); + OBJ_PROP_LINK_UNREF_ON_RELEASE, IGNORE_ERRORS= ); device_add_bootindex_property(obj, &s->conf.conf.bootindex, "bootindex", "/disk@0,0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static const VMStateDescription vmstate_virtio_blk =3D { diff --git a/hw/core/bus.c b/hw/core/bus.c index 4651f24486..ab1925bee9 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -101,7 +101,8 @@ static void qbus_realize(BusState *bus, DeviceState *pa= rent, const char *name) if (bus->parent) { QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling); bus->parent->num_child_bus++; - object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(b= us), NULL); + object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(b= us), + IGNORE_ERRORS); object_unref(OBJECT(bus)); } else if (bus !=3D sysbus_get_default()) { /* TODO: once all bus devices are qdevified, @@ -198,9 +199,10 @@ static void qbus_initfn(Object *obj) (Object **)&bus->hotplug_handler, object_property_allow_set_link, 0, - NULL); + IGNORE_ERRORS); object_property_add_bool(obj, "realized", - bus_get_realized, bus_set_realized, NULL); + bus_get_realized, bus_set_realized, + IGNORE_ERRORS); } =20 static char *default_bus_get_fw_dev_path(DeviceState *dev) diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index e3d69b61f3..d3286e6570 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -64,7 +64,8 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus= , SysBusDevice *sbdev, return -1; } =20 - parent_mr =3D object_property_get_link(OBJECT(sbdev_mr), "container", = NULL); + parent_mr =3D object_property_get_link(OBJECT(sbdev_mr), "container", + IGNORE_ERRORS); =20 assert(parent_mr); if (parent_mr !=3D pbus_mr_obj) { @@ -72,7 +73,7 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus= , SysBusDevice *sbdev, return -1; } =20 - return object_property_get_int(OBJECT(sbdev_mr), "addr", NULL); + return object_property_get_int(OBJECT(sbdev_mr), "addr", IGNORE_ERRORS= ); } =20 static void platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 3bef41914d..73640ee3c6 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -77,7 +77,7 @@ static void parse_drive(DeviceState *dev, const char *str= , void **ptr, =20 blk =3D blk_by_name(str); if (!blk) { - BlockDriverState *bs =3D bdrv_lookup_bs(NULL, str, NULL); + BlockDriverState *bs =3D bdrv_lookup_bs(NULL, str, IGNORE_ERRORS); if (bs) { blk =3D blk_new(0, BLK_PERM_ALL); blk_created =3D true; @@ -442,7 +442,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo = *nd) qdev_prop_set_netdev(dev, "netdev", nd->netdev); } if (nd->nvectors !=3D DEV_NVECTORS_UNSPECIFIED && - object_property_find(OBJECT(dev), "vectors", NULL)) { + object_property_find(OBJECT(dev), "vectors", IGNORE_ERRORS)) { qdev_prop_set_uint32(dev, "vectors", nd->nvectors); } nd->instantiated =3D 1; diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 0ce45a2019..faa4af0dc3 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -71,7 +71,7 @@ static void bus_remove_child(BusState *bus, DeviceState *= child) QTAILQ_REMOVE(&bus->children, kid, sibling); =20 /* This gives back ownership of kid->child back to us. */ - object_property_del(OBJECT(bus), name, NULL); + object_property_del(OBJECT(bus), name, IGNORE_ERRORS); object_unref(OBJECT(kid->child)); g_free(kid); return; @@ -97,7 +97,7 @@ static void bus_add_child(BusState *bus, DeviceState *chi= ld) (Object **)&kid->child, NULL, /* read-only property */ 0, /* return ownership on prop deletion */ - NULL); + IGNORE_ERRORS); } =20 void qdev_set_parent_bus(DeviceState *dev, BusState *bus) @@ -470,7 +470,8 @@ void qdev_connect_gpio_out_named(DeviceState *dev, cons= t char *name, int n, */ object_property_add_child(container_get(qdev_get_machine(), "/unattached"), - "non-qdev-gpio[*]", OBJECT(pin), NULL); + "non-qdev-gpio[*]", OBJECT(pin), + IGNORE_ERRORS); } object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_ab= ort); g_free(propname); @@ -482,7 +483,7 @@ qemu_irq qdev_get_gpio_out_connector(DeviceState *dev, = const char *name, int n) name ? name : "unnamed-gpio-out", n); =20 qemu_irq ret =3D (qemu_irq)object_property_get_link(OBJECT(dev), propn= ame, - NULL); + IGNORE_ERRORS); =20 return ret; } @@ -496,9 +497,9 @@ static qemu_irq qdev_disconnect_gpio_out_named(DeviceSt= ate *dev, name ? name : "unnamed-gpio-out", n); =20 qemu_irq ret =3D (qemu_irq)object_property_get_link(OBJECT(dev), propn= ame, - NULL); + IGNORE_ERRORS); if (ret) { - object_property_set_link(OBJECT(dev), NULL, propname, NULL); + object_property_set_link(OBJECT(dev), NULL, propname, IGNORE_ERROR= S); } g_free(propname); return ret; @@ -838,7 +839,7 @@ static int qdev_add_hotpluggable_device(Object *obj, vo= id *opaque) return 0; } =20 - if (dev->realized && object_property_get_bool(obj, "hotpluggable", NUL= L)) { + if (dev->realized && object_property_get_bool(obj, "hotpluggable", IGN= ORE_ERRORS)) { *list =3D g_slist_append(*list, dev); } =20 @@ -978,7 +979,7 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) child_realize_fail: QLIST_FOREACH(bus, &dev->child_bus, sibling) { object_property_set_bool(OBJECT(bus), false, "realized", - NULL); + IGNORE_ERRORS); } =20 if (qdev_get_vmsd(dev)) { @@ -1029,9 +1030,10 @@ static void device_initfn(Object *obj) dev->realized =3D false; =20 object_property_add_bool(obj, "realized", - device_get_realized, device_set_realized, NUL= L); + device_get_realized, device_set_realized, + IGNORE_ERRORS); object_property_add_bool(obj, "hotpluggable", - device_get_hotpluggable, NULL, NULL); + device_get_hotpluggable, NULL, IGNORE_ERRORS); object_property_add_bool(obj, "hotplugged", device_get_hotplugged, NULL, &error_abort); @@ -1090,7 +1092,7 @@ static void device_unparent(Object *obj) BusState *bus; =20 if (dev->realized) { - object_property_set_bool(obj, false, "realized", NULL); + object_property_set_bool(obj, false, "realized", IGNORE_ERRORS); } while (dev->num_child_bus) { bus =3D QLIST_FIRST(&dev->child_bus); diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index c6dfd9ae0c..8600af9050 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -92,7 +92,7 @@ bool sysbus_has_irq(SysBusDevice *dev, int n) char *prop =3D g_strdup_printf("%s[%d]", SYSBUS_DEVICE_GPIO_IRQ, n); ObjectProperty *r; =20 - r =3D object_property_find(OBJECT(dev), prop, NULL); + r =3D object_property_find(OBJECT(dev), prop, IGNORE_ERRORS); g_free(prop); =20 return (r !=3D NULL); @@ -362,7 +362,8 @@ static void main_system_bus_create(void) OBJECT(main_system_bus)->free =3D g_free; object_property_add_child(container_get(qdev_get_machine(), "/unattached"), - "sysbus", OBJECT(main_system_bus), NULL); + "sysbus", OBJECT(main_system_bus), + IGNORE_ERRORS); } =20 BusState *sysbus_get_default(void) diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index bc05152fd3..6d376b978d 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -66,7 +66,7 @@ static void a15mp_priv_realize(DeviceState *dev, Error **= errp) * either all the CPUs have TZ, or none do. */ cpuobj =3D OBJECT(qemu_get_cpu(0)); - has_el3 =3D object_property_find(cpuobj, "has_el3", NULL) && + has_el3 =3D object_property_find(cpuobj, "has_el3", IGNORE_ERRORS)= && object_property_get_bool(cpuobj, "has_el3", &error_abort); qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3); } diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index f17f292090..23f2c252bd 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -72,7 +72,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **e= rrp) * either all the CPUs have TZ, or none do. */ cpuobj =3D OBJECT(qemu_get_cpu(0)); - has_el3 =3D object_property_find(cpuobj, "has_el3", NULL) && + has_el3 =3D object_property_find(cpuobj, "has_el3", IGNORE_ERRORS) && object_property_get_bool(cpuobj, "has_el3", &error_abort); qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3); =20 diff --git a/hw/cpu/core.c b/hw/cpu/core.c index 2bf960d6a8..b38d882432 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -66,9 +66,9 @@ static void cpu_core_instance_init(Object *obj) CPUCore *core =3D CPU_CORE(obj); =20 object_property_add(obj, "core-id", "int", core_prop_get_core_id, - core_prop_set_core_id, NULL, NULL, NULL); + core_prop_set_core_id, NULL, NULL, IGNORE_ERRORS); object_property_add(obj, "nr-threads", "int", core_prop_get_nr_threads, - core_prop_set_nr_threads, NULL, NULL, NULL); + core_prop_set_nr_threads, NULL, NULL, IGNORE_ERROR= S); core->nr_threads =3D smp_threads; } =20 diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 0f6a836b77..950fa207b5 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -268,7 +268,8 @@ static void pci_std_vga_init(Object *obj) { /* Expose framebuffer byteorder via QOM */ object_property_add_bool(obj, "big-endian-framebuffer", - vga_get_big_endian_fb, vga_set_big_endian_fb,= NULL); + vga_get_big_endian_fb, vga_set_big_endian_fb, + IGNORE_ERRORS); } =20 static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp) @@ -298,7 +299,8 @@ static void pci_secondary_vga_init(Object *obj) { /* Expose framebuffer byteorder via QOM */ object_property_add_bool(obj, "big-endian-framebuffer", - vga_get_big_endian_fb, vga_set_big_endian_fb,= NULL); + vga_get_big_endian_fb, vga_set_big_endian_fb, + IGNORE_ERRORS); } =20 static void pci_secondary_vga_reset(DeviceState *dev) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ce74c84460..0775ea65bf 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -137,9 +137,11 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) obj =3D piix; pm->cpu_hp_io_base =3D PIIX4_CPU_HOTPLUG_IO_BASE; pm->pcihp_io_base =3D - object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); + object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, + IGNORE_ERRORS); pm->pcihp_io_len =3D - object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); + object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, + IGNORE_ERRORS); } if (lpc) { obj =3D lpc; @@ -148,21 +150,23 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) assert(obj); =20 /* Fill in optional s3/s4 related properties */ - o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL); + o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, + IGNORE_ERRORS); if (o) { pm->s3_disabled =3D qint_get_int(qobject_to_qint(o)); } else { pm->s3_disabled =3D false; } qobject_decref(o); - o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S4_DISABLED, NULL); + o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S4_DISABLED, + IGNORE_ERRORS); if (o) { pm->s4_disabled =3D qint_get_int(qobject_to_qint(o)); } else { pm->s4_disabled =3D false; } qobject_decref(o); - o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S4_VAL, NULL); + o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S4_VAL, IGNORE_ERR= ORS); if (o) { pm->s4_val =3D qint_get_int(qobject_to_qint(o)); } else { @@ -171,23 +175,24 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) qobject_decref(o); =20 /* Fill in mandatory properties */ - pm->sci_int =3D object_property_get_int(obj, ACPI_PM_PROP_SCI_INT, NUL= L); + pm->sci_int =3D object_property_get_int(obj, ACPI_PM_PROP_SCI_INT, + IGNORE_ERRORS); =20 pm->acpi_enable_cmd =3D object_property_get_int(obj, ACPI_PM_PROP_ACPI_ENABLE= _CMD, - NULL); + IGNORE_ERRORS); pm->acpi_disable_cmd =3D object_property_get_int(obj, ACPI_PM_PROP_ACPI_DISABL= E_CMD, - NULL); + IGNORE_ERRORS); pm->io_base =3D object_property_get_int(obj, ACPI_PM_PROP_PM_IO_BASE, - NULL); + IGNORE_ERRORS); pm->gpe0_blk =3D object_property_get_int(obj, ACPI_PM_PROP_GPE0_BLK, - NULL); + IGNORE_ERRORS); pm->gpe0_blk_len =3D object_property_get_int(obj, ACPI_PM_PROP_GPE0_BL= K_LEN, - NULL); + IGNORE_ERRORS); pm->pcihp_bridge_en =3D object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-suppor= t", - NULL); + IGNORE_ERRORS); } =20 static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -239,17 +244,17 @@ static void acpi_get_pci_holes(Range *hole, Range *ho= le64) range_set_bounds1(hole, object_property_get_int(pci_host, PCI_HOST_PROP_PCI_HOLE_START, - NULL), + IGNORE_ERRORS), object_property_get_int(pci_host, PCI_HOST_PROP_PCI_HOLE_END, - NULL)); + IGNORE_ERRORS)); range_set_bounds1(hole64, object_property_get_int(pci_host, PCI_HOST_PROP_PCI_HOLE64_STA= RT, - NULL), + IGNORE_ERRORS), object_property_get_int(pci_host, PCI_HOST_PROP_PCI_HOLE64_END, - NULL)); + IGNORE_ERRORS)); } =20 #define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT= */ @@ -527,7 +532,8 @@ static void build_append_pci_bus_devices(Aml *parent_sc= ope, PCIBus *bus, PCIBus *sec; int i; =20 - bsel =3D object_property_get_qobject(OBJECT(bus), ACPI_PCIHP_PROP_BSEL= , NULL); + bsel =3D object_property_get_qobject(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, + IGNORE_ERRORS); if (bsel) { int64_t bsel_val =3D qint_get_int(qobject_to_qint(bsel)); =20 @@ -2138,7 +2144,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */ uint8_t io_size =3D object_property_get_bool(OBJECT(pcms->fw_cfg), - "dma_enabled", NULL) ? + "dma_enabled", + IGNORE_ERRORS) ? ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t= ) : FW_CFG_CTL_SIZE; =20 @@ -2327,7 +2334,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, Ma= chineState *machine) PCMachineState *pcms =3D PC_MACHINE(machine); ram_addr_t hotplugabble_address_space_size =3D object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, - NULL); + IGNORE_ERRORS); =20 srat_start =3D table_data->len; =20 @@ -2610,14 +2617,16 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) pci_host =3D acpi_get_i386_pci_host(); g_assert(pci_host); =20 - o =3D object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, NULL); + o =3D object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, + IGNORE_ERRORS); if (!o) { return false; } mcfg->mcfg_base =3D qint_get_int(qobject_to_qint(o)); qobject_decref(o); =20 - o =3D object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL); + o =3D object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, + IGNORE_ERRORS); assert(o); mcfg->mcfg_size =3D qint_get_int(qobject_to_qint(o)); qobject_decref(o); diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 87dcbdd51a..bc8795f7f3 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -1843,7 +1843,7 @@ static void assigned_dev_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &d->bootindex, "bootindex", NULL, - &pci_dev->qdev, NULL); + &pci_dev->qdev, IGNORE_ERRORS); } =20 static Property assigned_dev_properties[] =3D { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 742b5507e3..efa6c35157 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1560,7 +1560,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, * IRQ8 and IRQ2. */ uint8_t compat =3D object_property_get_int(OBJECT(hpet), - HPET_INTCAP, NULL); + HPET_INTCAP, IGNORE_ERRORS); if (!compat) { qdev_prop_set_uint32(hpet, HPET_INTCAP, hpet_irqs); } @@ -1671,7 +1671,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char = *parent_name) } if (parent_name) { object_property_add_child(object_resolve_path(parent_name, NULL), - "ioapic", OBJECT(dev), NULL); + "ioapic", OBJECT(dev), IGNORE_ERRORS); } qdev_init_nofail(dev); d =3D SYS_BUS_DEVICE(dev); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9179fb31de..0e9ad9f929 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -162,19 +162,20 @@ static void pc_q35_init(MachineState *machine) /* create pci host bus */ q35_host =3D Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)); =20 - object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host),= NULL); + object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), + IGNORE_ERRORS); object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory), - MCH_HOST_PROP_RAM_MEM, NULL); + MCH_HOST_PROP_RAM_MEM, IGNORE_ERRORS); object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory), - MCH_HOST_PROP_PCI_MEM, NULL); + MCH_HOST_PROP_PCI_MEM, IGNORE_ERRORS); object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()), - MCH_HOST_PROP_SYSTEM_MEM, NULL); + MCH_HOST_PROP_SYSTEM_MEM, IGNORE_ERRORS); object_property_set_link(OBJECT(q35_host), OBJECT(system_io), - MCH_HOST_PROP_IO_MEM, NULL); + MCH_HOST_PROP_IO_MEM, IGNORE_ERRORS); object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size, - PCI_HOST_BELOW_4G_MEM_SIZE, NULL); + PCI_HOST_BELOW_4G_MEM_SIZE, IGNORE_ERRORS); object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size, - PCI_HOST_ABOVE_4G_MEM_SIZE, NULL); + PCI_HOST_ABOVE_4G_MEM_SIZE, IGNORE_ERRORS); /* pci */ qdev_init_nofail(DEVICE(q35_host)); phb =3D PCI_HOST_BRIDGE(q35_host); diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 092f16c2d7..519d3d5e16 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -147,7 +147,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error= **errp) /* Although the AHCI 1.3 specification states that the first capability * should be PMCAP, the Intel ICH9 data sheet specifies that the ICH9 * AHCI device puts the MSI capability first, pointing to 0x80. */ - ret =3D msi_init(dev, ICH9_MSI_CAP_OFFSET, 1, true, false, NULL); + ret =3D msi_init(dev, ICH9_MSI_CAP_OFFSET, 1, true, false, IGNORE_ERRO= RS); /* Any error other than -ENOTSUP(board's MSI support is broken) * is a programming error. Fall back to INTx silently on -ENOTSUP */ assert(!ret || ret =3D=3D -ENOTSUP); diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 299e592fa2..efa34e429a 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -263,8 +263,8 @@ static void ide_dev_instance_init(Object *obj) { object_property_add(obj, "bootindex", "int32", ide_dev_get_bootindex, - ide_dev_set_bootindex, NULL, NULL, NULL); - object_property_set_int(obj, -1, "bootindex", NULL); + ide_dev_set_bootindex, NULL, NULL, IGNORE_ERRORS); + object_property_set_int(obj, -1, "bootindex", IGNORE_ERRORS); } =20 static int ide_hd_initfn(IDEDevice *dev) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index 8666234554..ad1beb3b0b 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -267,7 +267,8 @@ static void virtio_input_hid_realize(DeviceState *dev, = Error **errp) =20 vhid->hs =3D qemu_input_handler_register(dev, vhid->handler); if (vhid->display && vhid->hs) { - qemu_input_handler_bind(vhid->hs, vhid->display, vhid->head, NULL); + qemu_input_handler_bind(vhid->hs, vhid->display, vhid->head, + IGNORE_ERRORS); } } =20 diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 1ef56f8d10..09b75a3048 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -331,7 +331,7 @@ static void apic_common_realize(DeviceState *dev, Error= **errp) instance_id =3D -1; } vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, - s, -1, 0, NULL); + s, -1, 0, IGNORE_ERRORS); } =20 static void apic_common_unrealize(DeviceState *dev, Error **errp) @@ -486,7 +486,7 @@ static void apic_common_initfn(Object *obj) s->id =3D s->initial_apic_id =3D -1; object_property_add(obj, "id", "int", apic_common_get_id, - apic_common_set_id, NULL, NULL, NULL); + apic_common_set_id, NULL, NULL, IGNORE_ERRORS); } =20 static void apic_common_class_init(ObjectClass *klass, void *data) diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index c6493d6c07..3fcd6dfaa9 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -267,7 +267,8 @@ static void arm_gicv3_common_realize(DeviceState *dev, = Error **errp) * VLPIS =3D=3D 0 (virtual LPIs not supported) * PLPIS =3D=3D 0 (physical LPIs not supported) */ - cpu_affid =3D object_property_get_int(OBJECT(cpu), "mp-affinity", = NULL); + cpu_affid =3D object_property_get_int(OBJECT(cpu), "mp-affinity", + IGNORE_ERRORS); last =3D (i =3D=3D s->num_cpu - 1); =20 /* The CPU mp-affinity property is in MPIDR register format; squash diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index a26e90670f..cc14ddc4bd 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -40,7 +40,7 @@ void s390_flic_init(void) if (!dev) { dev =3D qdev_create(NULL, TYPE_QEMU_S390_FLIC); object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); } qdev_init_nofail(dev); } diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index 7ee9b77399..4ee59628d0 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -40,7 +40,7 @@ DeviceState *s390_flic_kvm_create(void) if (kvm_enabled()) { dev =3D qdev_create(NULL, TYPE_KVM_S390_FLIC); object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); } return dev; } diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index a51cbca6f7..5dd057cd39 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -59,7 +59,7 @@ static int ipmi_do_hw_op(IPMIInterface *s, enum ipmi_op o= p, int checkonly) if (checkonly) { return 0; } - qmp_inject_nmi(NULL); + qmp_inject_nmi(IGNORE_ERRORS); return 0; =20 case IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP: diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 28c0fedb5d..99a136d05a 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -653,11 +653,11 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc) =20 object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint32", ich9_lpc_get_sci_int, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CM= D, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, IGNORE_ERRORS); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_C= MD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, IGNORE_ERRORS); =20 ich9_pm_add_properties(OBJECT(lpc), &lpc->pm, NULL); } diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index db896b0bb6..3843eb6110 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -68,7 +68,7 @@ static void nvdimm_init(Object *obj) { object_property_add(obj, "label-size", "int", nvdimm_get_label_size, nvdimm_set_label_size, NULL, - NULL, NULL); + NULL, IGNORE_ERRORS); } =20 static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 9e8dab0e89..92fb48255a 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -182,7 +182,7 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque) di->slot =3D dimm->slot; di->node =3D dimm->node; di->size =3D object_property_get_int(OBJECT(dimm), PC_DIMM_SIZ= E_PROP, - NULL); + IGNORE_ERRORS); di->memdev =3D object_get_canonical_path(OBJECT(dimm->hostmem)= ); =20 info->u.dimm.data =3D di; diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 4968bdbb28..69ba8a37d3 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -145,14 +145,15 @@ petalogix_ml605_init(MachineState *machine) =20 /* FIXME: attach to the sysbus instead */ object_property_add_child(qdev_get_machine(), "xilinx-eth", OBJECT(eth= 0), - NULL); + IGNORE_ERRORS); object_property_add_child(qdev_get_machine(), "xilinx-dma", OBJECT(dma= ), - NULL); + IGNORE_ERRORS); =20 ds =3D object_property_get_link(OBJECT(dma), - "axistream-connected-target", NULL); + "axistream-connected-target", IGNORE_ERR= ORS); cs =3D object_property_get_link(OBJECT(dma), - "axistream-control-connected-target", NU= LL); + "axistream-control-connected-target", + IGNORE_ERRORS); qdev_set_nic_properties(eth0, &nd_table[0]); qdev_prop_set_uint32(eth0, "rxmem", 0x1000); qdev_prop_set_uint32(eth0, "txmem", 0x1000); @@ -165,9 +166,10 @@ petalogix_ml605_init(MachineState *machine) sysbus_connect_irq(SYS_BUS_DEVICE(eth0), 0, irq[AXIENET_IRQ]); =20 ds =3D object_property_get_link(OBJECT(eth0), - "axistream-connected-target", NULL); + "axistream-connected-target", IGNORE_ERR= ORS); cs =3D object_property_get_link(OBJECT(eth0), - "axistream-control-connected-target", NU= LL); + "axistream-control-connected-target", + IGNORE_ERRORS); qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000); object_property_set_link(OBJECT(dma), OBJECT(ds), "axistream-connected", &error_abort); diff --git a/hw/mips/boston.c b/hw/mips/boston.c index a4677f7da4..61d03e8b2a 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -531,7 +531,7 @@ static void boston_mach_init(MachineState *machine) memory_region_add_subregion_overlap(sys_mem, 0x17fff000, lcd, 0); =20 chr =3D qemu_chr_new("lcd", "vc:320x240"); - qemu_chr_fe_init(&s->lcd_display, chr, NULL); + qemu_chr_fe_init(&s->lcd_display, chr, IGNORE_ERRORS); qemu_chr_fe_set_handlers(&s->lcd_display, NULL, NULL, boston_lcd_event, s, NULL, true); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 4b6ccb575e..ef34ebd886 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -569,7 +569,7 @@ static MaltaFPGAState *malta_fpga_init(MemoryRegion *ad= dress_space, memory_region_add_subregion(address_space, base + 0xa00, &s->iomem_hi); =20 chr =3D qemu_chr_new("fpga", "vc:320x200"); - qemu_chr_fe_init(&s->display, chr, NULL); + qemu_chr_fe_init(&s->display, chr, IGNORE_ERRORS); qemu_chr_fe_set_handlers(&s->display, NULL, NULL, malta_fgpa_display_event, s, NULL, true); =20 diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 3342b65f15..a718aa0cde 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -245,7 +245,7 @@ static void aux_slave_dev_print(Monitor *mon, DeviceSta= te *dev, int indent) =20 monitor_printf(mon, "%*smemory " TARGET_FMT_plx "/" TARGET_FMT_plx "\n= ", indent, "", - object_property_get_int(OBJECT(s->mmio), "addr", NULL), + object_property_get_int(OBJECT(s->mmio), "addr", IGNORE= _ERRORS), memory_region_size(s->mmio)); } =20 diff --git a/hw/misc/edu.c b/hw/misc/edu.c index eb814df82d..48735517f4 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -392,7 +392,7 @@ static void edu_instance_init(Object *obj) =20 edu->dma_mask =3D (1UL << 28) - 1; object_property_add(obj, "dma_mask", "uint64", edu_obj_uint64, - edu_obj_uint64, NULL, &edu->dma_mask, NULL); + edu_obj_uint64, NULL, &edu->dma_mask, IGNORE_ERRORS); } =20 static void edu_class_init(ObjectClass *class, void *data) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 5d57f45dc6..fed0c6b269 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -214,7 +214,7 @@ static void macio_init_ide(MacIOState *s, MACIOIDEState= *ide, size_t ide_size, memory_region_add_subregion(&s->bar, 0x1f000 + ((index + 1) * 0x1000), &ide->mem); name =3D g_strdup_printf("ide[%i]", index); - object_property_add_child(OBJECT(s), name, OBJECT(ide), NULL); + object_property_add_child(OBJECT(s), name, OBJECT(ide), IGNORE_ERRORS); g_free(name); } =20 @@ -333,7 +333,7 @@ static void macio_instance_init(Object *obj) =20 object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA); qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default()); - object_property_add_child(obj, "cuda", OBJECT(&s->cuda), NULL); + object_property_add_child(obj, "cuda", OBJECT(&s->cuda), IGNORE_ERRORS= ); } =20 static const VMStateDescription vmstate_macio_oldworld =3D { diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 5cd5a92614..0badd7b0a0 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -112,7 +112,7 @@ uint16_t pvpanic_port(void) if (!o) { return 0; } - return object_property_get_int(o, PVPANIC_IOPORT_PROP, NULL); + return object_property_get_int(o, PVPANIC_IOPORT_PROP, IGNORE_ERRORS); } =20 static Property pvpanic_isa_properties[] =3D { diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 04e83787d4..82a25b91f4 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -244,7 +244,7 @@ static void tmp105_initfn(Object *obj) { object_property_add(obj, "temperature", "int", tmp105_get_temperature, - tmp105_set_temperature, NULL, NULL, NULL); + tmp105_set_temperature, NULL, NULL, IGNORE_ERRORS); } =20 static void tmp105_class_init(ObjectClass *klass, void *data) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 4353f91cff..4141e7e108 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1676,7 +1676,7 @@ static void e1000_instance_init(Object *obj) E1000State *n =3D E1000(obj); device_add_bootindex_property(obj, &n->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(n), NULL); + DEVICE(n), IGNORE_ERRORS); } =20 static const TypeInfo e1000_base_info =3D { diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 664554f33c..34167c0384 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -293,7 +293,7 @@ e1000e_init_msix(E1000EState *s) E1000E_MSIX_IDX, E1000E_MSIX_TABLE, &s->msix, E1000E_MSIX_IDX, E1000E_MSIX_PBA, - 0xA0, NULL); + 0xA0, IGNORE_ERRORS); =20 if (res < 0) { trace_e1000e_msix_init_fail(res); @@ -463,7 +463,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Erro= r **errp) hw_error("Failed to initialize PCIe capability"); } =20 - ret =3D msi_init(PCI_DEVICE(s), 0xD0, 1, true, false, NULL); + ret =3D msi_init(PCI_DEVICE(s), 0xD0, 1, true, false, IGNORE_ERRORS); if (ret) { trace_e1000e_msi_init_fail(ret); } @@ -474,7 +474,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Erro= r **errp) } =20 if (pcie_aer_init(pci_dev, PCI_ERR_VER, e1000e_aer_offset, - PCI_ERR_SIZEOF, NULL) < 0) { + PCI_ERR_SIZEOF, IGNORE_ERRORS) < 0) { hw_error("Failed to initialize AER capability"); } =20 @@ -694,7 +694,7 @@ static void e1000e_instance_init(Object *obj) E1000EState *s =3D E1000E(obj); device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static const TypeInfo e1000e_info =3D { diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 5e03c9fb24..663addc758 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -1906,7 +1906,7 @@ static void eepro100_instance_init(Object *obj) EEPRO100State *s =3D DO_UPCAST(EEPRO100State, dev, PCI_DEVICE(obj)); device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(s), NULL); + DEVICE(s), IGNORE_ERRORS); } =20 static E100PCIDeviceInfo e100_devices[] =3D { diff --git a/hw/net/lance.c b/hw/net/lance.c index 7ac795d4b2..a3141d7676 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -145,7 +145,7 @@ static void lance_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static Property lance_properties[] =3D { diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index f3455339ee..6065c80f27 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -134,8 +134,8 @@ static void isa_ne2000_instance_init(Object *obj) { object_property_add(obj, "bootindex", "int32", isa_ne2000_get_bootindex, - isa_ne2000_set_bootindex, NULL, NULL, NULL); - object_property_set_int(obj, -1, "bootindex", NULL); + isa_ne2000_set_bootindex, NULL, NULL, IGNORE_ERROR= S); + object_property_set_int(obj, -1, "bootindex", IGNORE_ERRORS); } static const TypeInfo ne2000_isa_info =3D { .name =3D TYPE_ISA_NE2000, diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index f8e86f5184..2aec2b80b0 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -757,7 +757,7 @@ static void ne2000_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->c.bootindex, "bootindex", "/ethernet-phy@0", - &pci_dev->qdev, NULL); + &pci_dev->qdev, IGNORE_ERRORS); } =20 static Property ne2000_properties[] =3D { diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index e08aee92b1..598b60e0eb 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -334,7 +334,7 @@ static void pcnet_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static Property pcnet_properties[] =3D { diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 36cd99e3fc..04e1044cd6 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3458,7 +3458,7 @@ static void rtl8139_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static Property rtl8139_properties[] =3D { diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 54ac4f4f44..3e2a9896eb 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -340,7 +340,7 @@ static void spapr_vlan_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &dev->nicconf.bootindex, "bootindex", "", - DEVICE(dev), NULL); + DEVICE(dev), IGNORE_ERRORS); =20 if (dev->compat_flags & SPAPRVLAN_FLAG_RX_BUF_POOLS) { for (i =3D 0; i < RX_MAX_POOLS; i++) { diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3aa2af14e5..b94c23e7ff 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2036,7 +2036,7 @@ static void virtio_net_instance_init(Object *obj) n->config_size =3D sizeof(struct virtio_net_config); device_add_bootindex_property(obj, &n->nic_conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(n), NULL); + DEVICE(n), IGNORE_ERRORS); } =20 static void virtio_net_pre_save(void *opaque) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 7ebb32e664..5d8f150e9d 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2192,7 +2192,7 @@ vmxnet3_init_msix(VMXNET3State *s) VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE, &s->msix_bar, VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s), - VMXNET3_MSIX_OFFSET(s), NULL); + VMXNET3_MSIX_OFFSET(s), IGNORE_ERRORS); =20 if (0 > res) { VMW_WRPRN("Failed to initialize MSI-X, error %d", res); @@ -2317,7 +2317,7 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev, E= rror **errp) pci_dev->config[PCI_INTERRUPT_PIN] =3D 0x01; =20 ret =3D msi_init(pci_dev, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INT= RS, - VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK, NULL); + VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK, IGNORE_ERRO= RS); /* Any error other than -ENOTSUP(board's MSI support is broken) * is a programming error. Fall back to INTx silently on -ENOTSUP */ assert(!ret || ret =3D=3D -ENOTSUP); @@ -2345,7 +2345,7 @@ static void vmxnet3_instance_init(Object *obj) VMXNET3State *s =3D VMXNET3(obj); device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - DEVICE(obj), NULL); + DEVICE(obj), IGNORE_ERRORS); } =20 static void vmxnet3_pci_uninit(PCIDevice *pci_dev) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 316fca9bc1..44da2caf51 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -917,7 +917,8 @@ static void fw_cfg_init1(DeviceState *dev) =20 assert(!object_resolve_path(FW_CFG_PATH, NULL)); =20 - object_property_add_child(OBJECT(machine), FW_CFG_NAME, OBJECT(s), NUL= L); + object_property_add_child(OBJECT(machine), FW_CFG_NAME, OBJECT(s), + IGNORE_ERRORS); =20 qdev_init_nofail(dev); =20 diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 77f64b4ae7..e069ba03da 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -94,7 +94,7 @@ static void gpex_host_initfn(Object *obj) GPEXRootState *root =3D &s->gpex_root; =20 object_initialize(root, sizeof(*root), TYPE_GPEX_ROOT_DEVICE); - object_property_add_child(obj, "gpex_root", OBJECT(root), NULL); + object_property_add_child(obj, "gpex_root", OBJECT(root), IGNORE_ERROR= S); qdev_prop_set_uint32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(root), "multifunction", false); } diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 4ce201ea65..98f3810cc6 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -275,19 +275,19 @@ static void i440fx_pcihost_initfn(Object *obj) =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_START, "int", i440fx_pcihost_get_pci_hole_start, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_END, "int", i440fx_pcihost_get_pci_hole_end, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_START, "int", i440fx_pcihost_get_pci_hole64_start, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_END, "int", i440fx_pcihost_get_pci_hole64_end, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); } =20 static void i440fx_pcihost_realize(DeviceState *dev, Error **errp) @@ -306,7 +306,7 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) { dev->config[I440FX_SMRAM] =3D 0x02; =20 - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { + if (object_property_get_bool(qdev_get_machine(), "iommu", IGNORE_ERROR= S)) { error_report("warning: i440fx doesn't support emulated iommu"); } } @@ -337,7 +337,8 @@ PCIBus *i440fx_init(const char *host_type, const char *= pci_type, b =3D pci_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); s->bus =3D b; - object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), N= ULL); + object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), + IGNORE_ERRORS); qdev_init_nofail(dev); =20 d =3D pci_create_simple(b, 0, pci_type); diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 900a6edfcf..f3a8afcd9f 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -290,7 +290,7 @@ static void raven_pcihost_initfn(Object *obj) pci_dev =3D DEVICE(&s->pci_dev); qdev_set_parent_bus(pci_dev, BUS(&s->pci_bus)); object_property_set_int(OBJECT(&s->pci_dev), PCI_DEVFN(0, 0), "addr", - NULL); + IGNORE_ERRORS); qdev_prop_set_bit(pci_dev, "multifunction", false); } =20 diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index cd5c49616e..65eba73939 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -172,45 +172,50 @@ static void q35_host_initfn(Object *obj) "pci-conf-data", 4); =20 object_initialize(&s->mch, sizeof(s->mch), TYPE_MCH_PCI_DEVICE); - object_property_add_child(OBJECT(s), "mch", OBJECT(&s->mch), NULL); + object_property_add_child(OBJECT(s), "mch", OBJECT(&s->mch), + IGNORE_ERRORS); qdev_prop_set_uint32(DEVICE(&s->mch), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(&s->mch), "multifunction", false); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_START, "int", q35_host_get_pci_hole_start, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE_END, "int", q35_host_get_pci_hole_end, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_START, "int", q35_host_get_pci_hole64_start, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCI_HOST_PROP_PCI_HOLE64_END, "int", q35_host_get_pci_hole64_end, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add(obj, PCIE_HOST_MCFG_SIZE, "int", q35_host_get_mmcfg_size, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); =20 object_property_add_link(obj, MCH_HOST_PROP_RAM_MEM, TYPE_MEMORY_REGIO= N, (Object **) &s->mch.ram_memory, - qdev_prop_allow_set_link_before_realize, 0, N= ULL); + qdev_prop_allow_set_link_before_realize, 0, + IGNORE_ERRORS); =20 object_property_add_link(obj, MCH_HOST_PROP_PCI_MEM, TYPE_MEMORY_REGIO= N, (Object **) &s->mch.pci_address_space, - qdev_prop_allow_set_link_before_realize, 0, N= ULL); + qdev_prop_allow_set_link_before_realize, 0, + IGNORE_ERRORS); =20 object_property_add_link(obj, MCH_HOST_PROP_SYSTEM_MEM, TYPE_MEMORY_RE= GION, (Object **) &s->mch.system_memory, - qdev_prop_allow_set_link_before_realize, 0, N= ULL); + qdev_prop_allow_set_link_before_realize, 0, + IGNORE_ERRORS); =20 object_property_add_link(obj, MCH_HOST_PROP_IO_MEM, TYPE_MEMORY_REGION, (Object **) &s->mch.address_space_io, - qdev_prop_allow_set_link_before_realize, 0, N= ULL); + qdev_prop_allow_set_link_before_realize, 0, + IGNORE_ERRORS); =20 /* Leave enough space for the biggest MCFG BAR */ /* TODO: this matches current bios behaviour, but diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index c7ff5fb277..0cc54f167d 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -121,7 +121,7 @@ static void xilinx_pcie_host_realize(DeviceState *dev, = Error **errp) memory_region_set_enabled(&s->mmio, false); =20 /* dummy I/O region */ - memory_region_init_ram(&s->io, OBJECT(s), "io", 16, NULL); + memory_region_init_ram(&s->io, OBJECT(s), "io", 16, IGNORE_ERRORS); memory_region_set_enabled(&s->io, false); =20 /* interrupt out */ @@ -150,7 +150,7 @@ static void xilinx_pcie_host_init(Object *obj) XilinxPCIERoot *root =3D &s->root; =20 object_initialize(root, sizeof(*root), TYPE_XILINX_PCIE_ROOT); - object_property_add_child(obj, "root", OBJECT(root), NULL); + object_property_add_child(obj, "root", OBJECT(root), IGNORE_ERRORS); qdev_prop_set_uint32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(root), "multifunction", false); } diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 84d63728e1..a848d1508b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2018,7 +2018,7 @@ static void pci_qdev_realize(DeviceState *qdev, Error= **errp) pci_add_option_rom(pci_dev, is_default_rom, &local_err); if (local_err) { error_propagate(errp, local_err); - pci_qdev_unrealize(DEVICE(pci_dev), NULL); + pci_qdev_unrealize(DEVICE(pci_dev), IGNORE_ERRORS); return; } } diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 18e634f577..15bd92086c 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -427,7 +427,7 @@ void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot) dev->exp.hpev_notified =3D false; =20 qbus_set_hotplug_handler(BUS(pci_bridge_get_sec_bus(PCI_BRIDGE(dev))), - DEVICE(dev), NULL); + DEVICE(dev), IGNORE_ERRORS); } =20 void pcie_cap_slot_reset(PCIDevice *dev) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 42fafac91b..844bc97737 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -646,7 +646,7 @@ int shpc_init(PCIDevice *d, PCIBus *sec_bus, MemoryRegi= on *bar, unsigned offset) shpc_cap_update_dword(d); memory_region_add_subregion(bar, offset, &shpc->mmio); =20 - qbus_set_hotplug_handler(BUS(sec_bus), DEVICE(d), NULL); + qbus_set_hotplug_handler(BUS(sec_bus), DEVICE(d), IGNORE_ERRORS); =20 d->cap_present |=3D QEMU_PCI_CAP_SHPC; return 0; diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 5833358f87..efa8bbf8ab 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -189,7 +189,7 @@ static void pxa2xx_pcmcia_initfn(Object *obj) object_property_add_link(obj, "card", TYPE_PCMCIA_CARD, (Object **)&s->card, NULL, /* read-only property */ - 0, NULL); + 0, IGNORE_ERRORS); } =20 /* Insert a new card into a slot */ diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 62f1857206..04621d5534 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -872,7 +872,7 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) =20 dev =3D qdev_create(NULL, "e500-ccsr"); object_property_add_child(qdev_get_machine(), "e500-ccsr", - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); qdev_init_nofail(dev); ccsr =3D CCSR(dev); ccsr_addr_space =3D &ccsr->ccsr_space; diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 89b6801f67..655f1da14c 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -833,15 +833,15 @@ static void pnv_chip_init(Object *obj) chip->xscom_base =3D pcc->xscom_base; =20 object_initialize(&chip->lpc, sizeof(chip->lpc), TYPE_PNV_LPC); - object_property_add_child(obj, "lpc", OBJECT(&chip->lpc), NULL); + object_property_add_child(obj, "lpc", OBJECT(&chip->lpc), IGNORE_ERROR= S); =20 object_initialize(&chip->psi, sizeof(chip->psi), TYPE_PNV_PSI); - object_property_add_child(obj, "psi", OBJECT(&chip->psi), NULL); + object_property_add_child(obj, "psi", OBJECT(&chip->psi), IGNORE_ERROR= S); object_property_add_const_link(OBJECT(&chip->psi), "xics", OBJECT(qdev_get_machine()), &error_abor= t); =20 object_initialize(&chip->occ, sizeof(chip->occ), TYPE_PNV_OCC); - object_property_add_child(obj, "occ", OBJECT(&chip->occ), NULL); + object_property_add_child(obj, "occ", OBJECT(&chip->occ), IGNORE_ERROR= S); object_property_add_const_link(OBJECT(&chip->occ), "psi", OBJECT(&chip->psi), &error_abort); =20 @@ -1113,10 +1113,10 @@ static void powernv_machine_class_props_init(Object= Class *oc) { object_class_property_add(oc, "num-chips", "uint32_t", pnv_get_num_chips, pnv_set_num_chips, - NULL, NULL, NULL); + NULL, NULL, IGNORE_ERRORS); object_class_property_set_description(oc, "num-chips", "Specifies the number of processor chips", - NULL); + IGNORE_ERRORS); } =20 static void powernv_machine_class_init(ObjectClass *oc, void *data) diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 1b7ec70f03..161f7dbc62 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -119,7 +119,7 @@ static void pnv_core_realize_child(Object *child, XICSF= abric *xi, Error **errp) Object *obj; =20 obj =3D object_new(TYPE_PNV_ICP); - object_property_add_child(OBJECT(cpu), "icp", obj, NULL); + object_property_add_child(OBJECT(cpu), "icp", obj, IGNORE_ERRORS); object_property_add_const_link(obj, "xics", OBJECT(xi), &error_abort); object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 2bf5bfe3fd..5dd697bdb4 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -446,7 +446,8 @@ static void pnv_psi_init(Object *obj) PnvPsi *psi =3D PNV_PSI(obj); =20 object_initialize(&psi->ics, sizeof(psi->ics), TYPE_ICS_SIMPLE); - object_property_add_child(obj, "ics-psi", OBJECT(&psi->ics), NULL); + object_property_add_child(obj, "ics-psi", OBJECT(&psi->ics), + IGNORE_ERRORS); } =20 static const uint8_t irq_to_xivr[] =3D { diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index a917be6ca3..bc7b2fd287 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -598,7 +598,8 @@ static void ppc_prep_init(MachineState *machine) qdev_prop_set_string(dev, "bios-name", bios_name); qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE); pcihost =3D PCI_HOST_BRIDGE(dev); - object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NU= LL); + object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), + IGNORE_ERRORS); qdev_init_nofail(dev); pci_bus =3D (PCIBus *)qdev_get_child_bus(dev, "pci.0"); if (pci_bus =3D=3D NULL) { @@ -755,7 +756,8 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_string(dev, "bios-name", bios_name); qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE); pcihost =3D SYS_BUS_DEVICE(dev); - object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NU= LL); + object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), + IGNORE_ERRORS); qdev_init_nofail(dev); pci_bus =3D PCI_BUS(qdev_get_child_bus(dev, "pci.0")); if (!pci_bus) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 91b4057933..e07fd88a55 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -659,7 +659,7 @@ static int spapr_populate_drconf_memory(sPAPRMachineSta= te *spapr, void *fdt) dynamic_memory[1] =3D cpu_to_be32(addr & 0xffffffff); dynamic_memory[2] =3D cpu_to_be32(spapr_drc_index(drc)); dynamic_memory[3] =3D cpu_to_be32(0); /* reserved */ - dynamic_memory[4] =3D cpu_to_be32(numa_get_node(addr, NULL)); + dynamic_memory[4] =3D cpu_to_be32(numa_get_node(addr, IGNORE_E= RRORS)); if (memory_region_present(get_system_memory(), addr)) { dynamic_memory[5] =3D cpu_to_be32(SPAPR_LMB_FLAGS_ASSIGNED= ); } else { @@ -2481,19 +2481,20 @@ static void spapr_machine_initfn(Object *obj) spapr->htab_fd =3D -1; spapr->use_hotplug_event_source =3D true; object_property_add_str(obj, "kvm-type", - spapr_get_kvm_type, spapr_set_kvm_type, NULL); + spapr_get_kvm_type, spapr_set_kvm_type, + IGNORE_ERRORS); object_property_set_description(obj, "kvm-type", "Specifies the KVM virtualization mode= (HV, PR)", - NULL); + IGNORE_ERRORS); object_property_add_bool(obj, "modern-hotplug-events", spapr_get_modern_hotplug_events, spapr_set_modern_hotplug_events, - NULL); + IGNORE_ERRORS); object_property_set_description(obj, "modern-hotplug-events", "Use dedicated hotplug event mechanism= in" " place of standard EPOW events when p= ossible" " (required for memory hot-unplug supp= ort)", - NULL); + IGNORE_ERRORS); } =20 static void spapr_machine_finalizefn(Object *obj) @@ -2611,7 +2612,8 @@ static void spapr_memory_pre_plug(HotplugHandler *hot= plug_dev, DeviceState *dev, return; } =20 - mem_dev =3D object_property_get_str(OBJECT(dimm), PC_DIMM_MEMDEV_PROP,= NULL); + mem_dev =3D object_property_get_str(OBJECT(dimm), PC_DIMM_MEMDEV_PROP, + IGNORE_ERRORS); if (mem_dev && !kvmppc_is_mem_backend_page_size_ok(mem_dev)) { error_setg(errp, "Memory backend has bad page size. " "Use 'memory-backend-file' with correct mem-path."); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 39e7f3080a..d7d0c0ee8e 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -360,7 +360,7 @@ static void attach(sPAPRDRConnector *drc, DeviceState *= d, void *fdt, object_property_add_link(OBJECT(drc), "device", object_get_typename(OBJECT(drc->dev)), (Object **)(&drc->dev), - NULL, 0, NULL); + NULL, 0, IGNORE_ERRORS); } =20 static void detach(sPAPRDRConnector *drc, DeviceState *d, Error **errp) @@ -432,7 +432,7 @@ static void detach(sPAPRDRConnector *drc, DeviceState *= d, Error **errp) g_free(drc->fdt); drc->fdt =3D NULL; drc->fdt_start_offset =3D 0; - object_property_del(OBJECT(drc), "device", NULL); + object_property_del(OBJECT(drc), "device", IGNORE_ERRORS); drc->dev =3D NULL; } =20 @@ -592,8 +592,8 @@ sPAPRDRConnector *spapr_dr_connector_new(Object *owner,= const char *type, drc->owner =3D owner; prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", spapr_drc_index(drc)); - object_property_add_child(owner, prop_name, OBJECT(drc), NULL); - object_property_set_bool(OBJECT(drc), true, "realized", NULL); + object_property_add_child(owner, prop_name, OBJECT(drc), IGNORE_ERRORS= ); + object_property_set_bool(OBJECT(drc), true, "realized", IGNORE_ERRORS); g_free(prop_name); =20 /* human-readable name for a DRC to encode into the DT @@ -647,12 +647,12 @@ static void spapr_dr_connector_instance_init(Object *= obj) { sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(obj); =20 - object_property_add_uint32_ptr(obj, "id", &drc->id, NULL); + object_property_add_uint32_ptr(obj, "id", &drc->id, IGNORE_ERRORS); object_property_add(obj, "index", "uint32", prop_get_index, - NULL, NULL, NULL, NULL); - object_property_add_str(obj, "name", prop_get_name, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); + object_property_add_str(obj, "name", prop_get_name, NULL, IGNORE_ERROR= S); object_property_add(obj, "fdt", "struct", prop_get_fdt, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, IGNORE_ERRORS); } =20 static void spapr_dr_connector_class_init(ObjectClass *k, void *data) @@ -823,7 +823,8 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Ob= ject *owner, continue; } =20 - obj =3D object_property_get_link(root_container, prop->name, NULL); + obj =3D object_property_get_link(root_container, prop->name, + IGNORE_ERRORS); drc =3D SPAPR_DR_CONNECTOR(obj); drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index d587772b9c..bee492de12 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -323,9 +323,9 @@ sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, = uint32_t liobn) tcet->liobn =3D liobn; =20 snprintf(tmp, sizeof(tmp), "tce-table-%x", liobn); - object_property_add_child(OBJECT(owner), tmp, OBJECT(tcet), NULL); + object_property_add_child(OBJECT(owner), tmp, OBJECT(tcet), IGNORE_ERR= ORS); =20 - object_property_set_bool(OBJECT(tcet), true, "realized", NULL); + object_property_set_bool(OBJECT(tcet), true, "realized", IGNORE_ERRORS= ); =20 return tcet; } diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 0c181bbca5..b0c58ad3f1 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -760,7 +760,7 @@ static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState = *sphb, PCIDevice *pdev) char *path =3D NULL, *buf =3D NULL, *host =3D NULL; =20 /* Get the PCI VFIO host id */ - host =3D object_property_get_str(OBJECT(pdev), "host", NULL); + host =3D object_property_get_str(OBJECT(pdev), "host", IGNORE_ERRORS); if (!host) { goto err_out; } @@ -1697,7 +1697,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) &sphb->memspace, &sphb->iospace, PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); phb->bus =3D bus; - qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), NULL); + qbus_set_hotplug_handler(BUS(phb->bus), DEVICE(sphb), IGNORE_ERRORS); =20 /* * Initialize PHB address space. diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 80515eb54d..1d0968358e 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -106,10 +106,10 @@ static void spapr_rng_instance_init(Object *obj) object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, (Object **)&rngstate->backend, object_property_allow_set_link, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); + OBJ_PROP_LINK_UNREF_ON_RELEASE, IGNORE_ERRORS= ); object_property_set_description(obj, "rng", "ID of the random number generator bac= kend", - NULL); + IGNORE_ERRORS); } =20 static void spapr_rng_realize(DeviceState *dev, Error **errp) diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 7e250dcbaf..5f4489ac1b 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -146,7 +146,8 @@ static void spapr_rtc_realize(DeviceState *dev, Error *= *errp) rtc_ns =3D qemu_clock_get_ns(rtc_clock); rtc->ns_offset =3D host_s * NANOSECONDS_PER_SECOND - rtc_ns; =20 - object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date, NULL); + object_property_add_tm(OBJECT(rtc), "date", spapr_rtc_qom_date, + IGNORE_ERRORS); } =20 static const VMStateDescription vmstate_spapr_rtc =3D { diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 34b2faf013..2f2bf8b45d 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -354,12 +354,12 @@ static void init_event_facility(Object *obj) TYPE_SCLP_EVENTS_BUS, sdev, NULL); =20 new =3D object_new(TYPE_SCLP_QUIESCE); - object_property_add_child(obj, TYPE_SCLP_QUIESCE, new, NULL); + object_property_add_child(obj, TYPE_SCLP_QUIESCE, new, IGNORE_ERRORS); object_unref(new); qdev_set_parent_bus(DEVICE(new), &event_facility->sbus.qbus); =20 new =3D object_new(TYPE_SCLP_CPU_HOTPLUG); - object_property_add_child(obj, TYPE_SCLP_CPU_HOTPLUG, new, NULL); + object_property_add_child(obj, TYPE_SCLP_CPU_HOTPLUG, new, IGNORE_ERRO= RS); object_unref(new); qdev_set_parent_bus(DEVICE(new), &event_facility->sbus.qbus); /* the facility will automatically realize the devices via the bus */ diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 4e6469db0f..1a9fd04692 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -282,7 +282,8 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl) int s390_ipl_set_loadparm(uint8_t *loadparm) { MachineState *machine =3D MACHINE(qdev_get_machine()); - char *lp =3D object_property_get_str(OBJECT(machine), "loadparm", NULL= ); + char *lp =3D object_property_get_str(OBJECT(machine), "loadparm", + IGNORE_ERRORS); =20 if (lp) { int i; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 5651483781..aa4d7f5aa4 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -189,7 +189,7 @@ void s390_pci_sclp_deconfigure(SCCB *sccb) rc =3D SCLP_RC_NORMAL_COMPLETION; =20 if (pbdev->release_timer) { - qdev_unplug(DEVICE(pbdev->pdev), NULL); + qdev_unplug(DEVICE(pbdev->pdev), IGNORE_ERRORS); } } out: @@ -569,11 +569,11 @@ static int s390_pcihost_init(SysBusDevice *dev) pci_setup_iommu(b, s390_pci_dma_iommu, s); =20 bus =3D BUS(b); - qbus_set_hotplug_handler(bus, DEVICE(dev), NULL); + qbus_set_hotplug_handler(bus, DEVICE(dev), IGNORE_ERRORS); phb->bus =3D b; =20 s->bus =3D S390_PCI_BUS(qbus_create(TYPE_S390_PCI_BUS, DEVICE(s), NULL= )); - qbus_set_hotplug_handler(BUS(s->bus), DEVICE(s), NULL); + qbus_set_hotplug_handler(BUS(s->bus), DEVICE(s), IGNORE_ERRORS); =20 s->iommu_table =3D g_hash_table_new_full(g_int64_hash, g_int64_equal, NULL, g_free); @@ -761,7 +761,7 @@ static void s390_pcihost_timer_cb(void *opaque) pbdev->state =3D ZPCI_FS_STANDBY; s390_pci_generate_plug_event(HP_EVENT_CONFIGURED_TO_STBRES, pbdev->fh, pbdev->fid); - qdev_unplug(DEVICE(pbdev), NULL); + qdev_unplug(DEVICE(pbdev), IGNORE_ERRORS); } =20 static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 2db2f9c8a8..251882a9dc 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -41,7 +41,7 @@ void s390_skeys_init(void) obj =3D object_new(TYPE_QEMU_S390_SKEYS); } object_property_add_child(qdev_get_machine(), TYPE_S390_SKEYS, - obj, NULL); + obj, IGNORE_ERRORS); object_unref(obj); =20 qdev_init_nofail(DEVICE(obj)); @@ -392,8 +392,8 @@ static void s390_skeys_instance_init(Object *obj) { object_property_add_bool(obj, "migration-enabled", s390_skeys_get_migration_enabled, - s390_skeys_set_migration_enabled, NULL); - object_property_set_bool(obj, true, "migration-enabled", NULL); + s390_skeys_set_migration_enabled, IGNORE_ERRO= RS); + object_property_set_bool(obj, true, "migration-enabled", IGNORE_ERRORS= ); } =20 static void s390_skeys_class_init(ObjectClass *oc, void *data) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a806345276..ae81723914 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -128,7 +128,7 @@ static void ccw_init(MachineState *machine) =20 dev =3D qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE); object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDG= E, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); qdev_init_nofail(dev); =20 /* register hypercalls */ @@ -331,33 +331,33 @@ static inline void s390_machine_initfn(Object *obj) { object_property_add_bool(obj, "aes-key-wrap", machine_get_aes_key_wrap, - machine_set_aes_key_wrap, NULL); + machine_set_aes_key_wrap, IGNORE_ERRORS); object_property_set_description(obj, "aes-key-wrap", "enable/disable AES key wrapping using the CPACF wrapping key", - NULL); - object_property_set_bool(obj, true, "aes-key-wrap", NULL); + IGNORE_ERRORS); + object_property_set_bool(obj, true, "aes-key-wrap", IGNORE_ERRORS); =20 object_property_add_bool(obj, "dea-key-wrap", machine_get_dea_key_wrap, - machine_set_dea_key_wrap, NULL); + machine_set_dea_key_wrap, IGNORE_ERRORS); object_property_set_description(obj, "dea-key-wrap", "enable/disable DEA key wrapping using the CPACF wrapping key", - NULL); - object_property_set_bool(obj, true, "dea-key-wrap", NULL); + IGNORE_ERRORS); + object_property_set_bool(obj, true, "dea-key-wrap", IGNORE_ERRORS); object_property_add_str(obj, "loadparm", - machine_get_loadparm, machine_set_loadparm, NULL); + machine_get_loadparm, machine_set_loadparm, IGNORE_ERRORS); object_property_set_description(obj, "loadparm", "Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars conve= rted" " to upper case) to pass to machine loader, boot manager," " and guest kernel", - NULL); + IGNORE_ERRORS); object_property_add_bool(obj, "s390-squash-mcss", machine_get_squash_mcss, - machine_set_squash_mcss, NULL); + machine_set_squash_mcss, IGNORE_ERRORS); object_property_set_description(obj, "s390-squash-mcss", "enable/disable squashing subchannels into the default css", - NULL); - object_property_set_bool(obj, false, "s390-squash-mcss", NULL); + IGNORE_ERRORS); + object_property_set_bool(obj, false, "s390-squash-mcss", IGNORE_ERRORS= ); } =20 static const TypeInfo ccw_machine_info =3D { diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index afa4148e6b..79a1fa3b49 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -82,7 +82,7 @@ void s390_init_ipl_dev(const char *kernel_filename, qdev_prop_set_string(dev, "netboot_fw", netboot_fw); qdev_prop_set_bit(dev, "enforce_bios", enforce_bios); object_property_add_child(qdev_get_machine(), TYPE_S390_IPL, - new, NULL); + new, IGNORE_ERRORS); object_unref(new); qdev_init_nofail(dev); } diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 83d6023894..1bd6b568f4 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -478,7 +478,7 @@ void s390_sclp_init(void) Object *new =3D object_new(TYPE_SCLP); =20 object_property_add_child(qdev_get_machine(), TYPE_SCLP, new, - NULL); + IGNORE_ERRORS); object_unref(OBJECT(new)); qdev_init_nofail(DEVICE(new)); } @@ -569,7 +569,8 @@ static void sclp_init(Object *obj) Object *new; =20 new =3D object_new(TYPE_SCLP_EVENT_FACILITY); - object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new, NULL); + object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new, + IGNORE_ERRORS); object_unref(new); sclp->event_facility =3D EVENT_FACILITY(new); =20 @@ -612,7 +613,7 @@ sclpMemoryHotplugDev *init_sclp_memory_hotplug_dev(void) dev =3D qdev_create(NULL, TYPE_SCLP_MEMORY_HOTPLUG_DEV); object_property_add_child(qdev_get_machine(), TYPE_SCLP_MEMORY_HOTPLUG_DEV, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); qdev_init_nofail(dev); return SCLP_MEMORY_HOTPLUG_DEV(object_resolve_path( TYPE_SCLP_MEMORY_HOTPLUG_DEV, NULL)); diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e6a6f74be3..9c56e17196 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -912,7 +912,7 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw= _dev, Error **errp) =20 object_property_set_link(OBJECT(dev), OBJECT(dev->vdev.conf.rng), "rng", - NULL); + IGNORE_ERRORS); } =20 static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **er= rp) @@ -930,7 +930,7 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *= ccw_dev, Error **errp) =20 object_property_set_link(OBJECT(vdev), OBJECT(dev->vdev.conf.cryptodev), "cryptodev", - NULL); + IGNORE_ERRORS); } =20 /* DeviceState to VirtioCcwDevice. Note: used on datapath, diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 804122ab05..e5a3e20a69 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2366,7 +2366,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Erro= r **errp) =20 if (megasas_use_msix(s) && msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, - &s->mmio_io, b->mmio_bar, 0x3800, 0x68, NULL)) { + &s->mmio_io, b->mmio_bar, 0x3800, 0x68, IGNORE_ERRORS)) { /* TODO: check msix_init's error, and should fail on msix=3Don */ s->msix =3D ON_OFF_AUTO_OFF; } diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index f5574469c8..796ae562bf 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -234,7 +234,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, Blo= ckBackend *blk, driver =3D blk_is_sg(blk) ? "scsi-generic" : "scsi-disk"; dev =3D qdev_create(&bus->qbus, driver); name =3D g_strdup_printf("legacy[%d]", unit); - object_property_add_child(OBJECT(bus), name, OBJECT(dev), NULL); + object_property_add_child(OBJECT(bus), name, OBJECT(dev), IGNORE_ERROR= S); g_free(name); =20 qdev_prop_set_uint32(dev, "scsi-id", unit); @@ -242,10 +242,10 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, B= lockBackend *blk, object_property_set_int(OBJECT(dev), bootindex, "bootindex", &error_abort); } - if (object_property_find(OBJECT(dev), "removable", NULL)) { + if (object_property_find(OBJECT(dev), "removable", IGNORE_ERRORS)) { qdev_prop_set_bit(dev, "removable", removable); } - if (serial && object_property_find(OBJECT(dev), "serial", NULL)) { + if (serial && object_property_find(OBJECT(dev), "serial", IGNORE_ERROR= S)) { qdev_prop_set_string(dev, "serial", serial); } qdev_prop_set_drive(dev, "drive", blk, &err); @@ -2127,7 +2127,7 @@ static void scsi_dev_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", NULL, - &s->qdev, NULL); + &s->qdev, IGNORE_ERRORS); } =20 static const TypeInfo scsi_device_type_info =3D { diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index cd4ab05233..c44d1045b6 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -262,7 +262,7 @@ static void vhost_scsi_instance_init(Object *obj) vsc->feature_bits =3D kernel_feature_bits; =20 device_add_bootindex_property(obj, &vsc->bootindex, "bootindex", NULL, - DEVICE(vsc), NULL); + DEVICE(vsc), IGNORE_ERRORS); } =20 static const TypeInfo vhost_scsi_info =3D { diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 4a106da856..e5133595dc 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1065,7 +1065,7 @@ pvscsi_init_msi(PVSCSIState *s) PCIDevice *d =3D PCI_DEVICE(s); =20 res =3D msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, - PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); + PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, IGNORE_ERRORS= ); if (res < 0) { trace_pvscsi_init_msi_fail(res); s->msi_used =3D false; diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 4c1986b97f..b7b9e0f754 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -989,10 +989,10 @@ static void rtc_realizefn(DeviceState *dev, Error **e= rrp) qdev_set_legacy_instance_id(dev, base, 3); qemu_register_reset(rtc_reset, s); =20 - object_property_add_tm(OBJECT(s), "date", rtc_get_date, NULL); + object_property_add_tm(OBJECT(s), "date", rtc_get_date, IGNORE_ERRORS); =20 object_property_add_alias(qdev_get_machine(), "rtc-time", - OBJECT(s), "date", NULL); + OBJECT(s), "date", IGNORE_ERRORS); =20 qdev_init_gpio_out(dev, &s->irq, 1); } @@ -1050,7 +1050,7 @@ static void rtc_class_initfn(ObjectClass *klass, void= *data) =20 static void rtc_finalize(Object *obj) { - object_property_del(qdev_get_machine(), "rtc", NULL); + object_property_del(qdev_get_machine(), "rtc", IGNORE_ERRORS); } =20 static const TypeInfo mc146818rtc_info =3D { diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 5939b273b9..c25247e3cb 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -270,7 +270,7 @@ static void usb_qdev_realize(DeviceState *qdev, Error *= *errp) if (dev->auto_attach) { usb_device_attach(dev, &local_err); if (local_err) { - usb_qdev_unrealize(qdev, NULL); + usb_qdev_unrealize(qdev, IGNORE_ERRORS); error_propagate(errp, local_err); return; } @@ -446,7 +446,7 @@ void usb_claim_port(USBDevice *dev, Error **errp) } else { if (bus->nfree =3D=3D 1 && strcmp(object_get_typename(OBJECT(dev))= , "usb-hub") !=3D 0) { /* Create a new hub and chain it on */ - usb_try_create_simple(bus, "usb-hub", NULL); + usb_try_create_simple(bus, "usb-hub", IGNORE_ERRORS); } if (bus->nfree =3D=3D 0) { error_setg(errp, "tried to attach usb device %s to a bus " @@ -776,11 +776,11 @@ static void usb_device_instance_init(Object *obj) if (klass->attached_settable) { object_property_add_bool(obj, "attached", usb_get_attached, usb_set_attached, - NULL); + IGNORE_ERRORS); } else { object_property_add_bool(obj, "attached", usb_get_attached, NULL, - NULL); + IGNORE_ERRORS); } } =20 diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index c40019df96..5b31791392 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -725,7 +725,8 @@ static void usb_hid_initfn(USBDevice *dev, int kind, us->intr =3D usb_ep_get(dev, USB_TOKEN_IN, 1); hid_init(&us->hid, kind, usb_hid_changed); if (us->display && us->hid.s) { - qemu_input_handler_bind(us->hid.s, us->display, us->head, NULL); + qemu_input_handler_bind(us->hid.s, us->display, us->head, + IGNORE_ERRORS); } } =20 diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 85fc81bf43..4c2536ed8c 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1379,7 +1379,7 @@ static void usb_net_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", - &dev->qdev, NULL); + &dev->qdev, IGNORE_ERRORS); } =20 static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 8a61ec94c8..b3173553c5 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -683,7 +683,7 @@ static USBDevice *usb_msd_init(USBBus *bus, const char = *filename) /* parse -usbdevice disk: syntax into drive opts */ do { snprintf(id, sizeof(id), "usb%d", nr++); - opts =3D qemu_opts_create(qemu_find_opts("drive"), id, 1, NULL); + opts =3D qemu_opts_create(qemu_find_opts("drive"), id, 1, IGNORE_E= RRORS); } while (!opts); =20 p1 =3D strchr(filename, ':'); @@ -827,8 +827,8 @@ static void usb_msd_instance_init(Object *obj) { object_property_add(obj, "bootindex", "int32", usb_msd_get_bootindex, - usb_msd_set_bootindex, NULL, NULL, NULL); - object_property_set_int(obj, -1, "bootindex", NULL); + usb_msd_set_bootindex, NULL, NULL, IGNORE_ERRORS); + object_property_set_int(obj, -1, "bootindex", IGNORE_ERRORS); } =20 static void usb_msd_class_initfn_bot(ObjectClass *klass, void *data) diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 63491111e5..6a19b23ebe 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -66,7 +66,7 @@ static void usb_ehci_pci_realize(PCIDevice *dev, Error **= errp) s->irq =3D pci_allocate_irq(dev); s->as =3D pci_get_address_space(dev); =20 - usb_ehci_realize(s, DEVICE(dev), NULL); + usb_ehci_realize(s, DEVICE(dev), IGNORE_ERRORS); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem); } =20 @@ -103,7 +103,7 @@ static void usb_ehci_pci_exit(PCIDevice *dev) EHCIPCIState *i =3D PCI_EHCI(dev); EHCIState *s =3D &i->ehci; =20 - usb_ehci_unrealize(s, DEVICE(dev), NULL); + usb_ehci_unrealize(s, DEVICE(dev), IGNORE_ERRORS); =20 g_free(s->irq); s->irq =3D NULL; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index a0c7960a7b..05364b6955 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3425,7 +3425,7 @@ static void usb_xhci_realize(struct PCIDevice *dev, E= rror **errp) msix_init(dev, xhci->numintrs, &xhci->mem, 0, OFF_MSIX_TABLE, &xhci->mem, 0, OFF_MSIX_PBA, - 0x90, NULL); + 0x90, IGNORE_ERRORS); } } =20 diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index f9c8eafe06..c32ee8864c 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -1065,7 +1065,7 @@ static void usb_host_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &s->bootindex, "bootindex", NULL, - &udev->qdev, NULL); + &udev->qdev, IGNORE_ERRORS); } =20 static void usb_host_unrealize(USBDevice *udev, Error **errp) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index aa22d69216..d50239e588 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -2521,7 +2521,7 @@ static void usbredir_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &dev->bootindex, "bootindex", NULL, - &udev->qdev, NULL); + &udev->qdev, IGNORE_ERRORS); } =20 static const TypeInfo usbredir_dev_info =3D { diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 32aca77701..2d3bad68fc 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2936,7 +2936,7 @@ static void vfio_instance_init(Object *obj) =20 device_add_bootindex_property(obj, &vdev->bootindex, "bootindex", NULL, - &pci_dev->qdev, NULL); + &pci_dev->qdev, IGNORE_ERRORS); vdev->host.domain =3D ~0U; vdev->host.bus =3D ~0U; vdev->host.slot =3D ~0U; diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index f9939baa45..c2ba3f991b 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -485,12 +485,12 @@ static void virtio_balloon_instance_init(Object *obj) VirtIOBalloon *s =3D VIRTIO_BALLOON(obj); =20 object_property_add(obj, "guest-stats", "guest statistics", - balloon_stats_get_all, NULL, NULL, s, NULL); + balloon_stats_get_all, NULL, NULL, s, IGNORE_ERROR= S); =20 object_property_add(obj, "guest-stats-polling-interval", "int", balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, - NULL, s, NULL); + NULL, s, IGNORE_ERRORS); } =20 static const VMStateDescription vmstate_virtio_balloon =3D { diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index 422aca3a98..fe66425540 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -41,7 +41,7 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpc= i_dev, Error **errp) object_property_set_bool(OBJECT(vdev), true, "realized", errp); object_property_set_link(OBJECT(vcrypto), OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev", - NULL); + IGNORE_ERRORS); } =20 static void virtio_crypto_pci_class_init(ObjectClass *klass, void *data) diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 0353eb6d5d..a4714af54a 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -916,7 +916,7 @@ static void virtio_crypto_instance_init(Object *obj) TYPE_CRYPTODEV_BACKEND, (Object **)&vcrypto->conf.cryptodev, virtio_crypto_check_cryptodev_is_used, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); + OBJ_PROP_LINK_UNREF_ON_RELEASE, IGNORE_ERRORS= ); } =20 static const TypeInfo virtio_crypto_info =3D { diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index f9b7244808..20b2fef683 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1686,7 +1686,7 @@ static void virtio_pci_device_plugged(DeviceState *d,= Error **errp) =20 if (proxy->nvectors) { int err =3D msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvecto= rs, - proxy->msix_bar_idx, NULL); + proxy->msix_bar_idx, IGNORE_ERRO= RS); if (err) { /* Notice when a system that supports MSIx can't initialize it= */ if (err !=3D -ENOTSUP) { @@ -2384,7 +2384,7 @@ static void virtio_rng_pci_realize(VirtIOPCIProxy *vp= ci_dev, Error **errp) =20 object_property_set_link(OBJECT(vrng), OBJECT(vrng->vdev.conf.rng), "rng", - NULL); + IGNORE_ERRORS); } =20 static void virtio_rng_pci_class_init(ObjectClass *klass, void *data) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index a6ee501051..e564e3b291 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -189,14 +189,14 @@ static void virtio_rng_device_realize(DeviceState *de= v, Error **errp) object_property_add_child(OBJECT(dev), "default-backend", OBJECT(vrng->conf.default_backend), - NULL); + IGNORE_ERRORS); =20 /* The child property took a reference, we can safely drop ours no= w */ object_unref(OBJECT(vrng->conf.default_backend)); =20 object_property_set_link(OBJECT(dev), OBJECT(vrng->conf.default_backend), - "rng", NULL); + "rng", IGNORE_ERRORS); } =20 vrng->rng =3D vrng->conf.rng; @@ -269,7 +269,7 @@ static void virtio_rng_initfn(Object *obj) object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, (Object **)&vrng->conf.rng, qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); + OBJ_PROP_LINK_UNREF_ON_RELEASE, IGNORE_ERRORS= ); } =20 static const TypeInfo virtio_rng_info =3D { diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 464947f76d..fd16ff7d9d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2223,7 +2223,8 @@ void virtio_instance_init_common(Object *proxy_obj, v= oid *data, DeviceState *vdev =3D data; =20 object_initialize(vdev, vdev_size, vdev_name); - object_property_add_child(proxy_obj, "virtio-backend", OBJECT(vdev), N= ULL); + object_property_add_child(proxy_obj, "virtio-backend", OBJECT(vdev), + IGNORE_ERRORS); object_unref(OBJECT(vdev)); qdev_alias_all_properties(vdev, proxy_obj); } diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 5048430177..56e5a49923 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -310,7 +310,7 @@ void xen_pv_del_xendev(struct XenDevice *xendev) =20 QTAILQ_REMOVE(&xendevs, xendev, next); =20 - qdev_unplug(&xendev->qdev, NULL); + qdev_unplug(&xendev->qdev, IGNORE_ERRORS); } =20 void xen_pv_insert_xendev(struct XenDevice *xendev) diff --git a/io/channel-command.c b/io/channel-command.c index 319c5ed50c..2eea0135b0 100644 --- a/io/channel-command.c +++ b/io/channel-command.c @@ -218,7 +218,7 @@ static void qio_channel_command_finalize(Object *obj) ioc->writefd =3D ioc->readfd =3D -1; if (ioc->pid > 0) { #ifndef WIN32 - qio_channel_command_abort(ioc, NULL); + qio_channel_command_abort(ioc, IGNORE_ERRORS); #endif } } diff --git a/io/channel-tls.c b/io/channel-tls.c index 6182702dab..6350f5b25f 100644 --- a/io/channel-tls.c +++ b/io/channel-tls.c @@ -31,7 +31,7 @@ static ssize_t qio_channel_tls_write_handler(const char *= buf, QIOChannelTLS *tioc =3D QIO_CHANNEL_TLS(opaque); ssize_t ret; =20 - ret =3D qio_channel_write(tioc->master, buf, len, NULL); + ret =3D qio_channel_write(tioc->master, buf, len, IGNORE_ERRORS); if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { errno =3D EAGAIN; return -1; @@ -49,7 +49,7 @@ static ssize_t qio_channel_tls_read_handler(char *buf, QIOChannelTLS *tioc =3D QIO_CHANNEL_TLS(opaque); ssize_t ret; =20 - ret =3D qio_channel_read(tioc->master, buf, len, NULL); + ret =3D qio_channel_read(tioc->master, buf, len, IGNORE_ERRORS); if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { errno =3D EAGAIN; return -1; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b54bdffd8c..f46bd88274 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -119,7 +119,8 @@ typedef abi_int target_pid_t; static const char *get_elf_platform(void) { static char elf_platform[] =3D "i386"; - int family =3D object_property_get_int(OBJECT(thread_cpu), "family", N= ULL); + int family =3D object_property_get_int(OBJECT(thread_cpu), "family", + IGNORE_ERRORS); if (family > 6) family =3D 6; if (family >=3D 3) diff --git a/linux-user/uname.c b/linux-user/uname.c index 5199380d85..7c13669a32 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -56,7 +56,7 @@ const char *cpu_to_uname_machine(void *cpu_env) #elif defined(TARGET_I386) && !defined(TARGET_X86_64) /* see arch/x86/kernel/cpu/bugs.c: check_bugs(), 386, 486, 586, 686 */ CPUState *cpu =3D ENV_GET_CPU((CPUX86State *)cpu_env); - int family =3D object_property_get_int(OBJECT(cpu), "family", NULL); + int family =3D object_property_get_int(OBJECT(cpu), "family", IGNORE_E= RRORS); if (family =3D=3D 4) { return "i486"; } diff --git a/migration/block.c b/migration/block.c index 114cedbfd0..31ea6ec7c1 100644 --- a/migration/block.c +++ b/migration/block.c @@ -348,7 +348,8 @@ static int set_dirty_tracking(void) QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { aio_context_acquire(blk_get_aio_context(bmds->blk)); bmds->dirty_bitmap =3D bdrv_create_dirty_bitmap(blk_bs(bmds->blk), - BLOCK_SIZE, NULL, NU= LL); + BLOCK_SIZE, NULL, + IGNORE_ERRORS); aio_context_release(blk_get_aio_context(bmds->blk)); if (!bmds->dirty_bitmap) { ret =3D -errno; diff --git a/migration/colo.c b/migration/colo.c index 111b715546..d623d801e7 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -330,7 +330,7 @@ static int colo_do_checkpoint_transaction(MigrationStat= e *s, goto out; } /* Reset channel-buffer directly */ - qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, NULL); + qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, IGNORE_ERRORS); bioc->usage =3D 0; =20 qemu_mutex_lock_iothread(); @@ -618,7 +618,7 @@ void *colo_process_incoming_thread(void *opaque) goto out; } bioc->usage =3D total_size; - qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, NULL); + qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, IGNORE_ERRORS); =20 colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_RECEIVED, &local_err); diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index a597c5f948..63b96c82c2 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -48,7 +48,7 @@ static ssize_t channel_writev_buffer(void *opaque, =20 while (nlocal_iov > 0) { ssize_t len; - len =3D qio_channel_writev(ioc, local_iov, nlocal_iov, NULL); + len =3D qio_channel_writev(ioc, local_iov, nlocal_iov, IGNORE_ERRO= RS); if (len =3D=3D QIO_CHANNEL_ERR_BLOCK) { qio_channel_wait(ioc, G_IO_OUT); continue; @@ -78,7 +78,7 @@ static ssize_t channel_get_buffer(void *opaque, ssize_t ret; =20 do { - ret =3D qio_channel_read(ioc, (char *)buf, size, NULL); + ret =3D qio_channel_read(ioc, (char *)buf, size, IGNORE_ERRORS); if (ret < 0) { if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { qio_channel_yield(ioc, G_IO_IN); @@ -96,7 +96,7 @@ static ssize_t channel_get_buffer(void *opaque, static int channel_close(void *opaque) { QIOChannel *ioc =3D QIO_CHANNEL(opaque); - qio_channel_close(ioc, NULL); + qio_channel_close(ioc, IGNORE_ERRORS); object_unref(OBJECT(ioc)); return 0; } @@ -118,7 +118,7 @@ static int channel_shutdown(void *opaque, } else { mode =3D QIO_CHANNEL_SHUTDOWN_WRITE; } - if (qio_channel_shutdown(ioc, mode, NULL) < 0) { + if (qio_channel_shutdown(ioc, mode, IGNORE_ERRORS) < 0) { /* XXX handler Error * object */ return -EIO; } @@ -132,7 +132,7 @@ static int channel_set_blocking(void *opaque, { QIOChannel *ioc =3D QIO_CHANNEL(opaque); =20 - if (qio_channel_set_blocking(ioc, enabled, NULL) < 0) { + if (qio_channel_set_blocking(ioc, enabled, IGNORE_ERRORS) < 0) { return -1; } return 0; diff --git a/migration/ram.c b/migration/ram.c index b2ca242a3a..e210263f41 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -661,7 +661,8 @@ static void migration_bitmap_sync(RAMState *rs) rs->bytes_xfer_prev =3D bytes_xfer_now; } if (migrate_use_events()) { - qapi_event_send_migration_pass(ram_counters.dirty_sync_count, NULL= ); + qapi_event_send_migration_pass(ram_counters.dirty_sync_count, + IGNORE_ERRORS); } } =20 diff --git a/migration/socket.c b/migration/socket.c index 85bfdccae1..018e1d1191 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -154,7 +154,7 @@ static gboolean socket_accept_incoming_migration(QIOCha= nnel *ioc, =20 out: /* Close listening socket as its no longer needed */ - qio_channel_close(ioc, NULL); + qio_channel_close(ioc, IGNORE_ERRORS); return FALSE; /* unregister */ } =20 diff --git a/monitor.c b/monitor.c index 1e63ace2d4..c262311fdd 100644 --- a/monitor.c +++ b/monitor.c @@ -3211,7 +3211,7 @@ void chardev_add_completion(ReadLineState *rs, int nb= _args, const char *str) len =3D strlen(str); readline_set_completion_index(rs, len); =20 - start =3D list =3D qmp_query_chardev_backends(NULL); + start =3D list =3D qmp_query_chardev_backends(IGNORE_ERRORS); while (list) { const char *chr_name =3D list->value->name; =20 @@ -3322,7 +3322,7 @@ void chardev_remove_completion(ReadLineState *rs, int= nb_args, const char *str) len =3D strlen(str); readline_set_completion_index(rs, len); =20 - start =3D list =3D qmp_query_chardev(NULL); + start =3D list =3D qmp_query_chardev(IGNORE_ERRORS); while (list) { ChardevInfo *chr =3D list->value; =20 @@ -3342,7 +3342,7 @@ static void ringbuf_completion(ReadLineState *rs, con= st char *str) len =3D strlen(str); readline_set_completion_index(rs, len); =20 - start =3D list =3D qmp_query_chardev(NULL); + start =3D list =3D qmp_query_chardev(IGNORE_ERRORS); while (list) { ChardevInfo *chr_info =3D list->value; =20 @@ -3389,7 +3389,7 @@ void object_del_completion(ReadLineState *rs, int nb_= args, const char *str) len =3D strlen(str); readline_set_completion_index(rs, len); =20 - start =3D list =3D qmp_qom_list("/objects", NULL); + start =3D list =3D qmp_qom_list("/objects", IGNORE_ERRORS); while (list) { ObjectPropertyInfo *info =3D list->value; =20 @@ -3921,7 +3921,7 @@ static QObject *get_qmp_greeting(void) { QObject *ver =3D NULL; =20 - qmp_marshal_query_version(NULL, &ver, NULL); + qmp_marshal_query_version(NULL, &ver, IGNORE_ERRORS); =20 return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': []}= }", ver); diff --git a/nbd/client.c b/nbd/client.c index 595d99ed30..8541e109a7 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -157,7 +157,7 @@ static void nbd_send_opt_abort(QIOChannel *ioc) * to disconnect without waiting for the server reply, so we don't * even care if the request makes it to the server, let alone * waiting around for whether the server replies. */ - nbd_send_option_request(ioc, NBD_OPT_ABORT, 0, NULL, NULL); + nbd_send_option_request(ioc, NBD_OPT_ABORT, 0, NULL, IGNORE_ERRORS); } =20 =20 @@ -759,7 +759,7 @@ ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *r= equest) stq_be_p(buf + 16, request->from); stl_be_p(buf + 24, request->len); =20 - return write_sync(ioc, buf, sizeof(buf), NULL); + return write_sync(ioc, buf, sizeof(buf), IGNORE_ERRORS); } =20 ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp) diff --git a/nbd/server.c b/nbd/server.c index 49b55f6ede..8631fa55a3 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -124,7 +124,7 @@ static int nbd_negotiate_read(QIOChannel *ioc, void *bu= ffer, size_t size) nbd_negotiate_continue, qemu_coroutine_self(), NULL); - ret =3D read_sync(ioc, buffer, size, NULL); + ret =3D read_sync(ioc, buffer, size, IGNORE_ERRORS); g_source_remove(watch); return ret; =20 @@ -142,7 +142,7 @@ static int nbd_negotiate_write(QIOChannel *ioc, const v= oid *buffer, size_t size) nbd_negotiate_continue, qemu_coroutine_self(), NULL); - ret =3D write_sync(ioc, buffer, size, NULL); + ret =3D write_sync(ioc, buffer, size, IGNORE_ERRORS); g_source_remove(watch); return ret; } @@ -632,7 +632,7 @@ static coroutine_fn int nbd_negotiate(NBDClientNewData = *data) [28 .. 151] reserved (0, omit if no_zeroes) */ =20 - qio_channel_set_blocking(client->ioc, false, NULL); + qio_channel_set_blocking(client->ioc, false, IGNORE_ERRORS); rc =3D -EINVAL; =20 TRACE("Beginning negotiation."); @@ -694,7 +694,7 @@ static ssize_t nbd_receive_request(QIOChannel *ioc, NBD= Request *request) uint32_t magic; ssize_t ret; =20 - ret =3D read_sync(ioc, buf, sizeof(buf), NULL); + ret =3D read_sync(ioc, buf, sizeof(buf), IGNORE_ERRORS); if (ret < 0) { return ret; } @@ -745,7 +745,7 @@ static ssize_t nbd_send_reply(QIOChannel *ioc, NBDReply= *reply) stl_be_p(buf + 4, reply->error); stq_be_p(buf + 8, reply->handle); =20 - return write_sync(ioc, buf, sizeof(buf), NULL); + return write_sync(ioc, buf, sizeof(buf), IGNORE_ERRORS); } =20 #define MAX_NBD_REQUESTS 16 @@ -790,7 +790,7 @@ static void client_close(NBDClient *client) * then we'll close the socket and free the NBDClient. */ qio_channel_shutdown(client->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, - NULL); + IGNORE_ERRORS); =20 /* Also tell the client, so that they release their reference. */ if (client->close) { @@ -920,7 +920,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t d= ev_offset, off_t size, * access since the export could be available before migration handove= r. */ aio_context_acquire(exp->ctx); - blk_invalidate_cache(blk, NULL); + blk_invalidate_cache(blk, IGNORE_ERRORS); aio_context_release(exp->ctx); return exp; =20 @@ -1048,7 +1048,7 @@ static ssize_t nbd_co_send_reply(NBDRequestData *req,= NBDReply *reply, qio_channel_set_cork(client->ioc, true); rc =3D nbd_send_reply(client->ioc, reply); if (rc >=3D 0) { - ret =3D write_sync(client->ioc, req->data, len, NULL); + ret =3D write_sync(client->ioc, req->data, len, IGNORE_ERRORS); if (ret < 0) { rc =3D -EIO; } @@ -1123,7 +1123,7 @@ static ssize_t nbd_co_receive_request(NBDRequestData = *req, if (request->type =3D=3D NBD_CMD_WRITE) { TRACE("Reading %" PRIu32 " byte(s)", request->len); =20 - if (read_sync(client->ioc, req->data, request->len, NULL) < 0) { + if (read_sync(client->ioc, req->data, request->len, IGNORE_ERRORS)= < 0) { LOG("reading from socket failed"); rc =3D -EIO; goto out; diff --git a/net/colo-compare.c b/net/colo-compare.c index 6d500e1dc4..16e46c3a6c 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -788,13 +788,13 @@ static void colo_compare_init(Object *obj) { object_property_add_str(obj, "primary_in", compare_get_pri_indev, compare_set_pri_indev, - NULL); + IGNORE_ERRORS); object_property_add_str(obj, "secondary_in", compare_get_sec_indev, compare_set_sec_indev, - NULL); + IGNORE_ERRORS); object_property_add_str(obj, "outdev", compare_get_outdev, compare_set_outdev, - NULL); + IGNORE_ERRORS); } =20 static void colo_compare_finalize(Object *obj) diff --git a/net/dump.c b/net/dump.c index 442eb532f9..b66d56e06c 100644 --- a/net/dump.c +++ b/net/dump.c @@ -329,9 +329,9 @@ static void filter_dump_instance_init(Object *obj) nfds->maxlen =3D 65536; =20 object_property_add(obj, "maxlen", "int", filter_dump_get_maxlen, - filter_dump_set_maxlen, NULL, NULL, NULL); + filter_dump_set_maxlen, NULL, NULL, IGNORE_ERRORS); object_property_add_str(obj, "file", file_dump_get_filename, - file_dump_set_filename, NULL); + file_dump_set_filename, IGNORE_ERRORS); } =20 static void filter_dump_instance_finalize(Object *obj) diff --git a/net/filter-buffer.c b/net/filter-buffer.c index cc6bd94445..0a9c12aa1a 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -193,7 +193,7 @@ static void filter_buffer_init(Object *obj) { object_property_add(obj, "interval", "int", filter_buffer_get_interval, - filter_buffer_set_interval, NULL, NULL, NULL); + filter_buffer_set_interval, NULL, NULL, IGNORE_ERR= ORS); } =20 static const TypeInfo filter_buffer_info =3D { diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 52d978fce2..c86d355c93 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -338,15 +338,15 @@ static void filter_redirector_set_outdev(Object *obj, static void filter_mirror_init(Object *obj) { object_property_add_str(obj, "outdev", filter_mirror_get_outdev, - filter_mirror_set_outdev, NULL); + filter_mirror_set_outdev, IGNORE_ERRORS); } =20 static void filter_redirector_init(Object *obj) { object_property_add_str(obj, "indev", filter_redirector_get_indev, - filter_redirector_set_indev, NULL); + filter_redirector_set_indev, IGNORE_ERRORS); object_property_add_str(obj, "outdev", filter_redirector_get_outdev, - filter_redirector_set_outdev, NULL); + filter_redirector_set_outdev, IGNORE_ERRORS); } =20 static void filter_mirror_fini(Object *obj) diff --git a/net/filter.c b/net/filter.c index 1dfd2caa23..ee7ab8e443 100644 --- a/net/filter.c +++ b/net/filter.c @@ -177,14 +177,14 @@ static void netfilter_init(Object *obj) =20 object_property_add_str(obj, "netdev", netfilter_get_netdev_id, netfilter_set_netdev_= id, - NULL); + IGNORE_ERRORS); object_property_add_enum(obj, "queue", "NetFilterDirection", NetFilterDirection_lookup, netfilter_get_direction, netfilter_set_direct= ion, - NULL); + IGNORE_ERRORS); object_property_add_str(obj, "status", netfilter_get_status, netfilter_set_status, - NULL); + IGNORE_ERRORS); } =20 static void netfilter_complete(UserCreatable *uc, Error **errp) diff --git a/net/net.c b/net/net.c index 6235aabed8..9d0f1119cc 100644 --- a/net/net.c +++ b/net/net.c @@ -1272,7 +1272,7 @@ static void netfilter_print_info(Monitor *mon, NetFil= terState *nf) continue; } v =3D string_output_visitor_new(false, &str); - object_property_get(OBJECT(nf), v, prop->name, NULL); + object_property_get(OBJECT(nf), v, prop->name, IGNORE_ERRORS); visit_complete(v, &str); visit_free(v); monitor_printf(mon, ",%s=3D%s", prop->name, str); @@ -1538,11 +1538,11 @@ int net_init_clients(void) QTAILQ_INIT(&net_clients); =20 if (qemu_opts_foreach(qemu_find_opts("netdev"), - net_init_netdev, NULL, NULL)) { + net_init_netdev, NULL, IGNORE_ERRORS)) { return -1; } =20 - if (qemu_opts_foreach(net, net_init_client, NULL, NULL)) { + if (qemu_opts_foreach(net, net_init_client, NULL, IGNORE_ERRORS)) { return -1; } =20 diff --git a/numa.c b/numa.c index 2b5cb7b5c7..7886d31e09 100644 --- a/numa.c +++ b/numa.c @@ -217,7 +217,8 @@ static void parse_numa_node(MachineState *ms, NumaNodeO= ptions *node, } =20 object_ref(o); - numa_info[nodenr].node_mem =3D object_property_get_int(o, "size", = NULL); + numa_info[nodenr].node_mem =3D object_property_get_int(o, "size", + IGNORE_ERRORS= ); numa_info[nodenr].node_memdev =3D MEMORY_BACKEND(o); } numa_info[nodenr].present =3D true; @@ -429,7 +430,7 @@ void parse_numa_opts(MachineState *ms) int i; MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 - if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) { + if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, IGNORE_E= RRORS)) { exit(1); } =20 @@ -639,7 +640,7 @@ static int query_memdev(Object *obj, void *opaque) =20 m->value =3D g_malloc0(sizeof(*m->value)); =20 - m->value->id =3D object_property_get_str(obj, "id", NULL); + m->value->id =3D object_property_get_str(obj, "id", IGNORE_ERRORS); m->value->has_id =3D !!m->value->id; =20 m->value->size =3D object_property_get_int(obj, "size", diff --git a/qdev-monitor.c b/qdev-monitor.c index 3ecbf0bd25..37302305c5 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -549,12 +549,12 @@ void qdev_set_id(DeviceState *dev, const char *id) =20 if (dev->id) { object_property_add_child(qdev_get_peripheral(), dev->id, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); } else { static int anon_count; gchar *name =3D g_strdup_printf("device[%d]", anon_count++); object_property_add_child(qdev_get_peripheral_anon(), name, - OBJECT(dev), NULL); + OBJECT(dev), IGNORE_ERRORS); g_free(name); } } @@ -651,7 +651,7 @@ static void qdev_print_props(Monitor *mon, DeviceState = *dev, Property *props, Error *err =3D NULL; char *value; char *legacy_name =3D g_strdup_printf("legacy-%s", props->name); - if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { + if (object_property_get_type(OBJECT(dev), legacy_name, IGNORE_ERRO= RS)) { value =3D object_property_get_str(OBJECT(dev), legacy_name, &e= rr); } else { value =3D object_property_print(OBJECT(dev), props->name, true= , &err); diff --git a/qemu-img.c b/qemu-img.c index 0ad698d7f1..d0ab3af44b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -537,7 +537,7 @@ static int img_create(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { goto fail; } =20 @@ -787,7 +787,7 @@ static int img_check(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -990,7 +990,7 @@ static int img_commit(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -1337,7 +1337,7 @@ static int img_compare(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { ret =3D 2; goto out4; } @@ -2109,7 +2109,7 @@ static int img_convert(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { goto fail_getopt; } =20 @@ -2626,7 +2626,7 @@ static int img_info(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -2845,7 +2845,7 @@ static int img_map(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -2998,7 +2998,7 @@ static int img_snapshot(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -3158,7 +3158,7 @@ static int img_rebase(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -3512,7 +3512,7 @@ static int img_resize(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { return 1; } =20 @@ -3668,7 +3668,7 @@ static int img_amend(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { ret =3D -1; goto out_no_progress; } @@ -4305,7 +4305,7 @@ static int img_dd(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { ret =3D -1; goto out; } diff --git a/qemu-io.c b/qemu-io.c index 8e38b288b7..2a98cd0d1f 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -583,7 +583,7 @@ int main(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { exit(1); } =20 diff --git a/qemu-nbd.c b/qemu-nbd.c index 651f85ecc1..6ff0b0c070 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -351,7 +351,7 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOConditio= n cond, gpointer opaque) QIOChannelSocket *cioc; =20 cioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), - NULL); + IGNORE_ERRORS); if (!cioc) { return TRUE; } @@ -780,7 +780,7 @@ int main(int argc, char **argv) =20 if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, NULL)) { + NULL, IGNORE_ERRORS)) { exit(EXIT_FAILURE); } =20 diff --git a/qga/commands-posix.c b/qga/commands-posix.c index d8e412275e..220a50ad7c 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1273,7 +1273,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mount= points, =20 error: free_fs_mount_list(&mounts); - qmp_guest_fsfreeze_thaw(NULL); + qmp_guest_fsfreeze_thaw(IGNORE_ERRORS); return 0; } =20 diff --git a/qga/main.c b/qga/main.c index cc58d2b53d..00b064d1e0 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1386,7 +1386,7 @@ int main(int argc, char **argv) config->method =3D NULL; config->channel_path =3D NULL; =20 - addr =3D socket_local_address(FIRST_SOCKET_ACTIVATION_FD, NULL); + addr =3D socket_local_address(FIRST_SOCKET_ACTIVATION_FD, IGNORE_E= RRORS); if (addr) { if (addr->type =3D=3D SOCKET_ADDRESS_TYPE_UNIX) { config->method =3D g_strdup("unix-listen"); diff --git a/qobject/json-parser.c b/qobject/json-parser.c index c18e48ab94..506514100c 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -553,7 +553,7 @@ static QObject *parse_value(JSONParserContext *ctxt, va= _list *ap) =20 QObject *json_parser_parse(GQueue *tokens, va_list *ap) { - return json_parser_parse_err(tokens, ap, NULL); + return json_parser_parse_err(tokens, ap, IGNORE_ERRORS); } =20 QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp) diff --git a/qom/container.c b/qom/container.c index 2dbabd15ab..6cf53d9be7 100644 --- a/qom/container.c +++ b/qom/container.c @@ -40,7 +40,7 @@ Object *container_get(Object *root, const char *path) child =3D object_resolve_path_component(obj, parts[i]); if (!child) { child =3D object_new("container"); - object_property_add_child(obj, parts[i], child, NULL); + object_property_add_child(obj, parts[i], child, IGNORE_ERRORS); object_unref(child); } } diff --git a/qom/object.c b/qom/object.c index eb4bc924ff..8b2f2ef8ac 100644 --- a/qom/object.c +++ b/qom/object.c @@ -444,7 +444,7 @@ static void object_property_del_child(Object *obj, Obje= ct *child, Error **errp) void object_unparent(Object *obj) { if (obj->parent) { - object_property_del_child(obj->parent, obj, NULL); + object_property_del_child(obj->parent, obj, IGNORE_ERRORS); } } =20 @@ -924,7 +924,7 @@ object_property_add(Object *obj, const char *name, cons= t char *type, char *full_name =3D g_strdup_printf("%s[%d]", name_no_array, i= ); =20 ret =3D object_property_add(obj, full_name, type, get, set, - release, opaque, NULL); + release, opaque, IGNORE_ERRORS); g_free(full_name); if (ret) { break; @@ -934,7 +934,7 @@ object_property_add(Object *obj, const char *name, cons= t char *type, return ret; } =20 - if (object_property_find(obj, name, NULL) !=3D NULL) { + if (object_property_find(obj, name, IGNORE_ERRORS) !=3D NULL) { error_setg(errp, "attempt to add duplicate property '%s'" " to object (type '%s')", name, object_get_typename(obj)); @@ -967,7 +967,7 @@ object_class_property_add(ObjectClass *klass, { ObjectProperty *prop; =20 - if (object_class_property_find(klass, name, NULL) !=3D NULL) { + if (object_class_property_find(klass, name, IGNORE_ERRORS) !=3D NULL) { error_setg(errp, "attempt to add duplicate property '%s'" " to object (type '%s')", name, object_class_get_name(klass)); @@ -995,7 +995,7 @@ ObjectProperty *object_property_find(Object *obj, const= char *name, ObjectProperty *prop; ObjectClass *klass =3D object_get_class(obj); =20 - prop =3D object_class_property_find(klass, name, NULL); + prop =3D object_class_property_find(klass, name, IGNORE_ERRORS); if (prop) { return prop; } @@ -1037,7 +1037,7 @@ ObjectProperty *object_class_property_find(ObjectClas= s *klass, const char *name, =20 parent_klass =3D object_class_get_parent(klass); if (parent_klass) { - prop =3D object_class_property_find(parent_klass, name, NULL); + prop =3D object_class_property_find(parent_klass, name, IGNORE_ERR= ORS); if (prop) { return prop; } @@ -1449,7 +1449,7 @@ static Object *object_resolve_link(Object *obj, const= char *name, Object *target; =20 /* Go from link to FOO. */ - type =3D object_property_get_type(obj, name, NULL); + type =3D object_property_get_type(obj, name, IGNORE_ERRORS); target_type =3D g_strndup(&type[5], strlen(type) - 6); target =3D object_resolve_path_type(path, target_type, &ambiguous); =20 @@ -1627,7 +1627,7 @@ gchar *object_get_canonical_path(Object *obj) =20 Object *object_resolve_path_component(Object *parent, const gchar *part) { - ObjectProperty *prop =3D object_property_find(parent, part, NULL); + ObjectProperty *prop =3D object_property_find(parent, part, IGNORE_ERR= ORS); if (prop =3D=3D NULL) { return NULL; } @@ -2301,7 +2301,7 @@ void object_class_property_set_description(ObjectClas= s *klass, =20 static void object_instance_init(Object *obj) { - object_property_add_str(obj, "type", qdev_get_type, NULL, NULL); + object_property_add_str(obj, "type", qdev_get_type, NULL, IGNORE_ERROR= S); } =20 static void register_types(void) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ff27e0669e..e8f0fa9b8d 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -63,7 +63,7 @@ Object *user_creatable_add_type(const char *type, const c= har *id, =20 assert(qdict); obj =3D object_new(type); - if (object_property_find(obj, "id", NULL)) { + if (object_property_find(obj, "id", IGNORE_ERRORS)) { object_property_set_str(obj, id, "id", &local_err); if (local_err) { goto out; diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 8186c9d379..a863a1bf4d 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -170,7 +170,7 @@ AlphaCPU *cpu_alpha_init(const char *cpu_model) } cpu =3D ALPHA_CPU(object_new(object_class_get_name(cpu_class))); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 670c07ab6e..7d6055bb63 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -277,11 +277,11 @@ static void aarch64_cpu_set_aarch64(Object *obj, bool= value, Error **errp) static void aarch64_cpu_initfn(Object *obj) { object_property_add_bool(obj, "aarch64", aarch64_cpu_get_aarch64, - aarch64_cpu_set_aarch64, NULL); + aarch64_cpu_set_aarch64, IGNORE_ERRORS); object_property_set_description(obj, "aarch64", "Set on/off to enable/disable aarch64 " "execution state ", - NULL); + IGNORE_ERRORS); } =20 static void aarch64_cpu_finalizefn(Object *obj) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 30299e990d..6a05445e0e 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -118,7 +118,7 @@ HPPACPU *cpu_hppa_init(const char *cpu_model) =20 cpu =3D HPPA_CPU(object_new(TYPE_HPPA_CPU)); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b2b1d20cee..ae7abdade5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3768,7 +3768,7 @@ static void x86_cpu_register_bit_prop(X86CPU *cpu, ObjectProperty *op; uint32_t mask =3D (1UL << bitnr); =20 - op =3D object_property_find(OBJECT(cpu), prop_name, NULL); + op =3D object_property_find(OBJECT(cpu), prop_name, IGNORE_ERRORS); if (op) { fp =3D op->opaque; assert(fp->w =3D=3D w); @@ -3862,31 +3862,36 @@ static void x86_cpu_initfn(Object *obj) =20 object_property_add(obj, "family", "int", x86_cpuid_version_get_family, - x86_cpuid_version_set_family, NULL, NULL, NULL); + x86_cpuid_version_set_family, NULL, NULL, + IGNORE_ERRORS); object_property_add(obj, "model", "int", x86_cpuid_version_get_model, - x86_cpuid_version_set_model, NULL, NULL, NULL); + x86_cpuid_version_set_model, NULL, NULL, + IGNORE_ERRORS); object_property_add(obj, "stepping", "int", x86_cpuid_version_get_stepping, - x86_cpuid_version_set_stepping, NULL, NULL, NULL); + x86_cpuid_version_set_stepping, NULL, NULL, + IGNORE_ERRORS); object_property_add_str(obj, "vendor", x86_cpuid_get_vendor, - x86_cpuid_set_vendor, NULL); + x86_cpuid_set_vendor, IGNORE_ERRORS); object_property_add_str(obj, "model-id", x86_cpuid_get_model_id, - x86_cpuid_set_model_id, NULL); + x86_cpuid_set_model_id, IGNORE_ERRORS); object_property_add(obj, "tsc-frequency", "int", x86_cpuid_get_tsc_freq, - x86_cpuid_set_tsc_freq, NULL, NULL, NULL); + x86_cpuid_set_tsc_freq, NULL, NULL, IGNORE_ERRORS); object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, - NULL, NULL, (void *)env->features, NULL); + NULL, NULL, (void *)env->features, IGNORE_ERRORS); object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, - NULL, NULL, (void *)cpu->filtered_features, NULL); + NULL, NULL, (void *)cpu->filtered_features, + IGNORE_ERRORS); =20 object_property_add(obj, "crash-information", "GuestPanicInformation", - x86_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL= ); + x86_cpu_get_crash_info_qom, NULL, NULL, NULL, + IGNORE_ERRORS); =20 cpu->hyperv_spinlock_attempts =3D HYPERV_SPINLOCK_NEVER_RETRY; =20 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index ea1872cae5..c0a36e61b3 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -116,7 +116,7 @@ M68kCPU *cpu_m68k_init(const char *cpu_model) =20 register_m68k_insns(env); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 83f6d96a71..9174818c0a 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1821,7 +1821,7 @@ MicroBlazeCPU *cpu_mb_init(const char *cpu_model) =20 cpu =3D MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/mips/translate.c b/target/mips/translate.c index 7dedfd6632..b752c0faed 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -20212,7 +20212,7 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) fpu_init(env, def); mvp_init(env, def); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index d56bb7245a..7015cdefe6 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -87,7 +87,7 @@ Nios2CPU *cpu_nios2_init(const char *cpu_model) { Nios2CPU *cpu =3D NIOS2_CPU(object_new(TYPE_NIOS2_CPU)); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 670edde79e..bfa6b47b51 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -482,7 +482,8 @@ static void kvm_fixup_page_sizes(PowerPCCPU *cpu) bool kvmppc_is_mem_backend_page_size_ok(char *obj_path) { Object *mem_obj =3D object_resolve_path(obj_path, NULL); - char *mempath =3D object_property_get_str(mem_obj, "mem-path", NULL); + char *mempath =3D object_property_get_str(mem_obj, "mem-path", + IGNORE_ERRORS); long pagesize; =20 if (mempath) { diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index accef03234..75e5966749 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -287,7 +287,7 @@ static void s390_cpu_initfn(Object *obj) cs->halted =3D 1; cs->exception_index =3D EXCP_HLT; object_property_add(OBJECT(cpu), "id", "int64_t", s390x_cpu_get_id, - s390x_cpu_set_id, NULL, NULL, NULL); + s390x_cpu_set_id, NULL, NULL, IGNORE_ERRORS); s390_cpu_model_register_props(obj); #if !defined(CONFIG_USER_ONLY) qemu_get_timedate(&tm, 0); diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index fc3cb25cc3..5206a10134 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -899,14 +899,17 @@ void s390_cpu_model_register_props(Object *obj) for (feat =3D 0; feat < S390_FEAT_MAX; feat++) { const S390FeatDef *def =3D s390_feat_def(feat); object_property_add(obj, def->name, "bool", get_feature, - set_feature, NULL, (void *) feat, NULL); - object_property_set_description(obj, def->name, def->desc , NULL); + set_feature, NULL, (void *) feat, IGNORE_ERROR= S); + object_property_set_description(obj, def->name, def->desc , + IGNORE_ERRORS); } for (group =3D 0; group < S390_FEAT_GROUP_MAX; group++) { const S390FeatGroupDef *def =3D s390_feat_group_def(group); object_property_add(obj, def->name, "bool", get_feature_group, - set_feature_group, NULL, (void *) group, NULL); - object_property_set_description(obj, def->name, def->desc , NULL); + set_feature_group, NULL, (void *) group, + IGNORE_ERRORS); + object_property_set_description(obj, def->name, def->desc , + IGNORE_ERRORS); } } =20 @@ -990,11 +993,11 @@ static char *get_description(Object *obj, Error **err= p) void s390_cpu_model_class_register_props(ObjectClass *oc) { object_class_property_add_bool(oc, "migration-safe", get_is_migration_= safe, - NULL, NULL); + NULL, IGNORE_ERRORS); object_class_property_add_bool(oc, "static", get_is_static, - NULL, NULL); + NULL, IGNORE_ERRORS); object_class_property_add_str(oc, "description", get_description, NULL, - NULL); + IGNORE_ERRORS); } =20 #ifdef CONFIG_KVM diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 3383c49039..0979c1fc27 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -238,7 +238,7 @@ static void kvm_s390_init_aes_kw(void) uint64_t attr =3D KVM_S390_VM_CRYPTO_DISABLE_AES_KW; =20 if (object_property_get_bool(OBJECT(qdev_get_machine()), "aes-key-wrap= ", - NULL)) { + IGNORE_ERRORS)) { attr =3D KVM_S390_VM_CRYPTO_ENABLE_AES_KW; } =20 @@ -252,7 +252,7 @@ static void kvm_s390_init_dea_kw(void) uint64_t attr =3D KVM_S390_VM_CRYPTO_DISABLE_DEA_KW; =20 if (object_property_get_bool(OBJECT(qdev_get_machine()), "dea-key-wrap= ", - NULL)) { + IGNORE_ERRORS)) { attr =3D KVM_S390_VM_CRYPTO_ENABLE_DEA_KW; } =20 diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index d606eb53f4..4d6f0c4f66 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -157,7 +157,7 @@ SPARCCPU *cpu_sparc_init(const char *cpu_model) return NULL; } =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c index 45326398cc..f8c479e1d7 100644 --- a/target/tilegx/cpu.c +++ b/target/tilegx/cpu.c @@ -58,7 +58,7 @@ TileGXCPU *cpu_tilegx_init(const char *cpu_model) =20 cpu =3D TILEGX_CPU(object_new(TYPE_TILEGX_CPU)); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 263990d621..ff7a3df05b 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -130,7 +130,7 @@ XtensaCPU *cpu_xtensa_init(const char *cpu_model) =20 xtensa_irq_init(env); =20 - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); + object_property_set_bool(OBJECT(cpu), true, "realized", IGNORE_ERRORS); =20 return cpu; } diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 8e432e9ab6..6145fcbab6 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -126,7 +126,7 @@ static void dummy_init(Object *obj) object_property_add_bool(obj, "bv", dummy_get_bv, dummy_set_bv, - NULL); + IGNORE_ERRORS); } =20 =20 @@ -135,17 +135,17 @@ static void dummy_class_init(ObjectClass *cls, void *= data) object_class_property_add_bool(cls, "bv", dummy_get_bv, dummy_set_bv, - NULL); + IGNORE_ERRORS); object_class_property_add_str(cls, "sv", dummy_get_sv, dummy_set_sv, - NULL); + IGNORE_ERRORS); object_class_property_add_enum(cls, "av", "DummyAnimal", dummy_animal_map, dummy_get_av, dummy_set_av, - NULL); + IGNORE_ERRORS); } =20 =20 @@ -250,13 +250,14 @@ static void dummy_dev_init(Object *obj) DummyBus *bus =3D DUMMY_BUS(object_new(TYPE_DUMMY_BUS)); DummyBackend *backend =3D DUMMY_BACKEND(object_new(TYPE_DUMMY_BACKEND)= ); =20 - object_property_add_child(obj, "bus", OBJECT(bus), NULL); + object_property_add_child(obj, "bus", OBJECT(bus), IGNORE_ERRORS); dev->bus =3D bus; - object_property_add_child(OBJECT(bus), "backend", OBJECT(backend), NUL= L); + object_property_add_child(OBJECT(bus), "backend", OBJECT(backend), + IGNORE_ERRORS); bus->backend =3D backend; =20 object_property_add_link(obj, "backend", TYPE_DUMMY_BACKEND, - (Object **)&bus->backend, NULL, 0, NULL); + (Object **)&bus->backend, NULL, 0, IGNORE_ERR= ORS); } =20 static void dummy_dev_unparent(Object *obj) @@ -285,7 +286,7 @@ static void dummy_bus_init(Object *obj) static void dummy_bus_unparent(Object *obj) { DummyBus *bus =3D DUMMY_BUS(obj); - object_property_del(obj->parent, "backend", NULL); + object_property_del(obj->parent, "backend", IGNORE_ERRORS); object_unparent(OBJECT(bus->backend)); } =20 diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c index 05e5579cf8..ccab10bfa9 100644 --- a/tests/io-channel-helpers.c +++ b/tests/io-channel-helpers.c @@ -80,7 +80,7 @@ static gpointer test_io_thread_writer(gpointer opaque) size_t niov =3D data->niov; struct iovec old =3D { 0 }; =20 - qio_channel_set_blocking(data->src, data->blocking, NULL); + qio_channel_set_blocking(data->src, data->blocking, IGNORE_ERRORS); =20 while (niov) { ssize_t ret; @@ -121,7 +121,7 @@ static gpointer test_io_thread_reader(gpointer opaque) size_t niov =3D data->niov; struct iovec old =3D { 0 }; =20 - qio_channel_set_blocking(data->dst, data->blocking, NULL); + qio_channel_set_blocking(data->dst, data->blocking, IGNORE_ERRORS); =20 while (niov) { ssize_t ret; diff --git a/tests/test-char.c b/tests/test-char.c index dfe856cb85..5a9804bd92 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -245,7 +245,7 @@ static gboolean char_socket_test_idle(gpointer user_dat= a) { SocketIdleData *data =3D user_data; =20 - if (object_property_get_bool(OBJECT(data->chr), "connected", NULL) + if (object_property_get_bool(OBJECT(data->chr), "connected", IGNORE_ER= RORS) =3D=3D data->conn_expected) { quit =3D true; return FALSE; diff --git a/tests/test-crypto-hash.c b/tests/test-crypto-hash.c index f58eeb4409..7a163e5714 100644 --- a/tests/test-crypto-hash.c +++ b/tests/test-crypto-hash.c @@ -177,7 +177,7 @@ static void test_hash_iov(void) iov, 3, &result, &resultlen, - NULL); + IGNORE_ERRORS); g_assert(ret =3D=3D 0); g_assert(resultlen =3D=3D expected_lens[i]); for (j =3D 0; j < resultlen; j++) { diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c index d357cd2a8e..25c9487656 100644 --- a/tests/test-io-channel-socket.c +++ b/tests/test-io-channel-socket.c @@ -160,7 +160,7 @@ static void test_io_channel_complete(QIOTask *task, gpointer opaque) { struct TestIOChannelData *data =3D opaque; - data->err =3D qio_task_propagate_error(task, NULL); + data->err =3D qio_task_propagate_error(task, IGNORE_ERRORS); g_main_loop_quit(data->loop); } =20 diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index b55f5c81ff..fae2906060 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -60,7 +60,7 @@ static void test_tls_handshake_done(QIOTask *task, struct QIOChannelTLSHandshakeData *data =3D opaque; =20 data->finished =3D true; - data->failed =3D qio_task_propagate_error(task, NULL); + data->failed =3D qio_task_propagate_error(task, IGNORE_ERRORS); } =20 =20 @@ -187,8 +187,10 @@ static void test_io_channel_tls(const void *opaque) * thread, so we need these non-blocking to avoid deadlock * of ourselves */ - qio_channel_set_blocking(QIO_CHANNEL(clientChanSock), false, NULL); - qio_channel_set_blocking(QIO_CHANNEL(serverChanSock), false, NULL); + qio_channel_set_blocking(QIO_CHANNEL(clientChanSock), false, + IGNORE_ERRORS); + qio_channel_set_blocking(QIO_CHANNEL(serverChanSock), false, + IGNORE_ERRORS); =20 /* Now the real part of the test, setup the sessions */ clientChanTLS =3D qio_channel_tls_new_client( diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index d5bfcac37d..91ea932869 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -135,9 +135,9 @@ static void prop2_accessor(Object *obj, Visitor *v, con= st char *name, static void dynamic_instance_init(Object *obj) { object_property_add(obj, "prop1", "uint32", prop1_accessor, prop1_acce= ssor, - NULL, NULL, NULL); + NULL, NULL, IGNORE_ERRORS); object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_acce= ssor, - NULL, NULL, NULL); + NULL, NULL, IGNORE_ERRORS); } =20 static void dynamic_class_init(ObjectClass *oc, void *data) diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index cc1bb1afdf..5a596a6e7b 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -335,7 +335,7 @@ static void test_qemu_opt_unset(void) int ret; =20 /* dynamically initialized (parsed) opts */ - opts =3D qemu_opts_parse(&opts_list_03, "key=3Dvalue", false, NULL); + opts =3D qemu_opts_parse(&opts_list_03, "key=3Dvalue", false, IGNORE_E= RRORS); g_assert(opts !=3D NULL); =20 /* check default/parsed value */ @@ -445,7 +445,7 @@ static size_t opts_count(QemuOpts *opts) { size_t n =3D 0; =20 - qemu_opt_foreach(opts, opts_count_iter, &n, NULL); + qemu_opt_foreach(opts, opts_count_iter, &n, IGNORE_ERRORS); return n; } =20 diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-vi= sitor.c index 79313a7f7a..f44bfee8aa 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -318,25 +318,25 @@ static void test_visitor_in_fuzz(TestInputVisitorData= *data, } =20 v =3D visitor_input_test_init(data, buf); - visit_type_int(v, NULL, &ires, NULL); + visit_type_int(v, NULL, &ires, IGNORE_ERRORS); =20 v =3D visitor_input_test_init(data, buf); - visit_type_intList(v, NULL, &ilres, NULL); + visit_type_intList(v, NULL, &ilres, IGNORE_ERRORS); qapi_free_intList(ilres); =20 v =3D visitor_input_test_init(data, buf); - visit_type_bool(v, NULL, &bres, NULL); + visit_type_bool(v, NULL, &bres, IGNORE_ERRORS); =20 v =3D visitor_input_test_init(data, buf); - visit_type_number(v, NULL, &nres, NULL); + visit_type_number(v, NULL, &nres, IGNORE_ERRORS); =20 v =3D visitor_input_test_init(data, buf); sres =3D NULL; - visit_type_str(v, NULL, &sres, NULL); + visit_type_str(v, NULL, &sres, IGNORE_ERRORS); g_free(sres); =20 v =3D visitor_input_test_init(data, buf); - visit_type_EnumOne(v, NULL, &eres, NULL); + visit_type_EnumOne(v, NULL, &eres, IGNORE_ERRORS); } } =20 diff --git a/tpm.c b/tpm.c index 9a7c7114d3..d89b1e6cd6 100644 --- a/tpm.c +++ b/tpm.c @@ -208,7 +208,7 @@ void tpm_cleanup(void) int tpm_init(void) { if (qemu_opts_foreach(qemu_find_opts("tpmdev"), - tpm_init_tpmdev, NULL, NULL)) { + tpm_init_tpmdev, NULL, IGNORE_ERRORS)) { return -1; } =20 diff --git a/ui/gtk.c b/ui/gtk.c index 18c325f8d4..49921fa5a5 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -738,7 +738,7 @@ static gboolean gd_window_close(GtkWidget *widget, GdkE= vent *event, } unregister_displaychangelistener(&s->vc[i].gfx.dcl); } - qmp_quit(NULL); + qmp_quit(IGNORE_ERRORS); return FALSE; } =20 @@ -1175,25 +1175,25 @@ static void gd_menu_pause(GtkMenuItem *item, void *= opaque) return; } if (runstate_is_running()) { - qmp_stop(NULL); + qmp_stop(IGNORE_ERRORS); } else { - qmp_cont(NULL); + qmp_cont(IGNORE_ERRORS); } } =20 static void gd_menu_reset(GtkMenuItem *item, void *opaque) { - qmp_system_reset(NULL); + qmp_system_reset(IGNORE_ERRORS); } =20 static void gd_menu_powerdown(GtkMenuItem *item, void *opaque) { - qmp_system_powerdown(NULL); + qmp_system_powerdown(IGNORE_ERRORS); } =20 static void gd_menu_quit(GtkMenuItem *item, void *opaque) { - qmp_quit(NULL); + qmp_quit(IGNORE_ERRORS); } =20 static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) diff --git a/ui/input-linux.c b/ui/input-linux.c index 49d52a69cc..6783ac1e5d 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -527,13 +527,13 @@ static void input_linux_instance_init(Object *obj) { object_property_add_str(obj, "evdev", input_linux_get_evdev, - input_linux_set_evdev, NULL); + input_linux_set_evdev, IGNORE_ERRORS); object_property_add_bool(obj, "grab_all", input_linux_get_grab_all, - input_linux_set_grab_all, NULL); + input_linux_set_grab_all, IGNORE_ERRORS); object_property_add_bool(obj, "repeat", input_linux_get_repeat, - input_linux_set_repeat, NULL); + input_linux_set_repeat, IGNORE_ERRORS); } =20 static void input_linux_class_init(ObjectClass *oc, void *data) diff --git a/ui/spice-core.c b/ui/spice-core.c index 801e5c864a..88d6d16faf 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -803,7 +803,7 @@ void qemu_spice_init(void) spice_server_set_playback_compression (spice_server, qemu_opt_get_bool(opts, "playback-compression", 1)); =20 - qemu_opt_foreach(opts, add_channel, &tls_port, NULL); + qemu_opt_foreach(opts, add_channel, &tls_port, IGNORE_ERRORS); =20 spice_server_set_name(spice_server, qemu_name); spice_server_set_uuid(spice_server, (unsigned char *)&qemu_uuid); diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index 3ade4a4918..4b6f0e5d5a 100644 --- a/ui/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c @@ -530,12 +530,12 @@ void start_auth_sasl(VncState *vs) VNC_DEBUG("Initialize SASL auth %p\n", vs->ioc); =20 /* Get local & remote client addresses in form IPADDR;PORT */ - localAddr =3D vnc_socket_ip_addr_string(vs->sioc, true, NULL); + localAddr =3D vnc_socket_ip_addr_string(vs->sioc, true, IGNORE_ERRORS); if (!localAddr) { goto authabort; } =20 - remoteAddr =3D vnc_socket_ip_addr_string(vs->sioc, false, NULL); + remoteAddr =3D vnc_socket_ip_addr_string(vs->sioc, false, IGNORE_ERROR= S); if (!remoteAddr) { g_free(localAddr); goto authabort; diff --git a/ui/vnc.c b/ui/vnc.c index cb55554210..7acd3fe225 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -568,7 +568,7 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) &info->vencrypt, &info->has_vencrypt); if (vd->dcl.con) { dev =3D DEVICE(object_property_get_link(OBJECT(vd->dcl.con), - "device", NULL)); + "device", IGNORE_ERRORS)= ); info->has_display =3D true; info->display =3D g_strdup(dev->id); } @@ -1123,7 +1123,7 @@ static void vnc_disconnect_start(VncState *vs) if (vs->ioc_tag) { g_source_remove(vs->ioc_tag); } - qio_channel_close(vs->ioc, NULL); + qio_channel_close(vs->ioc, IGNORE_ERRORS); vs->disconnecting =3D TRUE; } =20 @@ -2937,7 +2937,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSoc= ket *sioc, =20 VNC_DEBUG("New client on socket %p\n", vs->sioc); update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_BASE); - qio_channel_set_blocking(vs->ioc, false, NULL); + qio_channel_set_blocking(vs->ioc, false, IGNORE_ERRORS); if (websocket) { vs->websocket =3D 1; if (vd->tlscreds) { @@ -4022,7 +4022,7 @@ void vnc_display_add_client(const char *id, int csock= , bool skipauth) return; } =20 - sioc =3D qio_channel_socket_new_fd(csock, NULL); + sioc =3D qio_channel_socket_new_fd(csock, IGNORE_ERRORS); if (sioc) { qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-server"); vnc_connect(vd, sioc, skipauth, false); diff --git a/util/qemu-config.c b/util/qemu-config.c index c74f15c42d..be9ffb5872 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -368,7 +368,7 @@ static int config_write_opts(void *opaque, QemuOpts *op= ts, Error **errp) } else { fprintf(data->fp, "[%s]\n", data->list->name); } - qemu_opt_foreach(opts, config_write_opt, data, NULL); + qemu_opt_foreach(opts, config_write_opt, data, IGNORE_ERRORS); fprintf(data->fp, "\n"); return 0; } @@ -382,7 +382,7 @@ void qemu_config_write(FILE *fp) fprintf(fp, "# qemu config file\n\n"); for (i =3D 0; lists[i] !=3D NULL; i++) { data.list =3D lists[i]; - qemu_opts_foreach(data.list, config_write_opts, &data, NULL); + qemu_opts_foreach(data.list, config_write_opts, &data, IGNORE_ERRO= RS); } } =20 @@ -413,7 +413,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) error_report_err(local_err); goto out; } - opts =3D qemu_opts_create(list, id, 1, NULL); + opts =3D qemu_opts_create(list, id, 1, IGNORE_ERRORS); continue; } if (sscanf(line, "[%63[^]]]", group) =3D=3D 1) { diff --git a/util/qemu-option.c b/util/qemu-option.c index 5977bfc3e9..a7e62593b1 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -929,7 +929,7 @@ void qemu_opts_set_defaults(QemuOptsList *list, const c= har *params, { QemuOpts *opts; =20 - opts =3D opts_parse(list, params, permit_abbrev, true, NULL); + opts =3D opts_parse(list, params, permit_abbrev, true, IGNORE_ERRORS); assert(opts); } =20 diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 82290cb687..d2ea5377dc 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -306,7 +306,8 @@ static void wait_for_connect(void *opaque) if (s->current_addr) { while (s->current_addr->ai_next !=3D NULL && s->fd < 0) { s->current_addr =3D s->current_addr->ai_next; - s->fd =3D inet_connect_addr(s->current_addr, &in_progress, s, = NULL); + s->fd =3D inet_connect_addr(s->current_addr, &in_progress, s, + IGNORE_ERRORS); if (s->fd < 0) { error_free(err); err =3D NULL; diff --git a/vl.c b/vl.c index be4dcf25ba..a7ad0cbd0c 100644 --- a/vl.c +++ b/vl.c @@ -2566,7 +2566,7 @@ static int sclp_parse(const char *devname) =20 assert(arch_type =3D=3D QEMU_ARCH_S390X); =20 - dev_opts =3D qemu_opts_create(device, NULL, 0, NULL); + dev_opts =3D qemu_opts_create(device, NULL, 0, IGNORE_ERRORS); qemu_opt_set(dev_opts, "driver", "sclpconsole", &error_abort); =20 snprintf(label, sizeof(label), "sclpcon%d", index); @@ -2589,7 +2589,8 @@ static int debugcon_parse(const char *devname) if (!qemu_chr_new("debugcon", devname)) { exit(1); } - opts =3D qemu_opts_create(qemu_find_opts("device"), "debugcon", 1, NUL= L); + opts =3D qemu_opts_create(qemu_find_opts("device"), "debugcon", 1, + IGNORE_ERRORS); if (!opts) { error_report("already have a debugcon device"); exit(1); --=20 2.11.0.259.g40922b1