- Devel - libvirt List Archives

[PATCH 0/4] lxc: Add suport to network indexes for LXC 3.X
by Julio Faracco 28 Jan '20

28 Jan '20

This series implement support for network syntax settings for LXC 3.X. Now, indexes are part of the settings to define network interfaces. Each interface has its own index. The old style uses 'type' tag to differentiate each interface and with this, it could use one single structure. Now, network interfaces are a single array with interface pointers. Old: lxc.network.type = veth lxc.network.flags = up lxc.network.link = virbr0 New: lxc.net.0.type = veth lxc.net.0.flags = up lxc.net.0.link = virbr0 Julio Faracco (4): lxc: refactor lxcNetworkParseData pointers to use new structures. lxc: add LXC version 3 network parser. lxc: remove domain definition from lxc network struct tests: update LXC config dataset to support V3 indexes src/lxc/lxc_native.c | 183 +++++++++++------- .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-simple-v3.config | 18 +- 5 files changed, 145 insertions(+), 92 deletions(-) -- 2.20.1

2 9

[libvirt PATCH v2 0/6] <interface> <teaming> element (was: virtio failover / vfio auto-plug-on-migrate)
by Laine Stump 28 Jan '20

28 Jan '20

V1: https://www.redhat.com/archives/libvir-list/2020-January/msg00813.html This all used different names in V1 - in that incarnation the configuration was done using "failover" and "backupAlias" attributes added to the <driver> subelement of <interface>. But the resulting code was cumbersome and had little bits scattered all over the place due to needing it in both hostdev and interface parsing/formatting. In his review of V1, danpb suggesting just adding a new subelement for this configuration to free ourselves from the constraints of <driver> parsing/formatting. This ended up dramatically simplifying the code (hence the lack of V1's refactoring patches in V2, and a decrease in patch count from 12 to 6). During further discussion in email and on IRC, we decided that naming the element <failover> was too limiting, as it implied the behavior of what is, to libvirt, just two network devices that should be teamed/bonded together - it's completely up to the hypervisor and guest what is done with this information. In light of that, we decided to name the new subelement <teaming>, and to specify the two interfaces as "persistent" (an interface that will always remain plugged in) and "transient" (an interface that may be periodically unplugged (during migration, in the case of QEMU). So the virtio device will have <teaming type='persistent'/> and the hostdev device will have <teaming type='transient' persistent='ua-myvirtio'/> (note that the persistent interface must have <alias name='ua-myvirtio'/>) Given this config, libvirt will add "failover=on" to the device commandline arg for the virtio device, and "failover_pair_id=ua-myvirtio" to the arg for the hostdev device (and when a migration is requested, it will notice if there is a hostdev that has <teaming type='transient'/> set, and will allow the migration in this case, but still disallow migrations of domains with normal hostdevs). In response to these extra commandline options, QEMU will set some extra capabilities in the virtio device PCI capabilities data, and will also automatically unplug/re-plug the hostdev device before and after migration. In the guest, the virtio-net driver will notice the extra PCI capabilities and use this as a clue that it should search for another device with matching MAC address (NB: the guest driver requires the two devices to have matching MAC addresses) to join into a bond with the virtio-net device. This bond is hard-wired to always prefer the hostdev device whenever it is present, and use the virtio device as backup when the hostdev is unplugged. ---- As mentioned in a followup to the V1 cover letter, there is a regression in QEMU 4.2.0 that causes QEMU to segv when a hostdev is unplugged. That bug is fixed with this upstream QEMU patch: https://git.qemu.org/?p=qemu.git;a=commitdiff;h=0446f8121723b134ca1d1ed0b73… Be sure to use a qemu build with this patch applied, or you may not even be able to start the guest! Also we've found that the DEVICE_DELETED event is never sent to libvirt when one of these hostdevs is manually unplugged, meaning that libvirt keeps the device marked as "in-use", and it therefore cannot be re-plugged to the guest until after a complete guest "power cycle". AFAIK there isn't yet a fix for that bug, so don't expect manual unplug of the device to work. Laine Stump (6): qemu: add capabilities flag for failover feature conf: parse/format <teaming> subelement of <interface> qemu: support interface <teaming> functionality qemu: allow migration with assigned PCI hostdev if <teaming> is set qemu: add wait-unplug to qemu migration status enum docs: document <interface> subelement <teaming> docs/formatdomain.html.in | 100 ++++++++++++++++++ docs/news.xml | 28 +++++ docs/schemas/domaincommon.rng | 19 ++++ src/conf/domain_conf.c | 45 ++++++++ src/conf/domain_conf.h | 14 +++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 9 ++ src/qemu/qemu_domain.c | 36 ++++++- src/qemu/qemu_migration.c | 53 +++++++++- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../net-virtio-teaming-network.xml | 37 +++++++ .../qemuxml2argvdata/net-virtio-teaming.args | 40 +++++++ tests/qemuxml2argvdata/net-virtio-teaming.xml | 50 +++++++++ tests/qemuxml2argvtest.c | 4 + .../net-virtio-teaming-network.xml | 51 +++++++++ .../qemuxml2xmloutdata/net-virtio-teaming.xml | 66 ++++++++++++ tests/qemuxml2xmltest.c | 6 ++ 22 files changed, 563 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-network.xml create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.xml create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml create mode 100644 tests/qemuxml2xmloutdata/net-virtio-teaming.xml -- 2.24.1

3 13

[PATCH v2 0/9] virsh: secret: Improve handling of secret value
by Peter Krempa 28 Jan '20

28 Jan '20

Improve handling of secrets for security. 'secret-passwd' command was dropped in favor of '--interactive' and few other changes requested at review. Peter Krempa (9): virsh: Work around virSecretFree quirks virsh: secret: Refactor cleanup in cmdSecretSetValue virsh: secret: Refactor cleanup in cmdSecretGetValue virsh: secret: Add --plain flag for secret-get-value virsh: secret: Add --file 'filename' support for secret-set-value virsh: secret: Print warning that passing secret on command-line is insecure virsh: secret: Add --plain switch for secret-set-value tools: virsh: Add --interactive flag for secret-set-value command docs: secret: Unify and sanitize examples on how to set secret value build-aux/syntax-check.mk | 2 +- docs/formatsecret.html.in | 88 +++++++++++++-------- docs/manpages/virsh.rst | 20 ++++- tools/virsh-completer-secret.c | 3 +- tools/virsh-secret.c | 140 ++++++++++++++++++++++++--------- tools/virsh-util.c | 11 +++ tools/virsh-util.h | 5 ++ 7 files changed, 195 insertions(+), 74 deletions(-) -- 2.24.1

3 21

[libvirt] [RFC PATCH 00/16] qemu: checkpoint: Add support for deleting checkpoints accross snapshots
by Peter Krempa 28 Jan '20

28 Jan '20

Posted as RFC because qemu probably doesn't reopen backing images for bitmap operations resulting in: $ virsh checkpoint-delete vm --checkpointname a error: Failed to delete checkpoint a error: internal error: unable to execute QEMU command 'transaction': Bitmap 'a' is readonly and cannot be modified Unfortunately this can't be done manually because 'blockdev-reopen' is still experimental. Peter Krempa (16): qemu: checkpoint: Store whether deleted checkpoint is current in a variable qemu: checkpoint: split out checkpoint deletion bitmaps qemu: checkpoint: rename disk->chkdisk in qemuCheckpointDiscardBitmaps qemu: checkpoint: rename disk->chkdisk in qemuCheckpointAddActions qemu: checkpoint: Use disk definition directly when creating checkpoint qemu: checkpoint: tolerate missing disks on checkpoint deletion qemu: domain: Remove unused qemuDomainDiskNodeFormatLookup qemu: checkpoint: Introduce helper to find checkpoint disk definition in parents qemu: checkpoint: Extract calculation of bitmap merging for checkpoint deletion tests: qemublock: Add test for checkpoint deletion bitmap merge tests: qemublock: Add few more test cases for checkpoint deletion tests: qemublock: Add synthetic snapshot+checkpoint test data qemu: checkpoint: Introduce support for deleting checkpoints accross snapshots tests: qemublock: Add checkpoint deletion test for deep backing chain tests: qemublock: Add checkpoint deletion tests for some special cases qemu: checkpoint: Track and relabel images for bitmap merging src/qemu/qemu_checkpoint.c | 329 +++++-- src/qemu/qemu_checkpoint.h | 9 + src/qemu/qemu_domain.c | 14 - src/qemu/qemu_domain.h | 3 - tests/qemublocktest.c | 102 +++ .../snapshots-synthetic-checkpoint.json | 827 ++++++++++++++++++ .../bitmap/snapshots-synthetic-checkpoint.out | 13 + .../checkpointdelete/basic-current-out.json | 29 + .../basic-intermediate1-out.json | 22 + .../basic-intermediate2-out.json | 22 + .../basic-intermediate3-out.json | 22 + .../checkpointdelete/basic-noparent-out.json | 9 + .../snapshots-current-out.json | 29 + .../snapshots-intermediate1-out.json | 24 + .../snapshots-intermediate2-out.json | 62 ++ .../snapshots-intermediate3-out.json | 61 ++ .../snapshots-noparent-out.json | 27 + ...hots-synthetic-checkpoint-current-out.json | 29 + ...ynthetic-checkpoint-intermediate1-out.json | 31 + ...ynthetic-checkpoint-intermediate2-out.json | 34 + ...ynthetic-checkpoint-intermediate3-out.json | 61 ++ ...ots-synthetic-checkpoint-noparent-out.json | 27 + 22 files changed, 1680 insertions(+), 106 deletions(-) create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.json create mode 100644 tests/qemublocktestdata/bitmap/snapshots-synthetic-checkpoint.out create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/basic-noparent-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-noparent-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-current-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate1-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate2-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-intermediate3-out.json create mode 100644 tests/qemublocktestdata/checkpointdelete/snapshots-synthetic-checkpoint-noparent-out.json -- 2.24.1

2 33

[libvirt PATCH 00/32] the gnulib saga: revenge of the gnus
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

We currently have 25 gnulib modules in bootstrap.conf and after this series we're down to 7. Except this is a lie, because we've been failing to count the indirect dependencies, so after this series, libvirt is actually pulling in 41 modules. Still, that's better than the 115 modules we indirectly use before this series :-) I have actually eliminated the remaining modules too, but I'm having trouble with the event loop impl in the RPC client on Windows that I'm still debugging. I'll poist the remaining patches once I've figured out that problem. Daniel P. Berrangé (32): tests: stop setting $SHELL env variable util: add a virArchFromHost() impl for Windows util: add API for reading password from the console src: remove usage of strchrnul function build: generate configmake.h in root directory util: use getgrouplist() directly instead of mgetgroups tools: replace wcwidth() with g_unichar_* APIs src: remove unused sys/utsname.h includes util: explicitly include windows.h storage: remove use of stat-time.h headers src: implement APIs for passing FDs over UNIX sockets rpc: conditionalize signal handling src: only import sys/uio.h when journald is built src: replace mkdir() with g_mkdir() m4: disable polkit build on Windows util: conditionalize more of virCommand on WIN32 src: remove all traces of Cygwin support util: conditionalize virProcess APIs on Windows src: conditionalize use of net/if.h configure: add check for sys/ioctl.h src: conditionalize use of S_ISSOCK macro configure: request system specific extensions src: stop using O_DIRECTORY in resctrl src: ensure O_CLOEXEC is defined on Windows src: conditionalize use of F_DUPFD_CLOEXEC src: conditionalize use of O_DIRECT src: conditionalize use of O_BINARY src: conditionalize use of chown & stat constants src: convert all code to use virsocket.h tests: conditionalize use of SIGPIPE src: conditionalize EAI_ADDRFAMILY bootstrap: remove 18 more gnulib modules Makefile.am | 44 ++++++++ bootstrap.conf | 36 ------ build-aux/syntax-check.mk | 2 +- configure.ac | 35 +++--- m4/virt-compile-pie.m4 | 2 +- m4/virt-polkit.m4 | 4 + m4/virt-win-common.m4 | 8 +- m4/virt-win-cygwin.m4 | 32 ------ m4/virt-win-symbols.m4 | 4 +- m4/virt-win-windres.m4 | 4 +- m4/virt-xdr.m4 | 9 +- po/POTFILES.in | 1 - src/Makefile.am | 8 +- src/admin/Makefile.inc.am | 1 - src/conf/network_conf.c | 2 - src/esx/esx_util.c | 3 +- src/esx/esx_util.h | 1 - src/internal.h | 10 ++ src/libvirt-domain.c | 2 + src/libvirt.c | 9 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 2 - src/locking/Makefile.inc.am | 1 - src/logging/Makefile.inc.am | 1 - src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 3 - src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/openvz/openvz_conf.c | 4 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_monitor.c | 3 +- src/qemu/qemu_monitor_json.c | 4 +- src/remote/qemu_protocol.x | 1 - src/remote/remote_protocol.x | 2 +- src/rpc/Makefile.inc.am | 3 - src/rpc/genprotocol.pl | 2 +- src/rpc/virnetclient.c | 33 ++++-- src/rpc/virnetdaemon.c | 35 +++++- src/rpc/virnetdaemon.h | 4 + src/rpc/virnetprotocol.x | 2 +- src/rpc/virnetsocket.c | 42 ++++--- src/security/security_dac.c | 4 + src/security/security_manager.c | 2 + src/security/security_selinux.c | 16 +-- src/storage/storage_util.c | 24 +++- src/util/virarch.c | 52 ++++++++- src/util/virarptable.c | 1 - src/util/vircgroup.c | 10 +- src/util/vircommand.c | 165 +++++++++++++++++----------- src/util/virdnsmasq.c | 9 +- src/util/virfdstream.c | 13 +-- src/util/virfile.c | 58 ++++++++-- src/util/virhostcpu.c | 1 - src/util/virhostmem.c | 1 - src/util/virlog.c | 8 +- src/util/virnetdev.c | 1 - src/util/virnetdev.h | 4 +- src/util/virnetdevbridge.c | 8 +- src/util/virnetdevip.c | 4 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 3 +- src/util/virnetlink.c | 3 +- src/util/virprocess.c | 103 +++++++++++++---- src/util/virresctrl.c | 2 +- src/util/virsocket.c | 142 +++++++++++++++++++++++- src/util/virsocket.h | 6 +- src/util/virsocketaddr.c | 2 - src/util/virsocketaddr.h | 20 +--- src/util/virsysinfo.c | 14 ++- src/util/virsystemd.c | 9 +- src/util/virutil.c | 76 +++++++++---- src/util/virutil.h | 2 + src/util/virxdrdefs.h | 12 +- src/vbox/vbox_MSCOMGlue.c | 6 +- tests/Makefile.am | 3 - tests/libxlmock.c | 2 +- tests/nsstest.c | 3 +- tests/testutils.c | 2 +- tests/virauthconfigtest.c | 2 + tests/virkeyfiletest.c | 2 + tests/virlockspacetest.c | 4 +- tests/virnetmessagetest.c | 2 + tests/virnetsockettest.c | 3 +- tests/virnettlscontexttest.c | 3 +- tests/virnettlshelpers.c | 1 - tests/virnettlssessiontest.c | 3 +- tests/virportallocatormock.c | 5 +- tests/virtestmock.c | 9 +- tests/virtimetest.c | 2 + tests/viruritest.c | 2 + tests/vshtabletest.c | 8 +- tools/nss/libvirt_nss.c | 7 +- tools/virsh-domain.c | 46 +++++++- tools/virt-login-shell.c | 6 +- tools/vsh-table.c | 2 +- tools/vsh.c | 12 +- 101 files changed, 859 insertions(+), 452 deletions(-) delete mode 100644 m4/virt-win-cygwin.m4 -- 2.24.1

2 49

[PATCH 0/3] Trivial fixes
by Andrea Bolognani 27 Jan '20

27 Jan '20

Pushed as - wait for it - trivial. Andrea Bolognani (3): docs: Fix link to virt-qemu-run(1) qemu_shim: Fix typos qemu_shim: Update temporary directory template docs/manpages/index.rst | 2 +- src/qemu/qemu_shim.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.24.1

1 3

[libvirt] [PATCH v4 0/6] introduce support for an embedded driver mode
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

This is a followup to: v1: https://www.redhat.com/archives/libvir-list/2019-May/msg00467.html v2: https://www.redhat.com/archives/libvir-list/2019-December/msg00050.html v3: https://www.redhat.com/archives/libvir-list/2019-December/msg01364.html This series implements support for an embedded driver mode for libvirt, with initial support in the QEMU and secrets drivers. In this mode of operation, the driver stores all its config and state under a private directory tree. See the individual patches for the illustrated directory hierarchy used. The intent of this embedded mode is to suit cases where the application is using virtualization as a building block for some functionality, as opposed to running traditional "full OS" builds. The long time posterchild example would be libguestfs, while a more recent example could be Kata containers. The general principal in enabling this embedded mode is that the functionality available should be identical to that seen when the driver is running inside libvirtd. This is achieved by loading the exact same driver .so module as libvirtd would load, and simply configuring it with a different directory layout. The result of this is that when running in embedded mode, the driver can still talk to other secondary drivers running inside libvirtd if desired. This is useful, for example, to connect a VM to the default virtual network. The secondary drivers can be made to operate in embedded mode as well, however, this will require some careful consideration for each driver to ensure they don't clash with each other. Thus in this series only the secret driver is enabled for embedded mode. This is required to enable use of VMs with encrypted disks, or authenticated network block storage. In this series we introduce a new command line tool 'virt-qemu-run' which is a really simple tool for launching a VM in embedded mode. I'm not entirely sure whether we should provide this as an official supported tool in this way, or merely put it into the 'examples' directory as demo-ware. With testing of the virt-qemu-run tool we can immediately see what the next important thing to tackle is: performance. We have not really cared too much about the startup performance of libvirtd as this is a one time cost when the mgmt application connects. We did none the less cache capabilities because probing caps for 30 QEMU binaries takes a long time. Even with this caching it takes an unacceptably long time to start a VM in embedded mode. About 100 ms to open the embedded QEMU driver, assuming pre-cached capabilies - ~2 seconds if not cached and all 30 QEMU targets are present. Then about 300 ms to actually start the QEMU guest. IOW, about 400 ms to get QEMU running. NB this is measuring time from launching the virt-run-qemu program, to the point at which the API call 'virDomainCreate' returns control. This has both libvirt & QEMU overhead in & I don't have clear figures to distinguish, but I can see a 40 ms delay between issuing the 'qmp_capabilities' call and getting a reply, which is QEMU startup overead. This is a i440fx based QEMU with a general purpose virtio-pci config (disk, net, etc) tyupical for running a full OS. I've not tried any kind of optimized QEMU config with microvm. I've already started on measuring & optimizing & identified several key areas that can be addressed, but it is all ultimately about not doing work before we need the answers from that work (which often means we will never do the work at all). For example, we shouldn't probe all 30 QEMU's upfront. If the app is only going to create an x86_64 KVM guest we should only care about that 1 QEMU. This is painful because parsing any guest XML requires a virCapsPtr which in turn causes probing of every QEMU binary. I've got in progress patches to eliminate virCapsPtr almost entirely and work directly with the virQEMUCapsPtr instead. It is possible we'll want to use a different file format for storing the cached QEMU capabilities, and the CPU feature/model info. Parsing this XML is a non-negligible time sink. A binary format is likely way quicker, especially if its designed to be just mmap'able for direct read. To be investigated... We shouldn't probe for whether host PM suspend is possible unless someone wants that info, or tries to issue that API call. After starting QEMU we spend 150-200 ms issuing a massive number of qom-get calls to check whether QEMU enabled each individual CPU feature flag. We only need this info if someone asks for the live XML or we intend to live migrate etc. So we shouldn't issue these qom-get calls in the "hot path" of QEMU startup. It can be done later in a non-time critical point. Also the QEMU API for this is horribly inefficient to require so many qom-get calls. There's more but I won't talk about it now. Suffice to say that I think we can get libvirt overhead down to less than 100 ms fairly easily and probably even down to less than 50 ms without much effort. The exact figure will depend on what libvirt features you want enabled, and how much work we want/need to put into optimization. We'll want to fix the really gross mistakes & slow downs, but we'll want guidance from likely users as to their VM startup targets to decide how much work needs investing. This optimization will ultimately help non-embedded QEMU mode too, making it faster to respond & start. Changed in v4: - Prevent opening the embedded drivers many times with different root paths - Add docs warning about not running APIs from the event loop thread Changed in v3: - Rebased to master - Merge some simple acked patches Changed in v2: - Use a simplified directory layout for embedded mode. Previously we just put a dir prefix onto the normal paths. This has the downside that the embedded drivers paths are needlessly different for privileged vs unprivileged user. It also results in very long paths which can be a problem for the UNIX socket name length limits. - Also ported the secret driver to support embedded mode - Check to validate that the event loop is registered. - Add virt-qemu-run tool for embedded usage. - Added docs for the qemu & secret driver explaining embedded mode Daniel P. Berrangé (6): util: add helper API for getting URI parameters libvirt: pass a directory path into drivers for embedded usage libvirt: support an "embed" URI path selector for opening drivers qemu: add support for running QEMU driver in embedded mode secrets: add support for running secret driver in embedded mode qemu: introduce a new "virt-qemu-run" program build-aux/syntax-check.mk | 2 +- docs/Makefile.am | 5 + docs/drivers.html.in | 1 + docs/drvqemu.html.in | 99 ++++++++ docs/drvsecret.html.in | 82 ++++++ docs/manpages/index.rst | 1 + docs/manpages/virt-qemu-run.rst | 114 +++++++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/driver-state.h | 2 + src/driver.h | 2 + src/interface/interface_backend_netcf.c | 7 + src/interface/interface_backend_udev.c | 7 + src/libvirt.c | 93 ++++++- src/libvirt_internal.h | 4 +- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 7 + src/lxc/lxc_driver.c | 8 + src/network/bridge_driver.c | 7 + src/node_device/node_device_hal.c | 7 + src/node_device/node_device_udev.c | 7 + src/nwfilter/nwfilter_driver.c | 7 + src/qemu/Makefile.inc.am | 13 + src/qemu/qemu_conf.c | 45 +++- src/qemu/qemu_conf.h | 8 +- src/qemu/qemu_driver.c | 34 ++- src/qemu/qemu_process.c | 15 +- src/qemu/qemu_shim.c | 322 ++++++++++++++++++++++++ src/remote/remote_daemon.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 53 +++- src/storage/storage_driver.c | 7 + src/util/viruri.c | 16 ++ src/util/viruri.h | 2 + src/vz/vz_driver.c | 7 + tests/domaincapstest.c | 2 +- tests/testutilsqemu.c | 3 +- 37 files changed, 967 insertions(+), 28 deletions(-) create mode 100644 docs/drvsecret.html.in create mode 100644 docs/manpages/virt-qemu-run.rst create mode 100644 src/qemu/qemu_shim.c -- 2.23.0

3 11

[libvirt PATCH 0/4] fix recent commits
by Ján Tomko 27 Jan '20

27 Jan '20

Ján Tomko (4): docs: fix virt-qemu-run man page docs: fix since version in driver documentation qemu_shim: cosmetic fixes qemu: snapshot: go through cleanup on error docs/drvqemu.html.in | 4 ++-- docs/drvsecret.html.in | 2 +- docs/manpages/virt-qemu-run.rst | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_shim.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) -- 2.21.0

3 6

[libvirt] [PATCH] gitdm: Add missing entries
by Andrea Bolognani 27 Jan '20

27 Jan '20

A few new companies and individuals contributed to libvirt since the last time the gitdm configuration was updated. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/gitdm/aliases | 1 + docs/gitdm/companies/others | 3 +++ docs/gitdm/groups/unaffiliated | 3 +++ 3 files changed, 7 insertions(+) diff --git a/docs/gitdm/aliases b/docs/gitdm/aliases index c3c837f89f..83637bdff9 100644 --- a/docs/gitdm/aliases +++ b/docs/gitdm/aliases @@ -2,6 +2,7 @@ "jdenemar redhat com" jdenemar(a)redhat.com "pkrempa@redhat st.com" pkrempa(a)redhat.com +berrange(a)localhost.localdomain berrange(a)redhat.com jyang@redhat jyang(a)redhat.com wangjie88.huawei.com wangjie88(a)huawei.com diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others index 43f2cc116d..affbaf3ea2 100644 --- a/docs/gitdm/companies/others +++ b/docs/gitdm/companies/others @@ -1,4 +1,5 @@ 6wind.com 6WIND +cmss.chinamobile.com China Mobile active.by ActiveCloud aero.org Aerospace akamai.com Akamai @@ -37,6 +38,7 @@ hitachi.com Hitachi hoster-ok.com hoster-ok.com hp.com HP huawei.com Huawei +hygon.cn Hygon inktank.com Inktank Storage intel.com Intel intellilink.co.jp NTT DATA INTELLILINK @@ -60,6 +62,7 @@ nicira.com Nicira nimboxx.com NIMBOXX novell.com Novell ntt.co.jp NTT Group +nutanix.com Nutanix ohmu.fi OHMU open-minds.org OpenThink oracle.com Oracle diff --git a/docs/gitdm/groups/unaffiliated b/docs/gitdm/groups/unaffiliated index f52338c736..70e82ba894 100644 --- a/docs/gitdm/groups/unaffiliated +++ b/docs/gitdm/groups/unaffiliated @@ -5,6 +5,7 @@ 126.com gmail.com gmx.com +gmx.de googlemail.com hotmail.com mail.ru @@ -24,6 +25,7 @@ adam(a)pandorasboxen.com agx(a)sigxcpu.org alexander.nusov(a)nfvexpress.com andres(a)lagarcavilla.org +andrew(a)interpretmath.pw asad.saeed(a)acidseed.com atler(a)pld-linux.org benoar(a)dolka.fr @@ -40,6 +42,7 @@ exo(a)tty.sk fritz(a)fritz-elfert.de gene(a)czarc.net gordon(a)dragonsdawn.net +gregor(a)kopka.net heathpetersen(a)kandre.com ibaldo(a)adinet.com.uy igor47(a)moomers.org -- 2.24.1

2 2

[PATCH] qemu: fix linking virt-qemu-run on some distros
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

Debian/Ubuntu linkers are more strict that other distros requiring glib to be linked explicitly. macOS needs -export-dynamic instead of -Wl,--export-dynamic Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix for Debian/Ubuntu/macOS src/qemu/Makefile.inc.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index c6b04c3217..d04a87e659 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -253,6 +253,9 @@ bin_PROGRAMS += virt-qemu-run virt_qemu_run_SOURCES = $(QEMU_SHIM_SOURCES) -virt_qemu_run_LDADD = libvirt.la -virt_qemu_run_LDFLAGS = -Wl,--export-dynamic +virt_qemu_run_LDADD = \ + libvirt.la \ + $(GLIB_LIBS) \ + $(NULL) +virt_qemu_run_LDFLAGS = -export-dynamic endif WITH_QEMU -- 2.24.1

1 0

[PATCH] bhyve: add 'root' parameter to driver initializer
by Daniel P. Berrangé 27 Jan '20

27 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a FreeBSD build fix src/bhyve/bhyve_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 5b8fba7467..713301399e 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1175,11 +1175,18 @@ bhyveStateCleanup(void) static int bhyveStateInitialize(bool privileged, + const char *root, virStateInhibitCallback callback G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { bool autostart = true; + if (root != NULL) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Driver does not support embedded mode")); + return -1; + } + if (!privileged) { VIR_INFO("Not running privileged, disabling driver"); return VIR_DRV_STATE_INIT_SKIPPED; -- 2.24.1

1 0

[PATCH 00/21] qemu: Validate machine type and clean up test suite
by Peter Krempa 27 Jan '20

27 Jan '20

I was experimenting with a qemu-5.0 feature and figured out that qemu-5.0 will drop support for machine types prior to 'pc-1.0'. What was unexpected though is that I've figured it out as some very strange and seemingly unrelated changes happened in the test output of the 'latest' tests while bumping the caps data. It turned out that the CPU driver now actually takes data from the machine type and since the machine type was no longer present the test data result has changed. This lead me down a rabbit hole of trying to make our test suite more robust and such changes easier to debug. The result is these 21 patches that fix numerous tests, clean up some stale and downstream machine types and in the end add validation of the machine type and harden the testsuite to use it properly. Note that 30k lines of the diffstat is just the qemu-5.0 capabilities data so that we can verify that nothing changes during the capbility upgrade. Some of the yak-shaving done here is incomplete though as I've figured out we have a bunch of network-device related tests which are not enabled in the xml->argv test suite, but also are not easy to enable. Peter Krempa (21): tests: qemuxml2argv: Use 64 bit qemu binary and 1.5 machine type in 'disk-cache' case tests: qemuxml2xml: Modernize 'disk-cache' test tests: qemuxml2argv: Modernize tpm-passthrough tests tests: qemuxml: Fix and enable default-video-type* tests tests: qemu: Unify fake machine types filled in for KVM and TCG caps of x86_64 tests: qemuxml2argv: Use existing machine type for 'numatune-distances' case tests: qemuxml2argv: Remove downstream machine type in 'controller-order' case tests: qemuxml2argv: Use existing non-virt machine in 'aarch64-gic-not-virt' tests: qemuxml2argv: Use proper replacement for 'pc-i440fx-wily' machine tests: qemuxml: Use existing machine type in 'iothreads-virtio-scsi-ccw' case tests: qemu: Add machine types used by the test code to fake capabilities qemu: domain: Validate that machine type is supported by qemu qemu: capabilities: Extract code from virQEMUCapsStripMachineAliases qemu: capabilities: Replace aliased machine type by copy of the canonical machine qemu: capabilities: Add accessor to qemu caps machine types presence tests: qemu: Don't add fake machine types when testing with real data tests: qemuxml: Purge prehistoric machine type 'pc-0.13' from "latest" tests tests: Add caps for upcoming qemu-5.0 tests: qemuxml: Remove prehistoric machine types from legacy tests tests: qemuxml2xml: Remove prehistoric machine types from legacy tests tests: qemu: Remove prehistoric machine types from faked data tests src/qemu/qemu_capabilities.c | 50 +- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 3 + src/qemu/qemu_domain.c | 8 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 181 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 191 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 181 + .../caps_5.0.0.x86_64.replies | 27179 ++++++++++++++++ .../caps_5.0.0.x86_64.xml | 2697 ++ .../qemuxml2argvdata/aarch64-gic-not-virt.xml | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 1 + .../aarch64-virt-headless.aarch64-latest.args | 1 + .../channel-unix-guestfwd.x86_64-latest.args | 1 + .../console-virtio-unix.x86_64-latest.args | 1 + tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/controller-order.xml | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 1 + .../default-qemu-host-arch.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 35 + .../default-video-type-aarch64.xml | 1 - ...default-video-type-ppc64.ppc64-latest.args | 35 + .../default-video-type-ppc64.xml | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 34 + .../default-video-type-riscv64.xml | 1 - ...default-video-type-s390x.s390x-latest.args | 34 + .../default-video-type-s390x.xml | 3 +- .../default-video-type-x86_64-caps-test-0.xml | 3 +- .../default-video-type-x86_64-caps-test-1.xml | 3 +- .../disk-aio.x86_64-latest.args | 1 + ...-backing-chains-noindex.x86_64-latest.args | 1 + .../disk-cache.x86_64-1.5.3.args | 4 +- .../disk-cache.x86_64-2.12.0.args | 4 +- .../disk-cache.x86_64-2.6.0.args | 4 +- .../disk-cache.x86_64-2.7.0.args | 4 +- .../disk-cache.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/disk-cache.xml | 4 +- .../disk-cdrom-bus-other.x86_64-latest.args | 1 + ...m-empty-network-invalid.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-tray.xml | 2 +- .../disk-cdrom.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +- .../disk-copy_on_read.x86_64-2.12.0.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-copy_on_read.xml | 2 +- .../qemuxml2argvdata/disk-detect-zeroes.args | 2 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-detect-zeroes.xml | 2 +- tests/qemuxml2argvdata/disk-discard.args | 2 +- tests/qemuxml2argvdata/disk-discard.xml | 2 +- .../disk-error-policy.x86_64-latest.args | 1 + .../disk-floppy.x86_64-latest.args | 1 + tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/disk-ioeventfd.xml | 2 +- .../disk-network-gluster.x86_64-latest.args | 1 + .../disk-network-iscsi.x86_64-latest.args | 1 + .../disk-network-nbd.x86_64-latest.args | 1 + .../disk-network-rbd.x86_64-latest.args | 1 + .../disk-network-sheepdog.x86_64-latest.args | 1 + ...isk-network-source-auth.x86_64-latest.args | 1 + .../disk-network-tlsx509.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 1 + .../disk-readonly-disk.x86_64-latest.args | 1 + .../disk-scsi-device-auto.x86_64-latest.args | 1 + .../disk-scsi.x86_64-latest.args | 1 + .../disk-shared.x86_64-latest.args | 1 + ...irtio-scsi-reservations.x86_64-latest.args | 1 + .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/event_idx.args | 2 +- tests/qemuxml2argvdata/event_idx.xml | 2 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- .../floppy-drive-fat.x86_64-latest.args | 1 + .../fs9p-ccw.s390x-latest.args | 1 + .../qemuxml2argvdata/fs9p.x86_64-latest.args | 1 + .../genid-auto.x86_64-latest.args | 1 + .../qemuxml2argvdata/genid.x86_64-latest.args | 1 + ...egl-headless-rendernode.x86_64-latest.args | 1 + .../graphics-egl-headless.x86_64-latest.args | 1 + ...pice-gl-auto-rendernode.x86_64-latest.args | 1 + ...graphics-vnc-tls-secret.x86_64-latest.args | 1 + .../graphics-vnc-tls.x86_64-latest.args | 1 + ...tdev-mdev-display-ramfb.x86_64-latest.args | 1 + ...play-spice-egl-headless.x86_64-latest.args | 1 + ...ev-display-spice-opengl.x86_64-latest.args | 1 + ...isplay-vnc-egl-headless.x86_64-latest.args | 1 + ...ostdev-mdev-display-vnc.x86_64-latest.args | 1 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 1 + ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 1 + .../hugepages-nvdimm.x86_64-latest.args | 1 + .../hyperv-off.x86_64-latest.args | 1 + .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 1 + .../intel-iommu-caching-mode.xml | 3 + ...ntel-iommu-device-iotlb.x86_64-latest.args | 1 + .../intel-iommu-device-iotlb.xml | 3 + .../intel-iommu-eim.x86_64-latest.args | 1 + tests/qemuxml2argvdata/intel-iommu-eim.xml | 3 + .../intel-iommu.x86_64-2.6.0.args | 1 + .../intel-iommu.x86_64-latest.args | 1 + tests/qemuxml2argvdata/intel-iommu.xml | 3 + tests/qemuxml2argvdata/interface-driver.xml | 2 +- .../iommu-smmuv3.aarch64-latest.args | 1 + ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- .../iothreads-virtio-scsi-ccw.xml | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 1 + .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-default-hugepage.xml | 2 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 1 + ...ry-hotplug-nvdimm-align.x86_64-latest.args | 1 + ...ry-hotplug-nvdimm-label.x86_64-latest.args | 1 + ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 1 + ...hotplug-nvdimm-readonly.x86_64-latest.args | 1 + .../memory-hotplug-nvdimm.x86_64-latest.args | 1 + .../mlock-off.x86_64-latest.args | 1 + .../mlock-on.x86_64-latest.args | 1 + tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- tests/qemuxml2argvdata/net-coalesce.xml | 2 +- tests/qemuxml2argvdata/net-mtu.xml | 2 +- .../net-vhostuser.x86_64-latest.args | 1 + .../qemuxml2argvdata/numatune-distances.args | 4 +- tests/qemuxml2argvdata/numatune-distances.xml | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 1 + .../ppc64-pseries-graphics.ppc64-latest.args | 1 + .../ppc64-pseries-headless.ppc64-latest.args | 1 + .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 1 + .../s390x-ccw-graphics.s390x-latest.args | 1 + .../s390x-ccw-headless.s390x-latest.args | 1 + .../serial-unix-chardev.x86_64-latest.args | 1 + ...rtcard-passthrough-unix.x86_64-latest.args | 1 + .../qemuxml2argvdata/tap-vhost-incorrect.xml | 2 +- tests/qemuxml2argvdata/tap-vhost.xml | 2 +- ...=> tpm-passthrough-crb.x86_64-latest.args} | 19 +- ...rgs => tpm-passthrough.x86_64-latest.args} | 21 +- tests/qemuxml2argvdata/tpm-passthrough.xml | 2 +- .../usb-redir-unix.x86_64-latest.args | 1 + ...host-user-gpu-secondary.x86_64-latest.args | 1 + .../vhost-user-vga.x86_64-latest.args | 1 + .../vhost-vsock-ccw-auto.s390x-latest.args | 1 + .../vhost-vsock-ccw.s390x-latest.args | 1 + .../vhost-vsock.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 2 +- tests/qemuxml2argvdata/vhost_queues.xml | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 1 + .../video-device-pciaddr-default.args | 2 +- .../video-device-pciaddr-default.xml | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 1 + ...o-qxl-sec-device-vram64.x86_64-latest.args | 1 + ...eo-ramfb-display-device.x86_64-latest.args | 1 + tests/qemuxml2argvdata/virtio-lun.args | 2 +- tests/qemuxml2argvdata/virtio-lun.xml | 2 +- ...virtio-non-transitional.x86_64-latest.args | 1 + .../virtio-rng-egd-unix.x86_64-latest.args | 1 + .../virtio-transitional.x86_64-latest.args | 1 + .../x86_64-pc-graphics.x86_64-latest.args | 1 + .../x86_64-pc-headless.x86_64-latest.args | 1 + .../x86_64-q35-graphics.x86_64-latest.args | 1 + .../x86_64-q35-headless.x86_64-latest.args | 1 + tests/qemuxml2argvtest.c | 11 +- .../aarch64-virt-graphics.aarch64-latest.xml | 3 + .../aarch64-virt-headless.aarch64-latest.xml | 3 + .../default-qemu-host-arch.xml | 2 +- ...ault-video-type-aarch64.aarch64-latest.xml | 1 - .../default-video-type-ppc64.ppc64-latest.xml | 14 +- ...ault-video-type-riscv64.riscv64-latest.xml | 1 - .../default-video-type-s390x.s390x-latest.xml | 8 +- .../default-video-type-x86_64-caps-test-0.xml | 5 +- .../default-video-type-x86_64-caps-test-1.xml | 5 +- ...-cache.xml => disk-cache.x86_64-1.5.3.xml} | 6 +- .../disk-cache.x86_64-2.12.0.xml | 60 + .../disk-cache.x86_64-2.6.0.xml | 60 + .../disk-cache.x86_64-2.7.0.xml | 60 + .../disk-cache.x86_64-latest.xml | 63 + ...om-empty-network-invalid.x86_64-latest.xml | 3 + .../qemuxml2xmloutdata/disk-copy_on_read.xml | 2 +- tests/qemuxml2xmloutdata/disk-discard.xml | 2 +- tests/qemuxml2xmloutdata/event_idx.xml | 2 +- .../genid-active.x86_64-latest.xml | 3 + .../genid-auto-active.x86_64-latest.xml | 3 + .../genid-auto-inactive.x86_64-latest.xml | 3 + .../genid-inactive.x86_64-latest.xml | 3 + ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml | 3 + .../intel-iommu.x86_64-2.6.0.xml | 3 + tests/qemuxml2xmloutdata/interface-driver.xml | 2 +- .../iommu-smmuv3.aarch64-latest.xml | 3 + .../iothreads-virtio-scsi-ccw.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth2.xml | 2 +- tests/qemuxml2xmloutdata/net-coalesce.xml | 2 +- tests/qemuxml2xmloutdata/net-mtu.xml | 2 +- .../ppc64-pseries-graphics.ppc64-latest.xml | 3 + .../ppc64-pseries-headless.ppc64-latest.xml | 3 + .../s390x-ccw-graphics.s390x-latest.xml | 3 + .../s390x-ccw-headless.s390x-latest.xml | 3 + .../tap-vhost-incorrect.xml | 2 +- tests/qemuxml2xmloutdata/tap-vhost.xml | 2 +- .../tpm-passthrough.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/vhost_queues.xml | 2 +- .../video-device-pciaddr-default.xml | 2 +- tests/qemuxml2xmloutdata/virtio-lun.xml | 2 +- .../virtio-non-transitional.x86_64-latest.xml | 3 + .../virtio-transitional.x86_64-latest.xml | 3 + .../x86_64-pc-graphics.x86_64-latest.xml | 3 + .../x86_64-pc-headless.x86_64-latest.xml | 3 + .../x86_64-q35-graphics.x86_64-latest.xml | 3 + .../x86_64-q35-headless.x86_64-latest.xml | 3 + tests/qemuxml2xmltest.c | 6 +- tests/testutilsqemu.c | 71 +- tests/vircapstest.c | 4 +- 227 files changed, 31219 insertions(+), 182 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_5.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args rename tests/qemuxml2argvdata/{tpm-passthrough-crb.args => tpm-passthrough-crb.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{tpm-passthrough.args => tpm-passthrough.x86_64-latest.args} (56%) rename tests/qemuxml2xmloutdata/{disk-cache.xml => disk-cache.x86_64-1.5.3.xml} (92%) create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml -- 2.24.1

3 25

[libvirt PATCHv2 00/10] add virtiofs support (virtio-fs epopee)
by Ján Tomko 27 Jan '20

27 Jan '20

v1: https://www.redhat.com/archives/libvir-list/2019-November/msg00005.html https://bugzilla.redhat.com/show_bug.cgi?id=1694166 Ján Tomko (10): conf: use virXMLFormatElement in virDomainFSDefFormat qemu: add QEMU_CAPS_VHOST_USER_FS schema: wrap fsDriver in a choice group conf: qemu: add virtiofs fsdriver type conf: add virtiofs-related elements and attributes qemu: add virtiofs_debug to qemu.conf qemu: validate virtiofs filesystems qemu: add code for handling virtiofsd qemu: build vhost-user-fs device command line docs: add virtiofs kbase docs/formatdomain.html.in | 23 ++ docs/kbase.html.in | 3 + docs/kbase/virtiofs.rst | 153 +++++++++++ docs/schemas/domaincommon.rng | 117 +++++++-- po/POTFILES.in | 1 + src/conf/domain_conf.c | 161 +++++++++++- src/conf/domain_conf.h | 17 ++ src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 49 +++- src/qemu/qemu_conf.c | 2 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 36 +++ src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.c | 4 + src/qemu/qemu_extdevice.c | 19 ++ src/qemu/qemu_virtiofs.c | 241 ++++++++++++++++++ src/qemu/qemu_virtiofs.h | 37 +++ src/qemu/test_libvirtd_qemu.aug.in | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + ...vhost-user-fs-fd-memory.x86_64-latest.args | 38 +++ .../vhost-user-fs-fd-memory.xml | 42 +++ ...vhost-user-fs-hugepages.x86_64-latest.args | 46 ++++ .../vhost-user-fs-hugepages.xml | 75 ++++++ tests/qemuxml2argvtest.c | 9 + .../vhost-user-fs-fd-memory.x86_64-latest.xml | 1 + .../vhost-user-fs-hugepages.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 3 + 34 files changed, 1064 insertions(+), 35 deletions(-) create mode 100644 docs/kbase/virtiofs.rst create mode 100644 src/qemu/qemu_virtiofs.c create mode 100644 src/qemu/qemu_virtiofs.h create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml -- 2.21.0

4 26

[PATCH ocaml 0/3] Small fixes for OCaml 4.10.
by Richard W.M. Jones 27 Jan '20

27 Jan '20

Basically OCaml 4.10 is much more strict about the difference between string (immutable) and bytes (mutable). Rich.

2 13

[libvirt PATCH] qemu: explicitly disable virgl when requested
by Jonathon Jongsma 25 Jan '20

25 Jan '20

If a domain is configured to have an egl-headless display and a virtio video device, virgl will be enabled automatically within the guest, even if the video device is configured with accel3d='no'. In this case we should explicitly pass 'virgl=off' to qemu. See https://bugzilla.redhat.com/show_bug.cgi?id=1791236 for more information. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 46680fd829..3378413ee1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4429,7 +4429,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (video->backend != VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER && video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { - if (video->accel && video->accel->accel3d == VIR_TRISTATE_SWITCH_ON) { + if (video->accel && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) && + (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON || + video->accel->accel3d == VIR_TRISTATE_SWITCH_OFF)) { virBufferAsprintf(&buf, ",virgl=%s", virTristateSwitchTypeToString(video->accel->accel3d)); } -- 2.21.0

2 1

[PATCH v2 0/2] qemu: prevent too-deeply nested backing XML
by Peter Krempa 24 Jan '20

24 Jan '20

Patch 1 is new in the series. Patch 2 deals (partially) with review feedback on v1. Peter Krempa (2): qemu: snapshot: Always rewrite backingStore data when reusing existing images qemu: snapshot: Prevent too-nested domain XML when doing inactive snapshot src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.24.1

2 3

[libvirt] [PATCH v2 0/5] Support rng backend model builtin
by Han Han 24 Jan '20

24 Jan '20

https://bugzilla.redhat.com/show_bug.cgi?id=1785091 Implement 'rng-builtin' backend from QEMU. This feature is introduced to QEMU since v4.2. It uses getrandom() to get random, no external random source needed. github repo: https://github.com/qiankehan/libvirt/tree/rng-builtin_v2 Changes from v1: - Fix failures in 'make check' and 'make syntax-check' - Adjust the structure of patches v1: https://www.redhat.com/archives/libvir-list/2020-January/msg00000.html Han Han (5): qemu_capabilities: Introduce QEMU_CAPS_OBJECT_RNG_BUILTIN util: Do not assume comma after object id conf: Add rng backend model builtin qemu: Implement builtin rng backend news: Update news for rng backend type builtin docs/formatdomain.html.in | 10 ++++++ docs/formatdomaincaps.html.in | 1 + docs/news.xml | 10 ++++++ docs/schemas/domaincommon.rng | 6 ++++ src/conf/domain_audit.c | 2 ++ src/conf/domain_conf.c | 9 +++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 ++++++++ src/qemu/qemu_domain.c | 3 ++ src/util/virqemu.c | 12 ++++--- .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../virtio-rng-builtin.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvdata/virtio-rng-builtin.xml | 26 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../virtio-rng-builtin.x86_64-latest.xml | 31 ++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 28 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-builtin.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml -- 2.24.0.rc1

2 7

Re: [Bug 1860759] Re: [REGRESSION] option `-snapshot` ignored with blockdev
by Eric Blake 24 Jan '20

24 Jan '20

On 1/24/20 4:41 AM, Ildar wrote: > Max, thanks a lot for the explanation. > Do you mean that snapshot-ing isn't possible totally for blockdev? Then I > guess some libvirt users are in trouble :(( > Actually I didn't quite caught the reason why a blockdev supports backing > but not {backing to a file on /tmp then promptly deleted} ? What's the > technical difference? > On 1/24/20 4:05 AM, Max Reitz wrote: > > > I don’t know much about libvirt, but I would have thought that any > manual modification of the qemu command line isn’t supported and might > always break. > > Anyway, from a QEMU POV, -snapshot only works with -drive (this includes > -hda, etc.). It doesn’t work with -blockdev. I can see that this isn’t > documented for -snapshot, but basically whenever -blockdev is used, the > user assumes full responsibility for the block graph (or at least that > particular subgraph). We cannot enable snapshot functionality then. Libvirt has never produced a qemu command line containing '-snapshot'. Part of this is that libvirt wants to control SELinux settings, and letting qemu create a temporary overlay in /tmp in order to implement -snapshot does not play nicely with libvirt pre-creating all files that qemu is allowed to access. The fact that you were able to manually add -snapshot to your qemu command line with older libvirt using -drive (I'm assuming you were also not using libvirt's SELinux support, because if you were, qemu would have been unable to create/access the temporary wrapper in /tmp), is a nice hack. But since modern qemu has declared -snapshot to be unsupported with -blockdev, and modern libvirt has switched to -blockdev, I claim that this is not a qemu bug, but a libvirt feature request. That said, libvirt has had a vision for a design for implementing the equivalent of -drive -snapshot: the <transient/> sub-element added to the domain/disk/source/driver element has been documented for a long time: https://libvirt.org/formatdomain.html "transient If present, this indicates that changes to the device contents should be reverted automatically when the guest exits. With some hypervisors, marking a disk transient prevents the domain from participating in migration or snapshots. Since 0.9.5 " However, no one has yet implemented it for libvirt's qemu driver. Part of our reluctance has been that we knew that implementing it would require libvirt to precreate the wrapper file on every guest start, and it is only very recently that we've even had enough functionality in libvirt's qemu driver coupled with new qemu commands to create qcow2 images using QMP rather than having to shell out to qemu-img. And part of it is that there was no point in implementing something to work with -drive, when we knew we had to rework everything for -blockdev anyways. But now that the work in libvirt to switch to -blockdev is done, it should be a lot easier to implement PROPER support for the <transient/> tag, at least for -blockdev usage. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org

1 0

[PATCH 0/3] qemu_capabilities: Reword domain caps cache
by Michal Privoznik 24 Jan '20

24 Jan '20

It's fairly easy to reproduce the bug (see its description in 3/3). Just put a sleep here: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b62dd1df52..eeae967420 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1399,6 +1399,7 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, key = g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype, NULLSTR(data.machine), NULLSTR(data.path)); + sleep(5); if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; } And then try to get domcaps from two consoles at once: virsh domcapabilities One will succeed, the other will fail with an error. Michal Prívozník (3): cpu.c: Check properly for virCapabilitiesGetNodeInfo() retval qemu_conf: Avoid dereferencing NULL in virQEMUDriverGetHost{NUMACaps,CPU} qemu_capabilities: Reword domain caps cache src/cpu/cpu.c | 2 +- src/qemu/qemu_capabilities.c | 118 +++++++++++++++++++++++++++++++++-- src/qemu/qemu_capabilities.h | 14 ++++- src/qemu/qemu_conf.c | 86 +++++++++---------------- 4 files changed, 155 insertions(+), 65 deletions(-) -- 2.24.1

2 8

[PATCH 0/4] qemu: fix block jobs when copy_on_read is enabled
by Peter Krempa 24 Jan '20

24 Jan '20

QEMU requires us to pass the topmost node(-name) in the backing chain as the 'device' argument for the blockdev-mirror/block-commit commands. Otherwise QEMU complains: "Need a root block node" Since libvirt always puts the copy-on-read driver on top of the backing chain, blockjobs on disks which use "copy_on_read" fail. The series below fixes that by passing the proper node. This fixes it just fine for the mirror, but for block-commit we still get another error due to a bug in qemu: "'libvirt-4-format' is not in this backing file chain" Additionally one weird thing happens with block-stream (blockpull). If I pass the layer below the copy-on-read as 'device', everything works. This is kind of weird as the documentation for that is the same. If I pass the nodename of copy-on-read. Max, Kevin, could you please comment on the block-stream part and possibly also on the plans to fix the issue with block-commit? Cc: Max Reitz <mreitz(a)redhat.com> CC: Kevin Wolf <kwolf(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=1792195 Peter Krempa (4): qemu: blockcopy: Actually unplug unused images when mirror job fails to start qemu: domain: Extract code to determine topmost nodename to qemuDomainDiskGetTopNodename qemu: Fix value of 'device' argument for blockdev-mirror qemu: Fix value of 'device' argument for block-commit src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++------------ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 2 +- 4 files changed, 34 insertions(+), 16 deletions(-) -- 2.24.1

3 10

[PATCH] qemu: block: Don't skip creation of 'luks' formatted images
by Peter Krempa 23 Jan '20

23 Jan '20

libvirt treats 'luks' images as raw+encryption. The logic in qemuBlockStorageSourceCreateFormat skipped the creation if the requested image was raw but didn't take into account the encryption. This manifested itself e.g. when attempting to do a virsh blockcopy with the following XML: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/tmp/enccpy'> <encryption format='luks'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> </disk> Where qemu would report the following error: unable to execute QEMU command 'blockdev-add': Volume is not in LUKS format rather than actually formatting the image first. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index eab21bc107..22f03da485 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2479,7 +2479,8 @@ qemuBlockStorageSourceCreateFormat(virDomainObjPtr vm, g_autoptr(virJSONValue) createformatprops = NULL; int ret; - if (src->format == VIR_STORAGE_FILE_RAW) + if (src->format == VIR_STORAGE_FILE_RAW && + !src->encryption) return 0; if (qemuBlockStorageSourceCreateGetFormatProps(src, backingStore, -- 2.24.1

2 1

[libvirt] [PATCH 0/3] qemu: backup: Allow configuring and reading back of export an backup bitmap name
by Peter Krempa 23 Jan '20

23 Jan '20

These were already posted before. oVirt folks would like to be able to read the export and bitmap names. Given that I already wrote support for configuring it and it's rather simple I'm re-posting these as they were before. Peter Krempa (3): conf: backup: Allow configuration of names exported via NBD qemu: backup: Implement support for backup disk export name configuration qemu: backup: Implement support for backup disk bitmap name configuration docs/formatbackup.html.in | 9 +++++++++ docs/schemas/domainbackup.rng | 8 ++++++++ src/conf/backup_conf.c | 11 +++++++++++ src/conf/backup_conf.h | 2 ++ src/qemu/qemu_backup.c | 14 ++++++++++++-- .../domainbackupxml2xmlin/backup-pull-seclabel.xml | 2 +- .../backup-pull-seclabel.xml | 2 +- 7 files changed, 44 insertions(+), 4 deletions(-) -- 2.24.1

3 11

[PATCH 0/2] util: hash: Aid in debugging of duplicate keys
by Peter Krempa 23 Jan '20

23 Jan '20

See patch 1 for rationale. Peter Krempa (2): util: hash: Improve debugability of "Duplicate key" error message tests: hash: Test case for adding duplicate hash entry src/conf/domain_addr.c | 9 +++++++++ src/util/vircgroup.c | 8 ++++++++ src/util/virhash.c | 22 ++++++++++++++++++++-- src/util/virhash.h | 13 +++++++++++++ tests/virhashtest.c | 23 +++++++++++++++++++++++ 5 files changed, 73 insertions(+), 2 deletions(-) -- 2.24.1

2 4

[libvirt] [PATCH] qemu: Refuse to use "ps2" on machines that do not have this bus
by Thomas Huth 23 Jan '20

23 Jan '20

The "ps2" bus is only available on certain machines like x86. On machines like s390x, we should refuse to add a device to this bus instead of silently ignoring it. Looking at the QEMU sources, PS/2 is only available if the QEMU binary has the "i8042" device, so let's check for that and only allow "ps2" devices if this QEMU device is available, or if we're on x86 anyway (so we don't have to fake the QEMU_CAPS_DEVICE_I8042 capability in all the tests that use <input ... bus='ps2'/> in their xml data). Reported-by: Sebastian Mitterle <smitterl(a)redhat.com> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1763191 Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 10 +++++++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 6 ------ ...cw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 6 ------ ...ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 6 ------ .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 6 ------ ...-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 6 ------ ...plug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 6 ------ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 6 ------ .../qemuhotplug-base-ccw-live.xml | 6 ------ 37 files changed, 38 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 84c62a4e28..e22ef28662 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -553,6 +553,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "blockdev-file-dynamic-auto-read-only", "savevm-monitor-nodes", "drive-nvme", + "i8042", ); @@ -1244,6 +1245,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA }, { "ramfb", QEMU_CAPS_DEVICE_RAMFB }, { "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU }, + { "i8042", QEMU_CAPS_DEVICE_I8042 }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 193c19fc81..c1ce590cab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -534,6 +534,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */ QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */ QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */ + QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a6dde15bad..ada7d9b318 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8039,13 +8039,21 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics, static int qemuDomainDeviceDefValidateInput(const virDomainInputDef *input, - const virDomainDef *def G_GNUC_UNUSED, + const virDomainDef *def, virQEMUCapsPtr qemuCaps) { const char *baseName; int cap; int ccwCap; + if (input->bus == VIR_DOMAIN_INPUT_BUS_PS2 && !ARCH_IS_X86(def->os.arch) && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_I8042)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s is not supported by this QEMU binary"), + virDomainInputBusTypeToString(input->bus)); + return -1; + } + if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) return 0; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index f2257d6bd2..b57cb2ab59 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -84,6 +84,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 3a70ec8146..5d0a14a5db 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -89,6 +89,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index cbb29ef2de..c196fe5e45 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -91,6 +91,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index a6d0981224..1edcaa4657 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -107,6 +107,7 @@ <flag name='isa-serial'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 5a57cb7760..b95a9d42ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -139,6 +139,7 @@ <flag name='vhost-vsock'/> <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> + <flag name='i8042'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 53872abf2f..7ebe97b6ab 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -182,6 +182,7 @@ <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f70335db8f..b8eb3abd40 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -188,6 +188,7 @@ <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 74c80d2fe9..38a3103c4a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -153,6 +153,7 @@ <flag name='iothread.poll-max-ns'/> <flag name='memory-backend-file.align'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index b51cee9f28..0c30cc75da 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -197,6 +197,7 @@ <flag name='memory-backend-file.align'/> <flag name='x86-max-cpu'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 86d85faa73..9b486effe1 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -133,6 +133,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index b217238307..147b179fdb 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -139,6 +139,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 862464c2f0..deb5c28790 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -118,6 +118,7 @@ <flag name='nbd-tls'/> <flag name='sdl-gl'/> <flag name='hda-output'/> + <flag name='i8042'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 6b96e37a16..fc508aba8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -151,6 +151,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index bc1359b0dd..ed199057dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -156,6 +156,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='mch'/> + <flag name='i8042'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index c7f3be3a1b..489b67f99a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -159,6 +159,7 @@ <flag name='hda-output'/> <flag name='vhost-vsock'/> <flag name='mch'/> + <flag name='i8042'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100246</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index a00d4b3d4c..3bc6ec8dab 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -131,6 +131,7 @@ <flag name='blockdev-del'/> <flag name='vhost-vsock'/> <flag name='iothread.poll-max-ns'/> + <flag name='i8042'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 3d96f5f5b3..83fc6cde97 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -176,6 +176,7 @@ <flag name='mch'/> <flag name='iothread.poll-max-ns'/> <flag name='x86-max-cpu'/> + <flag name='i8042'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 3b5a021dcf..9a0b9c05c2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -155,6 +155,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index c955994ac0..9d12215600 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -202,6 +202,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index cab38d442b..2cf2e4f655 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -159,6 +159,7 @@ <flag name='overcommit'/> <flag name='bochs-display'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 3e89d7f933..5df9b5ef1b 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -205,6 +205,7 @@ <flag name='bochs-display'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 4e13888042..964f02b062 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -173,6 +173,7 @@ <flag name='migration-file-drop-cache'/> <flag name='machine.pseries.cap-ccf-assist'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index ba32d4c592..d545c3d9e8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -210,6 +210,7 @@ <flag name='migration-file-drop-cache'/> <flag name='ramfb'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index a98945de0e..f54db10cd9 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -215,6 +215,7 @@ <flag name='ramfb'/> <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index ee9fb23640..404a2a9168 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -176,6 +176,7 @@ <flag name='machine.pseries.cap-ccf-assist'/> <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 4857e2f5a5..fa87b72e2b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -218,6 +218,7 @@ <flag name='blockdev-file-dynamic-auto-read-only'/> <flag name='savevm-monitor-nodes'/> <flag name='drive-nvme'/> + <flag name='i8042'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml index f501cde333..59c969e0f2 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml @@ -44,12 +44,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml index 301658178f..d10b29be7e 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml @@ -54,12 +54,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'> <alias name='balloon0'/> </memballoon> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml index 223e929ad5..6eadbdcd18 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml @@ -54,12 +54,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml index c745d48558..68561b50a3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml @@ -44,12 +44,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml index 3189294b65..0900f3c8e3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml @@ -53,12 +53,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml index 3189294b65..0900f3c8e3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml @@ -53,12 +53,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml index edf57fcd3f..31979c40f0 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml @@ -43,12 +43,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml index b97bba78c6..844b951940 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml @@ -34,12 +34,6 @@ <alias name='virtio-serial0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> - <input type='mouse' bus='ps2'> - <alias name='input0'/> - </input> - <input type='keyboard' bus='ps2'> - <alias name='input1'/> - </input> <memballoon model='none'/> <panic model='s390'/> </devices> -- 2.18.1

3 3

[PATCH] qemu-nbd: Removed deprecated --partition option
by Eric Blake 23 Jan '20

23 Jan '20

The option was deprecated in 4.0.0 (commit 0ae2d546); it's now been long enough with no complaints to follow through with that process. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- qemu-deprecated.texi | 49 ++++++---------- qemu-nbd.c | 133 +------------------------------------------ qemu-nbd.texi | 13 ++--- 3 files changed, 24 insertions(+), 171 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 8471eef9c22d..1b4c638db8e0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -304,37 +304,6 @@ The above, converted to the current supported format: @section Related binaries -@subsection qemu-nbd --partition (since 4.0.0) - -The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) -can only handle MBR partitions, and has never correctly handled -logical partitions beyond partition 5. If you know the offset and -length of the partition (perhaps by using @code{sfdisk} within the -guest), you can achieve the effect of exporting just that subset of -the disk by use of the @option{--image-opts} option with a raw -blockdev using the @code{offset} and @code{size} parameters layered on -top of any other existing blockdev. For example, if partition 1 is -100MiB long starting at 1MiB, the old command: - -@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} - -can be rewritten as: - -@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} - -Alternatively, the @code{nbdkit} project provides a more powerful -partition filter on top of its nbd plugin, which can be used to select -an arbitrary MBR or GPT partition on top of any other full-image NBD -export. Using this to rewrite the above example results in: - -@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} -@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} - -Note that if you are exposing the export via /dev/nbd0, it is easier -to just export the entire image and then mount only /dev/nbd0p1 than -it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a -subset of the image. - @subsection qemu-img convert -n -o (since 4.2.0) All options specified in @option{-o} are image creation options, so @@ -383,3 +352,21 @@ trouble after a recent upgrade. The "autoload" parameter has been ignored since 2.12.0. All bitmaps are automatically loaded from qcow2 images. + +@section Related binaries + +@subsection qemu-nbd --partition (removed in 5.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +could only handle MBR partitions, and never correctly handled logical +partitions beyond partition 5. Exporting a partition can still be +done by utilizing the @option{--image-opts} option with a raw blockdev +using the @code{offset} and @code{size} parameters layered on top of +any other existing blockdev. For example, if partition 1 is 100MiB +long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} diff --git a/qemu-nbd.c b/qemu-nbd.c index bc125370dd36..e6f2eb76a3f2 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -100,7 +100,6 @@ static void usage(const char *name) "\n" "Exposing part of the image:\n" " -o, --offset=OFFSET offset into the image\n" -" -P, --partition=NUM only expose partition NUM\n" " -B, --bitmap=NAME expose a persistent dirty bitmap\n" "\n" "General purpose options:\n" @@ -156,96 +155,6 @@ QEMU_COPYRIGHT "\n" , name); } -struct partition_record -{ - uint8_t bootable; - uint8_t start_head; - uint32_t start_cylinder; - uint8_t start_sector; - uint8_t system; - uint8_t end_head; - uint8_t end_cylinder; - uint8_t end_sector; - uint32_t start_sector_abs; - uint32_t nb_sectors_abs; -}; - -static void read_partition(uint8_t *p, struct partition_record *r) -{ - r->bootable = p[0]; - r->start_head = p[1]; - r->start_cylinder = p[3] | ((p[2] << 2) & 0x0300); - r->start_sector = p[2] & 0x3f; - r->system = p[4]; - r->end_head = p[5]; - r->end_cylinder = p[7] | ((p[6] << 2) & 0x300); - r->end_sector = p[6] & 0x3f; - - r->start_sector_abs = ldl_le_p(p + 8); - r->nb_sectors_abs = ldl_le_p(p + 12); -} - -static int find_partition(BlockBackend *blk, int partition, - uint64_t *offset, uint64_t *size) -{ - struct partition_record mbr[4]; - uint8_t data[MBR_SIZE]; - int i; - int ext_partnum = 4; - int ret; - - ret = blk_pread(blk, 0, data, sizeof(data)); - if (ret < 0) { - error_report("error while reading: %s", strerror(-ret)); - exit(EXIT_FAILURE); - } - - if (data[510] != 0x55 || data[511] != 0xaa) { - return -EINVAL; - } - - for (i = 0; i < 4; i++) { - read_partition(&data[446 + 16 * i], &mbr[i]); - - if (!mbr[i].system || !mbr[i].nb_sectors_abs) { - continue; - } - - if (mbr[i].system == 0xF || mbr[i].system == 0x5) { - struct partition_record ext[4]; - uint8_t data1[MBR_SIZE]; - int j; - - ret = blk_pread(blk, mbr[i].start_sector_abs * MBR_SIZE, - data1, sizeof(data1)); - if (ret < 0) { - error_report("error while reading: %s", strerror(-ret)); - exit(EXIT_FAILURE); - } - - for (j = 0; j < 4; j++) { - read_partition(&data1[446 + 16 * j], &ext[j]); - if (!ext[j].system || !ext[j].nb_sectors_abs) { - continue; - } - - if ((ext_partnum + j + 1) == partition) { - *offset = (uint64_t)ext[j].start_sector_abs << 9; - *size = (uint64_t)ext[j].nb_sectors_abs << 9; - return 0; - } - } - ext_partnum += 4; - } else if ((i + 1) == partition) { - *offset = (uint64_t)mbr[i].start_sector_abs << 9; - *size = (uint64_t)mbr[i].nb_sectors_abs << 9; - return 0; - } - } - - return -ENOENT; -} - static void termsig_handler(int signum) { atomic_cmpxchg(&state, RUNNING, TERMINATE); @@ -620,7 +529,7 @@ int main(int argc, char **argv) int64_t fd_size; QemuOpts *sn_opts = NULL; const char *sn_id_or_name = NULL; - const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:x:T:D:B:L"; + const char *sopt = "hVb:o:p:rsnc:dvk:e:f:tl:x:T:D:B:L"; struct option lopt[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -629,7 +538,6 @@ int main(int argc, char **argv) { "socket", required_argument, NULL, 'k' }, { "offset", required_argument, NULL, 'o' }, { "read-only", no_argument, NULL, 'r' }, - { "partition", required_argument, NULL, 'P' }, { "bitmap", required_argument, NULL, 'B' }, { "connect", required_argument, NULL, 'c' }, { "disconnect", no_argument, NULL, 'd' }, @@ -660,7 +568,6 @@ int main(int argc, char **argv) int ch; int opt_ind = 0; int flags = BDRV_O_RDWR; - int partition = 0; int ret = 0; bool seen_cache = false; bool seen_discard = false; @@ -796,15 +703,6 @@ int main(int argc, char **argv) readonly = true; flags &= ~BDRV_O_RDWR; break; - case 'P': - warn_report("The '-P' option is deprecated; use --image-opts with " - "a raw device wrapper for subset exports instead"); - if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || - partition < 1 || partition > 8) { - error_report("Invalid partition '%s'", optarg); - exit(EXIT_FAILURE); - } - break; case 'B': bitmap = optarg; break; @@ -901,7 +799,7 @@ int main(int argc, char **argv) error_report("List mode is incompatible with a file name"); exit(EXIT_FAILURE); } - if (export_name || export_description || dev_offset || partition || + if (export_name || export_description || dev_offset || device || disconnect || fmt || sn_id_or_name || bitmap || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); @@ -1165,33 +1063,6 @@ int main(int argc, char **argv) } fd_size -= dev_offset; - if (partition) { - uint64_t limit; - - if (dev_offset) { - error_report("Cannot request partition and offset together"); - exit(EXIT_FAILURE); - } - ret = find_partition(blk, partition, &dev_offset, &limit); - if (ret < 0) { - error_report("Could not find partition %d: %s", partition, - strerror(-ret)); - exit(EXIT_FAILURE); - } - /* - * MBR partition limits are (32-bit << 9); this assert lets - * the compiler know that we can't overflow 64 bits. - */ - assert(dev_offset + limit >= dev_offset); - if (dev_offset + limit > fd_size) { - error_report("Discovered partition %d at offset %" PRIu64 - " size %" PRIu64 ", but size exceeds file length %" - PRId64, partition, dev_offset, limit, fd_size); - exit(EXIT_FAILURE); - } - fd_size = limit; - } - export = nbd_export_new(bs, dev_offset, fd_size, export_name, export_description, bitmap, readonly, shared > 1, nbd_export_closed, writethrough, NULL, diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 7f55657722bd..36f4188a3f27 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -55,11 +55,6 @@ Force the use of the block driver for format @var{fmt} instead of auto-detecting. @item -r, --read-only Export the disk as read-only. -@item -P, --partition=@var{num} -Deprecated: Only expose MBR partition @var{num}. Understands physical -partitions 1-4 and logical partition 5. New code should instead use -@option{--image-opts} with the raw driver wrapping a subset of the -original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context @@ -161,13 +156,13 @@ qemu-nbd \ --image-opts driver=raw,offset=1M,size=1M,file.driver=file,file.filename=file.raw @end example -Serve a read-only copy of just the first MBR partition of a guest -image over a Unix socket with as many as 5 simultaneous readers, with -a persistent process forked as a daemon: +Serve a read-only copy of a guest image over a Unix socket with as +many as 5 simultaneous readers, with a persistent process forked as a +daemon: @example qemu-nbd --fork --persistent --shared=5 --socket=/path/to/sock \ - --partition=1 --read-only --format=qcow2 file.qcow2 + --read-only --format=qcow2 file.qcow2 @end example Expose the guest-visible contents of a qcow2 file via a block device -- 2.24.1

3 4