We are at the point where we can remove all the code to pass secrets
(RBD/iSCSI authentication passwords) on the commandline in plaintext
as all supported versions of qemu now support -object secret and the
corresponding methods to pass the secrets securely.

Peter Krempa (12):
  util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)
  qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET
  qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET
  qemu: domain: Remove qemuDomainSupportsEncryptedSecret
  qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET
  qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET
  qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code
  qemu: command: Remove qemuBuildGeneralSecinfoURI
  qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps
  qemu: Simplify qemuDomainSecretInfo
  qemu: domain: Rename secrets setup function
  qemu: command: Remove qemuBuildRBDSecinfoURI

 src/libvirt_private.syms                      |   1 -
 src/qemu/qemu_backup.c                        |   2 +-
 src/qemu/qemu_block.c                         |  40 ++-
 src/qemu/qemu_capabilities.c                  |   6 +-
 src/qemu/qemu_capabilities.h                  |   4 +-
 src/qemu/qemu_command.c                       | 184 +++---------
 src/qemu/qemu_domain.c                        | 274 ++++--------------
 src/qemu/qemu_domain.h                        |  31 +-
 src/qemu/qemu_hotplug.c                       |   4 +-
 src/qemu/qemu_migration_params.c              |   2 +-
 src/storage/storage_util.c                    |   6 -
 src/util/vircrypto.c                          |  27 --
 src/util/vircrypto.h                          |   2 -
 tests/qemublocktest.c                         |  13 +-
 .../caps_2.11.0.s390x.xml                     |   2 -
 .../caps_2.11.0.x86_64.xml                    |   2 -
 .../caps_2.12.0.aarch64.xml                   |   2 -
 .../caps_2.12.0.ppc64.xml                     |   2 -
 .../caps_2.12.0.s390x.xml                     |   2 -
 .../caps_2.12.0.x86_64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |   2 -
 .../caps_3.0.0.riscv32.xml                    |   2 -
 .../caps_3.0.0.riscv64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |   2 -
 .../caps_3.0.0.x86_64.xml                     |   2 -
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |   2 -
 .../caps_3.1.0.x86_64.xml                     |   2 -
 .../caps_4.0.0.aarch64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |   2 -
 .../caps_4.0.0.riscv32.xml                    |   2 -
 .../caps_4.0.0.riscv64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |   2 -
 .../caps_4.0.0.x86_64.xml                     |   2 -
 .../caps_4.1.0.x86_64.xml                     |   2 -
 .../caps_4.2.0.aarch64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |   2 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |   2 -
 .../caps_4.2.0.x86_64.xml                     |   2 -
 .../caps_5.0.0.aarch64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |   2 -
 .../caps_5.0.0.riscv64.xml                    |   2 -
 .../caps_5.0.0.x86_64.xml                     |   2 -
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |   2 -
 .../caps_5.1.0.x86_64.xml                     |   2 -
 .../caps_5.2.0.aarch64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |   2 -
 .../caps_5.2.0.riscv64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |   2 -
 .../caps_5.2.0.x86_64.xml                     |   2 -
 .../caps_6.0.0.aarch64.xml                    |   2 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |   2 -
 .../caps_6.0.0.x86_64.xml                     |   2 -
 .../caps_6.1.0.x86_64.xml                     |   2 -
 .../aarch64-aavmf-virtio-mmio.args            |   1 +
 tests/qemuxml2argvdata/aarch64-acpi-uefi.args |   1 +
 .../aarch64-cpu-passthrough.args              |   1 +
 tests/qemuxml2argvdata/aarch64-gic-host.args  |   1 +
 .../aarch64-gic-none-tcg.args                 |   1 +
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |   1 +
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |   1 +
 .../aarch64-kvm-32-on-64.args                 |   1 +
 .../aarch64-noacpi-nouefi.args                |   1 +
 .../qemuxml2argvdata/aarch64-noacpi-uefi.args |   1 +
 .../qemuxml2argvdata/aarch64-pci-serial.args  |   1 +
 .../aarch64-traditional-pci.args              |   1 +
 .../aarch64-usb-controller-nec-xhci.args      |   1 +
 .../aarch64-usb-controller-qemu-xhci.args     |   1 +
 .../aarch64-video-default.args                |   1 +
 .../aarch64-video-virtio-gpu-pci.args         |   1 +
 .../aarch64-virt-2.6-virtio-pci-default.args  |   1 +
 .../aarch64-virt-default-nic.args             |   1 +
 .../qemuxml2argvdata/aarch64-virt-virtio.args |   1 +
 .../aarch64-virtio-pci-default.args           |   1 +
 .../aarch64-virtio-pci-manual-addresses.args  |   1 +
 tests/qemuxml2argvdata/acpi-table.args        |   1 +
 .../arm-vexpressa9-basic.args                 |   1 +
 .../arm-vexpressa9-nodevs.args                |   1 +
 .../arm-vexpressa9-virtio.args                |   1 +
 tests/qemuxml2argvdata/arm-virt-virtio.args   |   1 +
 tests/qemuxml2argvdata/audio-alsa-best.args   |   1 +
 .../qemuxml2argvdata/audio-alsa-minimal.args  |   1 +
 .../audio-coreaudio-best.args                 |   1 +
 .../audio-coreaudio-minimal.args              |   1 +
 .../audio-default-nographics.args             |   1 +
 tests/qemuxml2argvdata/audio-default-sdl.args |   1 +
 .../qemuxml2argvdata/audio-default-spice.args |   1 +
 tests/qemuxml2argvdata/audio-default-vnc.args |   1 +
 tests/qemuxml2argvdata/audio-file-best.args   |   1 +
 .../qemuxml2argvdata/audio-file-minimal.args  |   1 +
 tests/qemuxml2argvdata/audio-none-best.args   |   1 +
 .../qemuxml2argvdata/audio-none-minimal.args  |   1 +
 tests/qemuxml2argvdata/audio-oss-best.args    |   1 +
 tests/qemuxml2argvdata/audio-oss-minimal.args |   1 +
 .../audio-pulseaudio-best.args                |   1 +
 .../audio-pulseaudio-minimal.args             |   1 +
 tests/qemuxml2argvdata/audio-sdl-best.args    |   1 +
 tests/qemuxml2argvdata/audio-sdl-minimal.args |   1 +
 tests/qemuxml2argvdata/audio-spice-best.args  |   1 +
 .../qemuxml2argvdata/audio-spice-minimal.args |   1 +
 tests/qemuxml2argvdata/autoindex.args         |   1 +
 .../qemuxml2argvdata/balloon-ccw-deflate.args |   1 +
 .../qemuxml2argvdata/balloon-device-auto.args |   1 +
 .../balloon-device-deflate-off.args           |   1 +
 .../balloon-device-deflate.args               |   1 +
 .../balloon-device-period.args                |   1 +
 tests/qemuxml2argvdata/balloon-device.args    |   1 +
 .../balloon-mmio-deflate.args                 |   1 +
 tests/qemuxml2argvdata/bios-nvram-secure.args |   1 +
 tests/qemuxml2argvdata/bios-nvram.args        |   1 +
 tests/qemuxml2argvdata/bios.args              |   1 +
 tests/qemuxml2argvdata/blkiotune-device.args  |   1 +
 tests/qemuxml2argvdata/blkiotune.args         |   1 +
 tests/qemuxml2argvdata/boot-cdrom.args        |   1 +
 tests/qemuxml2argvdata/boot-complex.args      |   1 +
 tests/qemuxml2argvdata/boot-floppy-q35.args   |   1 +
 tests/qemuxml2argvdata/boot-floppy.args       |   1 +
 .../boot-menu-disable-drive.args              |   1 +
 tests/qemuxml2argvdata/boot-menu-disable.args |   1 +
 .../boot-menu-enable-with-timeout.args        |   1 +
 tests/qemuxml2argvdata/boot-menu-enable.args  |   1 +
 tests/qemuxml2argvdata/boot-multi.args        |   1 +
 tests/qemuxml2argvdata/boot-network.args      |   1 +
 tests/qemuxml2argvdata/boot-order.args        |   1 +
 tests/qemuxml2argvdata/boot-strict.args       |   1 +
 tests/qemuxml2argvdata/channel-guestfwd.args  |   1 +
 tests/qemuxml2argvdata/channel-spicevmc.args  |   1 +
 .../qemuxml2argvdata/channel-virtio-auto.args |   1 +
 .../channel-virtio-autoadd.args               |   1 +
 .../channel-virtio-autoassign.args            |   1 +
 .../channel-virtio-default.args               |   1 +
 .../channel-virtio-state.args                 |   1 +
 .../qemuxml2argvdata/channel-virtio-unix.args |   1 +
 tests/qemuxml2argvdata/channel-virtio.args    |   1 +
 tests/qemuxml2argvdata/chardev-reconnect.args |   1 +
 tests/qemuxml2argvdata/clock-catchup.args     |   1 +
 tests/qemuxml2argvdata/clock-france.args      |   1 +
 tests/qemuxml2argvdata/clock-hpet-off.args    |   1 +
 .../clock-localtime-basis-localtime.args      |   1 +
 tests/qemuxml2argvdata/clock-localtime.args   |   1 +
 tests/qemuxml2argvdata/clock-realtime.args    |   1 +
 .../clock-timer-hyperv-rtc.args               |   1 +
 tests/qemuxml2argvdata/clock-utc.args         |   1 +
 tests/qemuxml2argvdata/clock-variable.args    |   1 +
 .../qemuxml2argvdata/console-compat-auto.args |   1 +
 .../console-compat-chardev.args               |   1 +
 tests/qemuxml2argvdata/console-compat.args    |   1 +
 .../qemuxml2argvdata/console-virtio-ccw.args  |   1 +
 .../qemuxml2argvdata/console-virtio-many.args |   1 +
 tests/qemuxml2argvdata/console-virtio.args    |   1 +
 tests/qemuxml2argvdata/controller-order.args  |   1 +
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |   1 +
 tests/qemuxml2argvdata/cpu-Haswell.args       |   1 +
 tests/qemuxml2argvdata/cpu-Haswell2.args      |   1 +
 tests/qemuxml2argvdata/cpu-Haswell3.args      |   1 +
 tests/qemuxml2argvdata/cpu-cache-disable.args |   1 +
 .../qemuxml2argvdata/cpu-cache-disable2.args  |   1 +
 .../qemuxml2argvdata/cpu-cache-disable3.args  |   1 +
 .../cpu-cache-emulate-l3.args                 |   1 +
 .../cpu-cache-passthrough.args                |   1 +
 .../cpu-cache-passthrough2.args               |   1 +
 .../cpu-check-default-none.args               |   1 +
 .../cpu-check-default-none2.args              |   1 +
 .../cpu-check-default-partial.args            |   1 +
 .../cpu-check-default-partial2.args           |   1 +
 tests/qemuxml2argvdata/cpu-check-none.args    |   1 +
 tests/qemuxml2argvdata/cpu-eoi-disabled.args  |   1 +
 tests/qemuxml2argvdata/cpu-eoi-enabled.args   |   1 +
 tests/qemuxml2argvdata/cpu-exact1.args        |   1 +
 .../cpu-exact2-nofallback.args                |   1 +
 tests/qemuxml2argvdata/cpu-exact2.args        |   1 +
 tests/qemuxml2argvdata/cpu-fallback.args      |   1 +
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |   1 +
 .../qemuxml2argvdata/cpu-host-model-cmt.args  |   1 +
 .../cpu-host-model-fallback.args              |   1 +
 .../cpu-host-model-vendor.args                |   1 +
 tests/qemuxml2argvdata/cpu-host-model.args    |   1 +
 .../cpu-host-passthrough-features.args        |   1 +
 .../cpu-host-passthrough.args                 |   1 +
 .../qemuxml2argvdata/cpu-hotplug-startup.args |   1 +
 tests/qemuxml2argvdata/cpu-kvmclock.args      |   1 +
 tests/qemuxml2argvdata/cpu-minimum1.args      |   1 +
 tests/qemuxml2argvdata/cpu-minimum2.args      |   1 +
 .../cpu-no-removed-features.args              |   1 +
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |   1 +
 .../qemuxml2argvdata/cpu-numa-memshared.args  |   1 +
 .../cpu-numa-no-memory-element.args           |   1 +
 tests/qemuxml2argvdata/cpu-numa1.args         |   1 +
 tests/qemuxml2argvdata/cpu-numa2.args         |   1 +
 tests/qemuxml2argvdata/cpu-s390-features.args |   1 +
 tests/qemuxml2argvdata/cpu-s390-zEC12.args    |   1 +
 tests/qemuxml2argvdata/cpu-strict1.args       |   1 +
 tests/qemuxml2argvdata/cpu-topology1.args     |   1 +
 tests/qemuxml2argvdata/cpu-topology2.args     |   1 +
 tests/qemuxml2argvdata/cpu-topology3.args     |   1 +
 tests/qemuxml2argvdata/cpu-tsc-frequency.args |   1 +
 tests/qemuxml2argvdata/cputune-numatune.args  |   1 +
 .../qemuxml2argvdata/cputune-zero-shares.args |   1 +
 tests/qemuxml2argvdata/cputune.args           |   1 +
 .../default-kvm-host-arch.args                |   1 +
 .../default-qemu-host-arch.args               |   1 +
 tests/qemuxml2argvdata/disk-aio.args          |   1 +
 tests/qemuxml2argvdata/disk-blockio.args      |   1 +
 tests/qemuxml2argvdata/disk-boot-cdrom.args   |   1 +
 tests/qemuxml2argvdata/disk-boot-disk.args    |   1 +
 .../qemuxml2argvdata/disk-cdrom-network.args  |   1 +
 tests/qemuxml2argvdata/disk-cdrom-tray.args   |   1 +
 tests/qemuxml2argvdata/disk-cdrom.args        |   1 +
 tests/qemuxml2argvdata/disk-copy_on_read.args |   1 +
 tests/qemuxml2argvdata/disk-error-policy.args |   1 +
 tests/qemuxml2argvdata/disk-floppy-tray.args  |   1 +
 tests/qemuxml2argvdata/disk-floppy.args       |   1 +
 tests/qemuxml2argvdata/disk-fmt-qcow.args     |   1 +
 tests/qemuxml2argvdata/disk-geometry.args     |   1 +
 tests/qemuxml2argvdata/disk-ide-split.args    |   1 +
 tests/qemuxml2argvdata/disk-ide-wwn.args      |   1 +
 tests/qemuxml2argvdata/disk-ioeventfd.args    |   1 +
 tests/qemuxml2argvdata/disk-iscsi.args        |   1 +
 .../disk-network-gluster.args                 |   1 +
 .../disk-network-iscsi-modern.args            |  10 +-
 .../qemuxml2argvdata/disk-network-iscsi.args  |  13 +-
 tests/qemuxml2argvdata/disk-network-nbd.args  |   1 +
 .../disk-network-sheepdog.args                |   1 +
 .../disk-network-source-auth.args             |  10 +-
 tests/qemuxml2argvdata/disk-network-vxhs.args |   1 +
 tests/qemuxml2argvdata/disk-no-boot.args      |   1 +
 tests/qemuxml2argvdata/disk-order.args        |   1 +
 .../qemuxml2argvdata/disk-readonly-disk.args  |   1 +
 tests/qemuxml2argvdata/disk-sata-device.args  |   1 +
 .../disk-scsi-disk-split.args                 |   1 +
 .../qemuxml2argvdata/disk-scsi-disk-vpd.args  |   1 +
 .../qemuxml2argvdata/disk-scsi-disk-wwn.args  |   1 +
 .../disk-scsi-lun-passthrough.args            |   1 +
 tests/qemuxml2argvdata/disk-serial.args       |   1 +
 tests/qemuxml2argvdata/disk-snapshot.args     |   1 +
 .../disk-source-pool-mode.args                |   5 +-
 tests/qemuxml2argvdata/disk-source-pool.args  |   1 +
 .../disk-usb-device-removable.args            |   1 +
 tests/qemuxml2argvdata/disk-usb-device.args   |   1 +
 .../disk-virtio-ccw-many.args                 |   1 +
 tests/qemuxml2argvdata/disk-virtio-ccw.args   |   1 +
 .../disk-virtio-s390-zpci.args                |   1 +
 tests/qemuxml2argvdata/disk-virtio.args       |   1 +
 tests/qemuxml2argvdata/event_idx.args         |   1 +
 .../fd-memory-no-numa-topology.args           |   1 +
 .../fd-memory-numa-topology.args              |   1 +
 .../fd-memory-numa-topology2.args             |   1 +
 .../fd-memory-numa-topology3.args             |   1 +
 tests/qemuxml2argvdata/floppy-drive-fat.args  |   1 +
 tests/qemuxml2argvdata/fs9p-ccw.args          |   1 +
 tests/qemuxml2argvdata/fs9p.args              |   1 +
 .../graphics-egl-headless.args                |   1 +
 .../graphics-sdl-fullscreen.args              |   1 +
 tests/qemuxml2argvdata/graphics-sdl.args      |   1 +
 .../graphics-spice-agent-file-xfer.args       |   1 +
 .../graphics-spice-agentmouse.args            |   1 +
 .../graphics-spice-auto-socket-cfg.args       |   1 +
 .../graphics-spice-auto-socket.args           |   1 +
 .../graphics-spice-compression.args           |   1 +
 .../graphics-spice-egl-headless.args          |   1 +
 .../graphics-spice-no-args.args               |   1 +
 .../graphics-spice-qxl-vga.args               |   1 +
 .../qemuxml2argvdata/graphics-spice-sasl.args |   1 +
 .../graphics-spice-socket.args                |   1 +
 .../graphics-spice-timeout.args               |   1 +
 .../graphics-spice-usb-redir.args             |   1 +
 tests/qemuxml2argvdata/graphics-spice.args    |   1 +
 .../graphics-vnc-auto-socket-cfg.args         |   1 +
 .../graphics-vnc-auto-socket.args             |   1 +
 .../graphics-vnc-egl-headless.args            |   1 +
 .../graphics-vnc-no-listen-attr.args          |   1 +
 tests/qemuxml2argvdata/graphics-vnc-none.args |   1 +
 .../qemuxml2argvdata/graphics-vnc-policy.args |   1 +
 .../graphics-vnc-remove-generated-socket.args |   1 +
 tests/qemuxml2argvdata/graphics-vnc-sasl.args |   1 +
 .../graphics-vnc-socket-new-cmdline.args      |   1 +
 .../qemuxml2argvdata/graphics-vnc-socket.args |   1 +
 tests/qemuxml2argvdata/graphics-vnc-tls.args  |   1 +
 .../graphics-vnc-websocket.args               |   1 +
 tests/qemuxml2argvdata/graphics-vnc.args      |   1 +
 .../hostdev-mdev-precreated.args              |   1 +
 .../hostdev-pci-address-device.args           |   1 +
 .../hostdev-pci-address-unassigned.args       |   1 +
 .../qemuxml2argvdata/hostdev-pci-address.args |   1 +
 .../hostdev-pci-multifunction.args            |   1 +
 .../hostdev-scsi-vhost-scsi-ccw.args          |   1 +
 .../hostdev-scsi-vhost-scsi-pci.args          |   1 +
 .../hostdev-scsi-vhost-scsi-pcie.args         |   1 +
 .../hostdev-subsys-mdev-vfio-ccw.args         |   1 +
 .../hostdev-usb-address-device-boot.args      |   1 +
 .../hostdev-usb-address-device.args           |   1 +
 .../qemuxml2argvdata/hostdev-usb-address.args |   1 +
 .../hostdev-vfio-multidomain.args             |   1 +
 .../hostdev-vfio-zpci-autogenerate-fids.args  |   1 +
 .../hostdev-vfio-zpci-autogenerate-uids.args  |   1 +
 .../hostdev-vfio-zpci-autogenerate.args       |   1 +
 .../hostdev-vfio-zpci-boundaries.args         |   1 +
 .../hostdev-vfio-zpci-ccw-memballoon.args     |   1 +
 .../hostdev-vfio-zpci-multidomain-many.args   |   1 +
 tests/qemuxml2argvdata/hostdev-vfio-zpci.args |   1 +
 tests/qemuxml2argvdata/hostdev-vfio.args      |   1 +
 tests/qemuxml2argvdata/hotplug-base.args      |   1 +
 .../hugepages-default-2M.args                 |   1 +
 .../hugepages-default-system-size.args        |   1 +
 tests/qemuxml2argvdata/hugepages-default.args |   1 +
 .../qemuxml2argvdata/hugepages-memaccess.args |   1 +
 .../hugepages-memaccess2.args                 |   1 +
 tests/qemuxml2argvdata/hugepages-nodeset.args |   1 +
 .../hugepages-numa-default-2M.args            |   1 +
 .../hugepages-numa-default-dimm.args          |   1 +
 .../hugepages-numa-default.args               |   1 +
 .../hugepages-numa-nodeset-part.args          |   1 +
 .../hugepages-numa-nodeset.args               |   1 +
 tests/qemuxml2argvdata/hugepages-shared.args  |   1 +
 .../qemuxml2argvdata/input-usbmouse-addr.args |   1 +
 tests/qemuxml2argvdata/input-usbmouse.args    |   1 +
 tests/qemuxml2argvdata/input-usbtablet.args   |   1 +
 tests/qemuxml2argvdata/input-virtio-ccw.args  |   1 +
 .../iothreads-disk-virtio-ccw.args            |   1 +
 tests/qemuxml2argvdata/iothreads-disk.args    |   1 +
 .../iothreads-ids-partial.args                |   1 +
 tests/qemuxml2argvdata/iothreads-ids.args     |   1 +
 tests/qemuxml2argvdata/iothreads.args         |   1 +
 tests/qemuxml2argvdata/kvm-features-off.args  |   1 +
 tests/qemuxml2argvdata/kvm-features.args      |   1 +
 tests/qemuxml2argvdata/kvm-pit-delay.args     |   1 +
 tests/qemuxml2argvdata/kvm-pit-discard.args   |   1 +
 tests/qemuxml2argvdata/kvmclock.args          |   1 +
 .../luks-disks-source-qcow2.args              |   5 +-
 tests/qemuxml2argvdata/luks-disks-source.args |   5 +-
 .../mach-virt-console-virtio.args             |   1 +
 .../mach-virt-serial-native.args              |   1 +
 .../mach-virt-serial-pci.args                 |   1 +
 .../mach-virt-serial-usb.args                 |   1 +
 .../machine-aeskeywrap-off-cap.args           |   1 +
 .../machine-aeskeywrap-off-caps.args          |   1 +
 .../machine-aeskeywrap-on-cap.args            |   1 +
 .../machine-aeskeywrap-on-caps.args           |   1 +
 tests/qemuxml2argvdata/machine-aliases1.args  |   1 +
 tests/qemuxml2argvdata/machine-aliases2.args  |   1 +
 tests/qemuxml2argvdata/machine-core-off.args  |   1 +
 tests/qemuxml2argvdata/machine-core-on.args   |   1 +
 .../machine-deakeywrap-off-cap.args           |   1 +
 .../machine-deakeywrap-off-caps.args          |   1 +
 .../machine-deakeywrap-on-cap.args            |   1 +
 .../machine-deakeywrap-on-caps.args           |   1 +
 .../machine-keywrap-none-caps.args            |   1 +
 .../machine-keywrap-none.args                 |   1 +
 ...ine-loadparm-multiple-disks-nets-s390.args |   1 +
 .../machine-loadparm-net-s390.args            |   1 +
 .../machine-loadparm-s390.args                |   1 +
 tests/qemuxml2argvdata/machine-smm-opt.args   |   1 +
 .../qemuxml2argvdata/machine-vmport-opt.args  |   1 +
 .../memory-hotplug-dimm-addr.args             |   1 +
 .../qemuxml2argvdata/memory-hotplug-dimm.args |   1 +
 ...emory-hotplug-nvdimm-ppc64-abi-update.args |   1 +
 .../memory-hotplug-nvdimm-ppc64.args          |   1 +
 ...emory-hotplug-ppc64-nonuma-abi-update.args |   1 +
 .../memory-hotplug-ppc64-nonuma.args          |   1 +
 tests/qemuxml2argvdata/memory-hotplug.args    |   1 +
 tests/qemuxml2argvdata/memtune-unlimited.args |   1 +
 tests/qemuxml2argvdata/memtune.args           |   1 +
 .../migrate-numa-unaligned.args               |   1 +
 tests/qemuxml2argvdata/migrate.args           |   1 +
 tests/qemuxml2argvdata/minimal.args           |   1 +
 tests/qemuxml2argvdata/misc-acpi.args         |   1 +
 tests/qemuxml2argvdata/misc-disable-s3.args   |   1 +
 .../misc-disable-suspends.args                |   1 +
 tests/qemuxml2argvdata/misc-enable-s4.args    |   1 +
 tests/qemuxml2argvdata/misc-no-reboot.args    |   1 +
 tests/qemuxml2argvdata/misc-uuid.args         |   1 +
 tests/qemuxml2argvdata/monitor-json.args      |   1 +
 .../multifunction-pci-device.args             |   1 +
 tests/qemuxml2argvdata/name-escape.args       |   2 +-
 tests/qemuxml2argvdata/net-client.args        |   1 +
 tests/qemuxml2argvdata/net-eth-hostip.args    |   1 +
 tests/qemuxml2argvdata/net-eth-ifname.args    |   1 +
 tests/qemuxml2argvdata/net-eth-names.args     |   1 +
 .../net-eth-unmanaged-tap.args                |   1 +
 tests/qemuxml2argvdata/net-eth.args           |   1 +
 .../net-hostdev-bootorder.args                |   1 +
 .../net-hostdev-multidomain.args              |   1 +
 .../net-hostdev-vfio-multidomain.args         |   1 +
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |   1 +
 tests/qemuxml2argvdata/net-hostdev.args       |   1 +
 tests/qemuxml2argvdata/net-many-models.args   |   1 +
 tests/qemuxml2argvdata/net-mcast.args         |   1 +
 tests/qemuxml2argvdata/net-server.args        |   1 +
 tests/qemuxml2argvdata/net-udp.args           |   1 +
 tests/qemuxml2argvdata/net-user-addr.args     |   1 +
 tests/qemuxml2argvdata/net-user.args          |   1 +
 .../net-vhostuser-multiq.args                 |   1 +
 tests/qemuxml2argvdata/net-vhostuser.args     |   1 +
 tests/qemuxml2argvdata/net-virtio-ccw.args    |   1 +
 tests/qemuxml2argvdata/net-virtio-device.args |   1 +
 .../net-virtio-disable-offloads.args          |   1 +
 tests/qemuxml2argvdata/net-virtio-netdev.args |   1 +
 .../net-virtio-rxtxqueuesize.args             |   1 +
 .../net-virtio-teaming-hostdev.args           |   1 +
 .../qemuxml2argvdata/net-virtio-teaming.args  |   1 +
 tests/qemuxml2argvdata/net-virtio.args        |   1 +
 tests/qemuxml2argvdata/nosharepages.args      |   1 +
 .../numad-auto-memory-vcpu-cpuset.args        |   1 +
 ...o-memory-vcpu-no-cpuset-and-placement.args |   1 +
 .../numad-auto-vcpu-static-numatune.args      |   1 +
 .../numad-static-memory-auto-vcpu.args        |   1 +
 tests/qemuxml2argvdata/numad.args             |   1 +
 .../numatune-auto-nodeset-invalid.args        |   1 +
 .../numatune-auto-prefer.args                 |   1 +
 .../qemuxml2argvdata/numatune-distances.args  |   1 +
 .../numatune-memnode-no-memory.args           |   1 +
 tests/qemuxml2argvdata/numatune-memnode.args  |   1 +
 tests/qemuxml2argvdata/numatune-memory.args   |   1 +
 tests/qemuxml2argvdata/numatune-no-vcpu.args  |   1 +
 .../qemuxml2argvdata/pages-dimm-discard.args  |   1 +
 .../pages-discard-hugepages.args              |   1 +
 tests/qemuxml2argvdata/pages-discard.args     |   1 +
 tests/qemuxml2argvdata/panic-double.args      |   1 +
 tests/qemuxml2argvdata/panic-no-address.args  |   1 +
 tests/qemuxml2argvdata/panic.args             |   1 +
 .../parallel-parport-chardev.args             |   1 +
 .../parallel-tcp-chardev.args                 |   1 +
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |   1 +
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |   1 +
 tests/qemuxml2argvdata/pci-autofill-addr.args |   1 +
 .../pci-bridge-many-disks.args                |   1 +
 tests/qemuxml2argvdata/pci-bridge.args        |   1 +
 tests/qemuxml2argvdata/pci-expander-bus.args  |   1 +
 tests/qemuxml2argvdata/pci-many.args          |   1 +
 tests/qemuxml2argvdata/pci-rom-disabled.args  |   1 +
 tests/qemuxml2argvdata/pci-rom.args           |   1 +
 .../pci-serial-dev-chardev.args               |   1 +
 tests/qemuxml2argvdata/pcie-expander-bus.args |   1 +
 .../pcie-root-port-model-generic.args         |   1 +
 .../pcie-root-port-model-ioh3420.args         |   1 +
 tests/qemuxml2argvdata/pcie-root-port.args    |   1 +
 tests/qemuxml2argvdata/pcie-root.args         |   1 +
 .../pcie-switch-downstream-port.args          |   1 +
 .../pcie-switch-upstream-port.args            |   1 +
 tests/qemuxml2argvdata/pcihole64-q35.args     |   1 +
 tests/qemuxml2argvdata/pcihole64.args         |   1 +
 tests/qemuxml2argvdata/pmu-feature-off.args   |   1 +
 tests/qemuxml2argvdata/pmu-feature.args       |   1 +
 tests/qemuxml2argvdata/ppc-dtb.args           |   1 +
 .../ppc64-usb-controller-legacy.args          |   1 +
 .../ppc64-usb-controller-qemu-xhci.args       |   1 +
 .../ppc64-usb-controller.args                 |   1 +
 tests/qemuxml2argvdata/ppce500-serial.args    |   1 +
 tests/qemuxml2argvdata/pseries-basic.args     |   1 +
 .../pseries-console-virtio.args               |   1 +
 .../pseries-cpu-compat-power9.args            |   1 +
 .../qemuxml2argvdata/pseries-cpu-compat.args  |   1 +
 tests/qemuxml2argvdata/pseries-cpu-exact.args |   1 +
 tests/qemuxml2argvdata/pseries-cpu-le.args    |   1 +
 tests/qemuxml2argvdata/pseries-features.args  |   1 +
 .../qemuxml2argvdata/pseries-hostdevs-1.args  |   1 +
 .../qemuxml2argvdata/pseries-hostdevs-2.args  |   1 +
 .../qemuxml2argvdata/pseries-hostdevs-3.args  |   1 +
 .../pseries-machine-max-cpu-compat.args       |   1 +
 .../pseries-many-buses-1.args                 |   1 +
 .../pseries-many-buses-2.args                 |   1 +
 .../pseries-many-devices.args                 |   1 +
 tests/qemuxml2argvdata/pseries-nvram.args     |   1 +
 .../pseries-panic-missing.args                |   1 +
 .../pseries-panic-no-address.args             |   1 +
 .../pseries-phb-default-missing.args          |   1 +
 .../pseries-phb-numa-node.args                |   1 +
 .../qemuxml2argvdata/pseries-phb-simple.args  |   1 +
 .../pseries-serial-native.args                |   1 +
 .../qemuxml2argvdata/pseries-serial-pci.args  |   1 +
 .../qemuxml2argvdata/pseries-serial-usb.args  |   1 +
 .../qemuxml2argvdata/pseries-usb-default.args |   1 +
 tests/qemuxml2argvdata/pseries-usb-kbd.args   |   1 +
 tests/qemuxml2argvdata/pseries-usb-multi.args |   1 +
 .../pseries-vio-user-assigned.args            |   1 +
 tests/qemuxml2argvdata/pseries-vio.args       |   1 +
 tests/qemuxml2argvdata/q35-acpi-nouefi.args   |   1 +
 tests/qemuxml2argvdata/q35-acpi-uefi.args     |   1 +
 .../q35-default-devices-only.args             |   1 +
 tests/qemuxml2argvdata/q35-multifunction.args |   1 +
 tests/qemuxml2argvdata/q35-noacpi-nouefi.args |   1 +
 .../q35-pci-force-address.args                |   1 +
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |   1 +
 tests/qemuxml2argvdata/q35-pcie.args          |   1 +
 .../q35-pm-disable-fallback.args              |   1 +
 tests/qemuxml2argvdata/q35-pm-disable.args    |   1 +
 tests/qemuxml2argvdata/q35-usb2-multi.args    |   1 +
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |   1 +
 tests/qemuxml2argvdata/q35-usb2.args          |   1 +
 .../q35-virt-manager-basic.args               |   1 +
 tests/qemuxml2argvdata/q35-virtio-pci.args    |   1 +
 tests/qemuxml2argvdata/q35.args               |   1 +
 tests/qemuxml2argvdata/qemu-ns-alt.args       |   1 +
 .../qemu-ns-commandline-ns0.args              |   1 +
 .../qemu-ns-commandline-ns1.args              |   1 +
 .../qemuxml2argvdata/qemu-ns-commandline.args |   1 +
 .../qemu-ns-domain-commandline-ns0.args       |   1 +
 .../qemu-ns-domain-commandline.args           |   1 +
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |   1 +
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |   1 +
 .../reboot-timeout-disabled.args              |   1 +
 .../reboot-timeout-enabled.args               |   1 +
 tests/qemuxml2argvdata/restore-v2-fd.args     |   1 +
 tests/qemuxml2argvdata/restore-v2.args        |   1 +
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |   1 +
 tests/qemuxml2argvdata/riscv64-virt.args      |   1 +
 .../qemuxml2argvdata/s390-panic-missing.args  |   1 +
 .../s390-panic-no-address.args                |   1 +
 tests/qemuxml2argvdata/s390-serial-2.args     |   1 +
 .../qemuxml2argvdata/s390-serial-console.args |   1 +
 tests/qemuxml2argvdata/s390-serial.args       |   1 +
 tests/qemuxml2argvdata/seclabel-dac-none.args |   1 +
 .../seclabel-dynamic-baselabel.args           |   1 +
 .../seclabel-dynamic-labelskip.args           |   1 +
 .../seclabel-dynamic-override.args            |   1 +
 .../seclabel-dynamic-relabel.args             |   1 +
 tests/qemuxml2argvdata/seclabel-dynamic.args  |   1 +
 tests/qemuxml2argvdata/seclabel-none.args     |   1 +
 .../seclabel-static-labelskip.args            |   1 +
 .../seclabel-static-relabel.args              |   1 +
 tests/qemuxml2argvdata/seclabel-static.args   |   1 +
 .../serial-dev-chardev-iobase.args            |   1 +
 .../qemuxml2argvdata/serial-dev-chardev.args  |   1 +
 .../qemuxml2argvdata/serial-file-chardev.args |   1 +
 tests/qemuxml2argvdata/serial-file-log.args   |   1 +
 .../qemuxml2argvdata/serial-many-chardev.args |   1 +
 .../qemuxml2argvdata/serial-pty-chardev.args  |   1 +
 .../serial-spiceport-nospice.args             |   1 +
 tests/qemuxml2argvdata/serial-spiceport.args  |   1 +
 .../qemuxml2argvdata/serial-tcp-chardev.args  |   1 +
 .../serial-tcp-telnet-chardev.args            |   1 +
 .../serial-tcp-tlsx509-chardev-notls.args     |   1 +
 .../serial-tcp-tlsx509-chardev-verify.args    |   1 +
 .../serial-tcp-tlsx509-chardev.args           |   1 +
 .../qemuxml2argvdata/serial-udp-chardev.args  |   1 +
 .../qemuxml2argvdata/serial-unix-chardev.args |   1 +
 tests/qemuxml2argvdata/serial-vc-chardev.args |   1 +
 .../shmem-plain-doorbell.args                 |   1 +
 tests/qemuxml2argvdata/shmem.args             |   1 +
 .../smartcard-controller.args                 |   1 +
 .../smartcard-host-certificates-database.args |   1 +
 .../smartcard-host-certificates.args          |   1 +
 tests/qemuxml2argvdata/smartcard-host.args    |   1 +
 .../smartcard-passthrough-spicevmc.args       |   1 +
 .../smartcard-passthrough-tcp.args            |   1 +
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |   1 +
 tests/qemuxml2argvdata/smbios.args            |   1 +
 tests/qemuxml2argvdata/smp-dies.args          |   1 +
 tests/qemuxml2argvdata/smp.args               |   1 +
 tests/qemuxml2argvdata/sound-device.args      |   1 +
 tests/qemuxml2argvdata/sound.args             |   1 +
 tests/qemuxml2argvdata/sparc-minimal.args     |   1 +
 .../usb-controller-default-q35.args           |   1 +
 .../usb-controller-explicit-q35.args          |   1 +
 .../usb-controller-qemu-xhci.args             |   1 +
 .../qemuxml2argvdata/usb-controller-xhci.args |   1 +
 tests/qemuxml2argvdata/usb-controller.args    |   1 +
 .../usb-hub-autoadd-deluxe.args               |   1 +
 tests/qemuxml2argvdata/usb-hub-autoadd.args   |   1 +
 tests/qemuxml2argvdata/usb-hub.args           |   1 +
 .../qemuxml2argvdata/usb-ich9-autoassign.args |   1 +
 .../qemuxml2argvdata/usb-ich9-companion.args  |   1 +
 .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |   1 +
 .../qemuxml2argvdata/usb-long-port-path.args  |   1 +
 tests/qemuxml2argvdata/usb-none.args          |   1 +
 .../usb-piix3-controller.args                 |   1 +
 .../qemuxml2argvdata/usb-port-autoassign.args |   1 +
 tests/qemuxml2argvdata/usb-port-missing.args  |   1 +
 tests/qemuxml2argvdata/usb-ports.args         |   1 +
 tests/qemuxml2argvdata/usb-redir-boot.args    |   1 +
 .../usb-redir-filter-version.args             |   1 +
 tests/qemuxml2argvdata/usb-redir-filter.args  |   1 +
 tests/qemuxml2argvdata/usb-redir.args         |   1 +
 .../qemuxml2argvdata/usb-xhci-autoassign.args |   1 +
 tests/qemuxml2argvdata/usb1-usb2.args         |   1 +
 tests/qemuxml2argvdata/user-aliases-usb.args  |   1 +
 .../vcpu-placement-static.args                |   1 +
 .../video-device-pciaddr-default.args         |   1 +
 tests/qemuxml2argvdata/video-none-device.args |   1 +
 .../video-qxl-device-vgamem.args              |   1 +
 tests/qemuxml2argvdata/video-qxl-device.args  |   1 +
 tests/qemuxml2argvdata/video-qxl-heads.args   |   1 +
 tests/qemuxml2argvdata/video-qxl-noheads.args |   1 +
 .../video-qxl-resolution.args                 |   1 +
 .../video-qxl-sec-device-vgamem.args          |   1 +
 .../video-qxl-sec-device.args                 |   1 +
 .../video-vga-device-vgamem.args              |   1 +
 tests/qemuxml2argvdata/video-vga-device.args  |   1 +
 .../qemuxml2argvdata/video-vga-qxl-heads.args |   1 +
 .../video-virtio-gpu-ccw.args                 |   1 +
 .../video-virtio-gpu-device.args              |   1 +
 .../video-virtio-gpu-sdl-gl.args              |   1 +
 .../video-virtio-gpu-secondary.args           |   1 +
 .../video-virtio-gpu-spice-gl.args            |   1 +
 .../video-virtio-gpu-virgl.args               |   1 +
 tests/qemuxml2argvdata/video-virtio-vga.args  |   1 +
 .../virtio-input-passthrough.args             |   1 +
 tests/qemuxml2argvdata/virtio-input.args      |   1 +
 tests/qemuxml2argvdata/virtio-lun.args        |   1 +
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |   1 +
 .../qemuxml2argvdata/virtio-rng-default.args  |   1 +
 tests/qemuxml2argvdata/virtio-rng-egd.args    |   1 +
 .../qemuxml2argvdata/virtio-rng-multiple.args |   1 +
 tests/qemuxml2argvdata/virtio-rng-random.args |   1 +
 tests/qemuxml2argvdata/vmcoreinfo.args        |   1 +
 tests/qemuxml2argvdata/watchdog-device.args   |   1 +
 tests/qemuxml2argvdata/watchdog-dump.args     |   1 +
 .../qemuxml2argvdata/watchdog-injectnmi.args  |   1 +
 tests/qemuxml2argvdata/watchdog.args          |   1 +
 tests/qemuxml2argvdata/x86-kvm-32-on-64.args  |   1 +
 tests/qemuxml2argvtest.c                      |  23 +-
 tests/vircryptotest.c                         |   5 -
 611 files changed, 710 insertions(+), 591 deletions(-)

-- 
2.31.1

On a Wednesday in 2021, Peter Krempa wrote:
>We are at the point where we can remove all the code to pass secrets
>(RBD/iSCSI authentication passwords) on the commandline in plaintext
>as all supported versions of qemu now support -object secret and the
>corresponding methods to pass the secrets securely.
>
>Peter Krempa (12):
>  util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)
>  qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET
>  qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET
>  qemu: domain: Remove qemuDomainSupportsEncryptedSecret
>  qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET
>  qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET
>  qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code
>  qemu: command: Remove qemuBuildGeneralSecinfoURI
>  qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps
>  qemu: Simplify qemuDomainSecretInfo
>  qemu: domain: Rename secrets setup function
>  qemu: command: Remove qemuBuildRBDSecinfoURI
>
> src/libvirt_private.syms                      |   1 -
> src/qemu/qemu_backup.c                        |   2 +-
> src/qemu/qemu_block.c                         |  40 ++-
> src/qemu/qemu_capabilities.c                  |   6 +-
> src/qemu/qemu_capabilities.h                  |   4 +-
> src/qemu/qemu_command.c                       | 184 +++---------
> src/qemu/qemu_domain.c                        | 274 ++++--------------
[...]
> tests/qemuxml2argvdata/watchdog.args          |   1 +
> tests/qemuxml2argvdata/x86-kvm-32-on-64.args  |   1 +
> tests/qemuxml2argvtest.c                      |  23 +-
> tests/vircryptotest.c                         |   5 -
> 611 files changed, 710 insertions(+), 591 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano