The following changes since commit c8eaf81fd22638691c5bdcc7d723d31fbb80ff6f:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2020-07-07 17:37:44 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-error-2020-07-07

for you to fetch changes up to 01ccbabbdbc852456f333959c5bed37e4f961633:

  xen: Use ERRP_GUARD() (2020-07-07 23:02:12 +0200)

----------------------------------------------------------------
Error reporting patches patches for 2020-07-07

* Improve documentation
* Codify rules for less clumsy error handling
* Convert a substantial amount of code to adhere to them
* ERRP_GUARD() infrastructure to avoid more clumsiness
* First batch of conversions to it

----------------------------------------------------------------
Markus Armbruster (45):
      error: Fix examples in error.h's big comment
      error: Improve error.h's big comment
      error: Document Error API usage rules
      qdev: Use returned bool to check for qdev_realize() etc. failure
      macio: Tidy up error handling in macio_newworld_realize()
      virtio-crypto-pci: Tidy up virtio_crypto_pci_realize()
      qemu-option: Check return value instead of @err where convenient
      qemu-option: Make uses of find_desc_by_name() more similar
      qemu-option: Factor out helper find_default_by_name()
      qemu-option: Simplify around find_default_by_name()
      qemu-option: Factor out helper opt_create()
      qemu-option: Replace opt_set() by cleaner opt_validate()
      qemu-option: Make functions taking Error ** return bool, not void
      qemu-option: Use returned bool to check for failure
      block: Avoid error accumulation in bdrv_img_create()
      hmp: Eliminate a variable in hmp_migrate_set_parameter()
      qapi: Make visitor functions taking Error ** return bool, not void
      qapi: Use returned bool to check for failure, Coccinelle part
      qapi: Use returned bool to check for failure, manual part
      s390x/pci: Fix harmless mistake in zpci's property fid's setter
      qom: Use error_reportf_err() instead of g_printerr() in examples
      qom: Rename qdev_get_type() to object_get_type()
      qom: Crash more nicely on object_property_get_link() failure
      qom: Don't handle impossible object_property_get_link() failure
      qom: Use return values to check for error where that's simpler
      qom: Put name parameter before value / visitor parameter
      qom: Make functions taking Error ** return bool, not void
      qom: Use returned bool to check for failure, Coccinelle part
      qom: Use returned bool to check for failure, manual part
      qom: Make functions taking Error ** return bool, not 0/-1
      qdev: Make functions taking Error ** return bool, not void
      qdev: Use returned bool to check for failure, Coccinelle part
      error: Avoid unnecessary error_propagate() after error_setg()
      error: Eliminate error_propagate() with Coccinelle, part 1
      error: Eliminate error_propagate() with Coccinelle, part 2
      error: Eliminate error_propagate() manually
      error: Reduce unnecessary error propagation
      block/parallels: Simplify parallels_open() after previous commit
      qapi: Smooth another visitor error checking pattern
      qapi: Smooth visitor error checking in generated code
      qapi: Purge error_propagate() from QAPI core
      error: Avoid error_propagate() after migrate_add_blocker()
      qemu-img: Ignore Error objects where the return value suffices
      qdev: Ignore Error objects where the return value suffices
      hmp: Ignore Error objects where the return value suffices

Vladimir Sementsov-Ogievskiy (8):
      error: New macro ERRP_GUARD()
      scripts: Coccinelle script to use ERRP_GUARD()
      sd: Use ERRP_GUARD()
      pflash: Use ERRP_GUARD()
      fw_cfg: Use ERRP_GUARD()
      virtio-9p: Use ERRP_GUARD()
      nbd: Use ERRP_GUARD()
      xen: Use ERRP_GUARD()

 docs/devel/qapi-code-gen.txt             | 103 ++++------
 scripts/coccinelle/errp-guard.cocci      | 336 +++++++++++++++++++++++++++++++
 include/block/nbd.h                      |   1 +
 include/hw/audio/pcspk.h                 |   2 +-
 include/hw/qdev-properties.h             |   4 +-
 include/qapi/clone-visitor.h             |   8 +-
 include/qapi/error.h                     | 267 ++++++++++++++++++++----
 include/qapi/visitor-impl.h              |  26 +--
 include/qapi/visitor.h                   | 102 ++++++----
 include/qemu/option.h                    |  16 +-
 include/qom/object.h                     | 104 +++++-----
 include/qom/object_interfaces.h          |  12 +-
 include/qom/qom-qobject.h                |   9 +-
 accel/kvm/kvm-all.c                      |  55 +++--
 accel/tcg/tcg-all.c                      |   5 +-
 audio/audio_legacy.c                     |  15 +-
 backends/cryptodev-vhost-user.c          |   3 +-
 backends/cryptodev.c                     |  16 +-
 backends/hostmem-file.c                  |  22 +-
 backends/hostmem-memfd.c                 |  18 +-
 backends/hostmem.c                       |  33 ++-
 backends/rng.c                           |   2 +-
 backends/tpm/tpm_util.c                  |   5 +-
 block.c                                  |  21 +-
 block/blkdebug.c                         |   9 +-
 block/blklogwrites.c                     |   4 +-
 block/blkverify.c                        |   4 +-
 block/crypto.c                           |   5 +-
 block/curl.c                             |   5 +-
 block/file-posix.c                       |  16 +-
 block/file-win32.c                       |   8 +-
 block/gluster.c                          |  17 +-
 block/iscsi.c                            |   4 +-
 block/nbd.c                              |  17 +-
 block/nfs.c                              |   7 +-
 block/parallels.c                        |  29 +--
 block/qcow.c                             |  16 +-
 block/qcow2.c                            |  21 +-
 block/qed.c                              |  10 +-
 block/quorum.c                           |  19 +-
 block/raw-format.c                       |   5 +-
 block/rbd.c                              |   7 +-
 block/replication.c                      |  19 +-
 block/sheepdog.c                         |  16 +-
 block/ssh.c                              |  11 +-
 block/throttle-groups.c                  |  31 +--
 block/throttle.c                         |   5 +-
 block/vdi.c                              |  13 +-
 block/vhdx.c                             |  15 +-
 block/vmdk.c                             |  13 +-
 block/vpc.c                              |  19 +-
 block/vvfat.c                            |  10 +-
 block/vxhs.c                             |  15 +-
 blockdev.c                               |  40 ++--
 bootdevice.c                             |  13 +-
 chardev/char.c                           |   6 +-
 contrib/ivshmem-server/main.c            |   4 +-
 crypto/secret.c                          |   2 +-
 crypto/secret_keyring.c                  |   2 +-
 crypto/tlscredsanon.c                    |   2 +-
 crypto/tlscredspsk.c                     |   2 +-
 crypto/tlscredsx509.c                    |   2 +-
 dump/dump.c                              |   7 +-
 hw/9pfs/9p-local.c                       |  12 +-
 hw/9pfs/9p.c                             |   1 +
 hw/acpi/core.c                           |  19 +-
 hw/acpi/cpu_hotplug.c                    |   4 +-
 hw/acpi/ich9.c                           |   2 +-
 hw/acpi/piix4.c                          |   2 +-
 hw/arm/allwinner-a10.c                   |  27 +--
 hw/arm/armsse.c                          | 208 ++++++-------------
 hw/arm/armv7m.c                          |  47 ++---
 hw/arm/aspeed.c                          |  24 +--
 hw/arm/aspeed_ast2600.c                  | 124 ++++--------
 hw/arm/aspeed_soc.c                      |  85 +++-----
 hw/arm/bcm2835_peripherals.c             |  81 ++------
 hw/arm/bcm2836.c                         |  35 +---
 hw/arm/cubieboard.c                      |  14 +-
 hw/arm/digic.c                           |  18 +-
 hw/arm/digic_boards.c                    |   3 +-
 hw/arm/exynos4210.c                      |  13 +-
 hw/arm/fsl-imx25.c                       |  58 ++----
 hw/arm/fsl-imx31.c                       |  34 +---
 hw/arm/fsl-imx6.c                        |  85 +++-----
 hw/arm/fsl-imx6ul.c                      |  29 ++-
 hw/arm/fsl-imx7.c                        |  31 ++-
 hw/arm/highbank.c                        |  12 +-
 hw/arm/integratorcp.c                    |   2 +-
 hw/arm/mcimx6ul-evk.c                    |   4 +-
 hw/arm/microbit.c                        |   4 +-
 hw/arm/mps2-tz.c                         |  31 ++-
 hw/arm/mps2.c                            |  12 +-
 hw/arm/msf2-soc.c                        |  29 +--
 hw/arm/musca.c                           |  18 +-
 hw/arm/musicpal.c                        |   4 +-
 hw/arm/nrf51_soc.c                       |  36 +---
 hw/arm/orangepi.c                        |  13 +-
 hw/arm/raspi.c                           |   2 +-
 hw/arm/realview.c                        |   6 +-
 hw/arm/sbsa-ref.c                        |  16 +-
 hw/arm/stellaris.c                       |   4 +-
 hw/arm/stm32f205_soc.c                   |  37 +---
 hw/arm/stm32f405_soc.c                   |  48 ++---
 hw/arm/versatilepb.c                     |   4 +-
 hw/arm/vexpress.c                        |   8 +-
 hw/arm/virt.c                            |  44 ++--
 hw/arm/xilinx_zynq.c                     |   6 +-
 hw/arm/xlnx-versal-virt.c                |   8 +-
 hw/arm/xlnx-versal.c                     |  30 ++-
 hw/arm/xlnx-zcu102.c                     |   8 +-
 hw/arm/xlnx-zynqmp.c                     | 117 ++++-------
 hw/block/dataplane/xen-block.c           |  17 +-
 hw/block/fdc.c                           |  12 +-
 hw/block/pflash_cfi01.c                  |   7 +-
 hw/block/pflash_cfi02.c                  |   7 +-
 hw/block/xen-block.c                     | 124 +++++-------
 hw/char/serial-pci-multi.c               |   5 +-
 hw/char/serial-pci.c                     |   5 +-
 hw/char/serial.c                         |  10 +-
 hw/core/bus.c                            |  12 +-
 hw/core/cpu.c                            |   3 +-
 hw/core/machine.c                        |   5 +-
 hw/core/numa.c                           |  55 ++---
 hw/core/platform-bus.c                   |   6 +-
 hw/core/qdev-properties-system.c         |  32 +--
 hw/core/qdev-properties.c                |  95 +++------
 hw/core/qdev.c                           |  16 +-
 hw/cpu/a15mpcore.c                       |   5 +-
 hw/cpu/a9mpcore.c                        |  21 +-
 hw/cpu/arm11mpcore.c                     |  17 +-
 hw/cpu/core.c                            |  10 +-
 hw/cpu/realview_mpcore.c                 |   9 +-
 hw/display/bcm2835_fb.c                  |   8 +-
 hw/display/virtio-gpu-base.c             |   5 +-
 hw/display/virtio-gpu-pci.c              |  11 +-
 hw/display/virtio-vga.c                  |  10 +-
 hw/dma/bcm2835_dma.c                     |   9 +-
 hw/dma/sparc32_dma.c                     |   6 +-
 hw/dma/xilinx_axidma.c                   |   4 +-
 hw/gpio/aspeed_gpio.c                    |   5 +-
 hw/gpio/bcm2835_gpio.c                   |  15 +-
 hw/hyperv/vmbus.c                        |   5 +-
 hw/i386/pc.c                             |  48 ++---
 hw/i386/pc_piix.c                        |   4 +-
 hw/i386/pc_q35.c                         |  28 +--
 hw/i386/x86.c                            |   7 +-
 hw/ide/qdev.c                            |   7 +-
 hw/intc/apic_common.c                    |   5 +-
 hw/intc/arm_gic_kvm.c                    |   4 +-
 hw/intc/arm_gicv3_its_kvm.c              |   5 +-
 hw/intc/arm_gicv3_kvm.c                  |   4 +-
 hw/intc/armv7m_nvic.c                    |   9 +-
 hw/intc/nios2_iic.c                      |   8 +-
 hw/intc/pnv_xive.c                       |  17 +-
 hw/intc/realview_gic.c                   |   5 +-
 hw/intc/spapr_xive.c                     |  17 +-
 hw/intc/xics.c                           |   9 +-
 hw/intc/xics_kvm.c                       |   4 +-
 hw/intc/xive.c                           |  17 +-
 hw/isa/piix4.c                           |   5 +-
 hw/m68k/q800.c                           |   4 +-
 hw/mem/nvdimm.c                          |  30 +--
 hw/mem/pc-dimm.c                         |  18 +-
 hw/microblaze/petalogix_ml605_mmu.c      |  24 +--
 hw/microblaze/petalogix_s3adsp1800_mmu.c |   2 +-
 hw/microblaze/xlnx-zynqmp-pmu.c          |  39 ++--
 hw/mips/boston.c                         |   4 +-
 hw/mips/cps.c                            |  41 ++--
 hw/mips/jazz.c                           |   4 +-
 hw/mips/malta.c                          |   4 +-
 hw/misc/aspeed_sdmc.c                    |   8 +-
 hw/misc/bcm2835_mbox.c                   |   9 +-
 hw/misc/bcm2835_property.c               |  17 +-
 hw/misc/iotkit-sysctl.c                  |   2 +-
 hw/misc/ivshmem.c                        |   4 +-
 hw/misc/macio/cuda.c                     |   5 +-
 hw/misc/macio/macio.c                    |  35 ++--
 hw/misc/macio/pmu.c                      |   5 +-
 hw/misc/pca9552.c                        |   5 +-
 hw/misc/tmp105.c                         |   5 +-
 hw/misc/tmp421.c                         |   5 +-
 hw/net/ne2000-isa.c                      |   7 +-
 hw/net/virtio-net.c                      |   7 +-
 hw/net/xilinx_axienet.c                  |   4 +-
 hw/nvram/fw_cfg.c                        |  14 +-
 hw/pci-host/pnv_phb3.c                   |  33 ++-
 hw/pci-host/pnv_phb4.c                   |   9 +-
 hw/pci-host/pnv_phb4_pec.c               |   9 +-
 hw/pci-host/prep.c                       |   4 +-
 hw/pci-host/xen_igd_pt.c                 |   7 +-
 hw/ppc/e500.c                            |   5 +-
 hw/ppc/mac_newworld.c                    |  10 +-
 hw/ppc/mac_oldworld.c                    |   4 +-
 hw/ppc/pnv.c                             | 171 +++++++---------
 hw/ppc/pnv_core.c                        |   4 +-
 hw/ppc/pnv_psi.c                         |  22 +-
 hw/ppc/rs6000_mc.c                       |   9 +-
 hw/ppc/spapr.c                           |  77 +++----
 hw/ppc/spapr_caps.c                      |  15 +-
 hw/ppc/spapr_cpu_core.c                  |  15 +-
 hw/ppc/spapr_drc.c                       |  16 +-
 hw/ppc/spapr_hcall.c                     |   3 +-
 hw/ppc/spapr_irq.c                       |  11 +-
 hw/ppc/spapr_pci.c                       |  16 +-
 hw/ppc/spapr_pci_nvlink2.c               |   3 +-
 hw/riscv/opentitan.c                     |  13 +-
 hw/riscv/sifive_e.c                      |  10 +-
 hw/riscv/sifive_u.c                      |  11 +-
 hw/riscv/spike.c                         |   4 +-
 hw/riscv/virt.c                          |   4 +-
 hw/rx/rx-gdbsim.c                        |  12 +-
 hw/s390x/css.c                           |   5 +-
 hw/s390x/event-facility.c                |  13 +-
 hw/s390x/ipl.c                           |  27 ++-
 hw/s390x/s390-pci-bus.c                  |  14 +-
 hw/s390x/s390-skeys.c                    |   2 +-
 hw/s390x/s390-stattrib.c                 |   2 +-
 hw/s390x/s390-virtio-ccw.c               |  20 +-
 hw/s390x/sclp.c                          |  13 +-
 hw/s390x/virtio-ccw-crypto.c             |  10 +-
 hw/s390x/virtio-ccw-rng.c                |   8 +-
 hw/scsi/scsi-bus.c                       |  15 +-
 hw/scsi/vhost-scsi.c                     |   4 +-
 hw/sd/aspeed_sdhci.c                     |  15 +-
 hw/sd/sd.c                               |   3 +-
 hw/sd/sdhci-pci.c                        |   7 +-
 hw/sd/sdhci.c                            |  21 +-
 hw/sd/ssi-sd.c                           |  15 +-
 hw/smbios/smbios.c                       |  33 +--
 hw/sparc/sun4m.c                         |   2 +-
 hw/sparc64/sun4u.c                       |   2 +-
 hw/usb/bus.c                             |   7 +-
 hw/usb/dev-storage.c                     |   9 +-
 hw/usb/hcd-dwc2.c                        |   9 +-
 hw/vfio/pci-quirks.c                     |   5 +-
 hw/vfio/pci.c                            |  10 +-
 hw/virtio/virtio-balloon.c               |  17 +-
 hw/virtio/virtio-crypto-pci.c            |   9 +-
 hw/virtio/virtio-iommu-pci.c             |   4 +-
 hw/virtio/virtio-mem-pci.c               |   4 +-
 hw/virtio/virtio-pmem-pci.c              |   2 +-
 hw/virtio/virtio-rng-pci.c               |   8 +-
 hw/virtio/virtio-rng.c                   |  11 +-
 hw/xen/xen-backend.c                     |   7 +-
 hw/xen/xen-bus.c                         |  92 ++++-----
 hw/xen/xen-host-pci-device.c             |  27 ++-
 hw/xen/xen_pt.c                          |  25 +--
 hw/xen/xen_pt_config_init.c              |  20 +-
 iothread.c                               |  18 +-
 linux-user/syscall.c                     |   2 +-
 monitor/hmp-cmds.c                       |  11 +-
 monitor/monitor.c                        |  21 +-
 nbd/client.c                             |   5 +
 nbd/server.c                             |   5 +
 net/colo-compare.c                       |  26 +--
 net/dump.c                               |  13 +-
 net/filter-buffer.c                      |  13 +-
 net/filter.c                             |   2 +-
 net/net.c                                |  10 +-
 net/tap.c                                |   6 +-
 qapi/opts-visitor.c                      |  66 +++---
 qapi/qapi-clone-visitor.c                |  69 ++++---
 qapi/qapi-dealloc-visitor.c              |  27 ++-
 qapi/qapi-visit-core.c                   | 197 +++++++++---------
 qapi/qobject-input-visitor.c             | 109 ++++++----
 qapi/qobject-output-visitor.c            |  27 ++-
 qapi/string-input-visitor.c              |  67 +++---
 qapi/string-output-visitor.c             |  32 +--
 qdev-monitor.c                           |  39 ++--
 qemu-img.c                               |  23 +--
 qga/commands-posix.c                     |   4 +-
 qga/commands-win32.c                     |  22 +-
 qom/object.c                             | 244 +++++++++++-----------
 qom/object_interfaces.c                  |  30 +--
 qom/qom-hmp-cmds.c                       |   2 +-
 qom/qom-qmp-cmds.c                       |   2 +-
 qom/qom-qobject.c                        |  14 +-
 softmmu/vl.c                             |  17 +-
 target/arm/cpu64.c                       |  15 +-
 target/arm/monitor.c                     |   7 +-
 target/i386/cpu.c                        |  98 ++++-----
 target/ppc/compat.c                      |   5 +-
 target/ppc/translate_init.inc.c          |   2 +-
 target/s390x/cpu_models.c                |  17 +-
 target/sparc/cpu.c                       |   5 +-
 tpm.c                                    |   5 +-
 ui/console.c                             |   4 +-
 ui/vnc.c                                 |   2 +-
 util/main-loop.c                         |   4 +-
 util/qemu-config.c                       |  25 +--
 util/qemu-option.c                       | 259 ++++++++++++------------
 MAINTAINERS                              |   1 +
 scripts/qapi/commands.py                 |  22 +-
 scripts/qapi/visit.py                    | 107 ++++------
 294 files changed, 3065 insertions(+), 3780 deletions(-)
 create mode 100644 scripts/coccinelle/errp-guard.cocci

-- 
2.26.2

This now conflicts with master (b6d7e9b66f5).

Conflict #1: include/hw/audio/pcspk.h

    2336172d9b "audio: set default value for pcspk.iobase property"

    2336172d9b audio: set default value for pcspk.iobase property
    diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
    index 8b48560267..06cba00b83 100644
    --- a/include/hw/audio/pcspk.h
    +++ b/include/hw/audio/pcspk.h
    @@ -33,11 +33,7 @@

     static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit)
     {
    -    DeviceState *dev;
    -
    -    dev = DEVICE(isadev);
    -    qdev_prop_set_uint32(dev, "iobase", 0x61);
    -    object_property_set_link(OBJECT(dev), OBJECT(pit), "pit", NULL);
    +    object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL);
         isa_realize_and_unref(isadev, bus, &error_fatal);
     }

    9eb2af7743 qom: Put name parameter before value / visitor parameter
    diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
    index 7e7f5f49dc..6386491288 100644
    --- a/include/hw/audio/pcspk.h
    +++ b/include/hw/audio/pcspk.h
    @@ -39,7 +39,7 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)
         isadev = isa_new(TYPE_PC_SPEAKER);
         dev = 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), "pit", OBJECT(pit), NULL);
         isa_realize_and_unref(isadev, bus, &error_fatal);

         return isadev;

Resolution is trivial, just redo 9eb2af7743's swap of the arguments:

    static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit)
    {
        object_property_set_link(OBJECT(isadev), "pit", OBJECT(pit), NULL);
        isa_realize_and_unref(isadev, bus, &error_fatal);
    }

Conflict #2: qemu-img.c

    0b6786a9c1 block/amend: refactor qcow2 amend options
    diff --git a/qemu-img.c b/qemu-img.c
    index 1a0a85089b..7f4938a5ef 100644
    --- a/qemu-img.c
    +++ b/qemu-img.c
    [...]
    @@ -4219,7 +4218,22 @@ static int img_amend(int argc, char **argv)
         amend_opts = qemu_opts_append(amend_opts, bs->drv->amend_opts);
         opts = qemu_opts_create(amend_opts, NULL, 0, &error_abort);
         qemu_opts_do_parse(opts, options, NULL, &err);
    +
         if (err) {
    +        /* Try to parse options using the create options */
    +        Error *err1 = NULL;
    +        amend_opts = qemu_opts_append(amend_opts, bs->drv->create_opts);
    +        qemu_opts_del(opts);
    +        opts = qemu_opts_create(amend_opts, NULL, 0, &error_abort);
    +        qemu_opts_do_parse(opts, options, NULL, &err1);
    +
    +        if (!err1) {
    +            error_append_hint(&err,
    +                              "This option is only supported for image creation\n");
    +        } else {
    +            error_free(err1);
    +        }
    +
             error_report_err(err);
             ret = -1;
             goto out;

    0bc2a50e17 qemu-option: Use returned bool to check for failure
    diff --git a/qemu-img.c b/qemu-img.c
    index bdb9f6aa46..fc405ee171 100644
    --- a/qemu-img.c
    +++ b/qemu-img.c
    [...]
    @@ -4212,8 +4209,7 @@ static int img_amend(int argc, char **argv)

         create_opts = qemu_opts_append(create_opts, bs->drv->create_opts);
         opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
    -    qemu_opts_do_parse(opts, options, NULL, &err);
    -    if (err) {
    +    if (!qemu_opts_do_parse(opts, options, NULL, &err)) {
             error_report_err(err);
             ret = -1;
             goto out;

Simply rerunning latter commit' Coccinelle script on master's version
would be possible, but suboptimal, because the former commit adds an
awkward error ignore a rebase would clean up.  Manual resolution:

        amend_opts = qemu_opts_append(amend_opts, bs->drv->amend_opts);
        opts = qemu_opts_create(amend_opts, NULL, 0, &error_abort);
        if (!qemu_opts_do_parse(opts, options, NULL, &err)) {
            /* Try to parse options using the create options */
            amend_opts = qemu_opts_append(amend_opts, bs->drv->create_opts);
            qemu_opts_del(opts);
            opts = qemu_opts_create(amend_opts, NULL, 0, &error_abort);
            if (qemu_opts_do_parse(opts, options, NULL, NULL)) {
                error_append_hint(&err,
                                  "This option is only supported for image creation\n");
            }

            error_report_err(err);
            ret = -1;
            goto out;
        }

If you'd prefer a rebased pull request, let me know.

Tests are still running.