[PATCH RFC 0/5] qemu: Adjust to deprecation of -netdev tap properties 'fd' and 'vhostfd' - Variant B

Peter Krempa via Devel posted 5 patches 14 hours ago
Failed in applying to current master (apply log)
src/qemu/qemu_capabilities.c                  |    8 +
src/qemu/qemu_capabilities.h                  |    1 +
src/qemu/qemu_command.c                       |   11 +-
src/qemu/qemu_command.h                       |    3 +-
src/qemu/qemu_hotplug.c                       |    2 +-
src/qemu/qemu_qapi.c                          |   26 +
.../caps_11.0.0_x86_64.replies                | 3571 ++++++++---------
.../caps_11.0.0_x86_64.xml                    |   11 +-
.../downscript.x86_64-latest.args             |    2 +-
.../graphics-spice-timeout.x86_64-latest.args |    2 +-
.../net-bandwidth.x86_64-latest.args          |    2 +-
.../net-bandwidth2.x86_64-latest.args         |    2 +-
.../net-coalesce.x86_64-latest.args           |    6 +-
.../net-eth-hostip.x86_64-latest.args         |    2 +-
.../net-eth-ifname.x86_64-latest.args         |    2 +-
.../net-eth-names.x86_64-latest.args          |    4 +-
.../net-eth-unmanaged-tap.x86_64-latest.args  |    2 +-
.../net-eth.x86_64-10.2.0.args                |   36 +
.../qemuxmlconfdata/net-eth.x86_64-10.2.0.xml |   44 +
.../net-eth.x86_64-latest.args                |    2 +-
.../net-isolated-port.x86_64-latest.args      |    2 +-
.../net-midonet.x86_64-latest.args            |    2 +-
.../net-mtu.x86_64-latest.args                |    4 +-
.../net-openvswitch.x86_64-latest.args        |    2 +-
...irtio-network-portgroup.x86_64-latest.args |    6 +-
...-virtio-teaming-network.x86_64-latest.args |    2 +-
.../net-virtio-vhost.x86_64-10.2.0.args       |   42 +
.../net-virtio-vhost.x86_64-10.2.0.xml        |   65 +
.../net-virtio-vhost.x86_64-latest.args       |    2 +-
.../tap-vhost-incorrect.x86_64-latest.args    |    4 +-
.../user-aliases.x86_64-latest.args           |    2 +-
tests/qemuxmlconftest.c                       |    4 +
32 files changed, 2048 insertions(+), 1828 deletions(-)
create mode 100644 tests/qemuxmlconfdata/net-eth.x86_64-10.2.0.args
create mode 100644 tests/qemuxmlconfdata/net-eth.x86_64-10.2.0.xml
create mode 100644 tests/qemuxmlconfdata/net-virtio-vhost.x86_64-10.2.0.args
create mode 100644 tests/qemuxmlconfdata/net-virtio-vhost.x86_64-10.2.0.xml
[PATCH RFC 0/5] qemu: Adjust to deprecation of -netdev tap properties 'fd' and 'vhostfd' - Variant B
Posted by Peter Krempa via Devel 14 hours ago
This patchset adapts libvirt to the proposed deprecation of
'fd'/'vhostfd' fields in favor of the plural spellings even for 1 fd.

Based on the discussion [1] it seems that it should be possible to
replace it unconditionally but I'm not certain about this and also it's
outside my usual area of expertise.

Thus this version is the more cautious approach of adding a capability
and only switching the generator once deprecations are set up.

While adding the capability I've also uncovered a bug in the QMP query
strings where it was not possible to query features of an object member.

[1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/SM4RY7TBZV42EJUU4CW7EPU56WTPWJFC/

Peter Krempa (5):
  virQEMUQAPISchemaTraverseObject: Consider features also on current
    members
  qemu: capabilities: Introduce QEMU_CAPS_NETDEV_TAP_FD_VHOSTFD_PLURAL
  qemuxmlconftest: Add version-locked test cases for the use of -netdev
    tap with fd/vhostfd
  qemuBuildHostNetProps: Use 'fds', 'vhostfds' with
    QEMU_CAPS_NETDEV_TAP_FD_VHOSTFD_PLURAL
  [DO_NOT_PUSH] qemucapabilitiesdata: Update with patches removing 'fd'
    and 'vhostfd'

 src/qemu/qemu_capabilities.c                  |    8 +
 src/qemu/qemu_capabilities.h                  |    1 +
 src/qemu/qemu_command.c                       |   11 +-
 src/qemu/qemu_command.h                       |    3 +-
 src/qemu/qemu_hotplug.c                       |    2 +-
 src/qemu/qemu_qapi.c                          |   26 +
 .../caps_11.0.0_x86_64.replies                | 3571 ++++++++---------
 .../caps_11.0.0_x86_64.xml                    |   11 +-
 .../downscript.x86_64-latest.args             |    2 +-
 .../graphics-spice-timeout.x86_64-latest.args |    2 +-
 .../net-bandwidth.x86_64-latest.args          |    2 +-
 .../net-bandwidth2.x86_64-latest.args         |    2 +-
 .../net-coalesce.x86_64-latest.args           |    6 +-
 .../net-eth-hostip.x86_64-latest.args         |    2 +-
 .../net-eth-ifname.x86_64-latest.args         |    2 +-
 .../net-eth-names.x86_64-latest.args          |    4 +-
 .../net-eth-unmanaged-tap.x86_64-latest.args  |    2 +-
 .../net-eth.x86_64-10.2.0.args                |   36 +
 .../qemuxmlconfdata/net-eth.x86_64-10.2.0.xml |   44 +
 .../net-eth.x86_64-latest.args                |    2 +-
 .../net-isolated-port.x86_64-latest.args      |    2 +-
 .../net-midonet.x86_64-latest.args            |    2 +-
 .../net-mtu.x86_64-latest.args                |    4 +-
 .../net-openvswitch.x86_64-latest.args        |    2 +-
 ...irtio-network-portgroup.x86_64-latest.args |    6 +-
 ...-virtio-teaming-network.x86_64-latest.args |    2 +-
 .../net-virtio-vhost.x86_64-10.2.0.args       |   42 +
 .../net-virtio-vhost.x86_64-10.2.0.xml        |   65 +
 .../net-virtio-vhost.x86_64-latest.args       |    2 +-
 .../tap-vhost-incorrect.x86_64-latest.args    |    4 +-
 .../user-aliases.x86_64-latest.args           |    2 +-
 tests/qemuxmlconftest.c                       |    4 +
 32 files changed, 2048 insertions(+), 1828 deletions(-)
 create mode 100644 tests/qemuxmlconfdata/net-eth.x86_64-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/net-eth.x86_64-10.2.0.xml
 create mode 100644 tests/qemuxmlconfdata/net-virtio-vhost.x86_64-10.2.0.args
 create mode 100644 tests/qemuxmlconfdata/net-virtio-vhost.x86_64-10.2.0.xml

-- 
2.53.0