On 06.10.2016 21:38, Michal Privoznik wrote:
v2 of:
https://www.redhat.com/archives/libvir-list/2016-August/msg00806.html
The first patches are mostly code movement and cleanups.
diff to v1: - Hopefully all John's review suggestions are worked in now
Michal Privoznik (14): virDomainNetDefParseXML: Realign virDomainNetGetActualType: Return type is virDomainNetType qemuBuildInterfaceCommandLine: Move hostdev handling a bit further qemuBuildInterfaceCommandLine: Move vhostuser handling a bit further qemuBuildInterfaceCommandLine: Move from if-else forest to switch qemuDomainAttachNetDevice: Move hostdev handling a bit further qemuDomainAttachNetDevice: Explicitly list allowed types for hotplug qemuBuildHostNetStr: Explicitly enumerate net types qemuBuildChrChardevStr: Introduce @nowait argument qemuBuildVhostuserCommandLine: Reuse qemuBuildChrChardevStr qemuBuildInterfaceCommandLine: Pass proper args qemuBuildVhostuserCommandLine: Unify -netdev creation qemuBuildHostNetStr: Support VIR_DOMAIN_NET_TYPE_VHOSTUSER qemu_hotplug: Support interface type of vhost-user hotplug
src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/conf/domain_conf.c | 16 +- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 9 +- src/qemu/qemu_command.c | 182 +++++++++++++-------- src/qemu/qemu_hotplug.c | 130 +++++++++++---- src/qemu/qemu_process.c | 13 +- .../qemuxml2argv-net-hostdev-fail.xml | 39 +++++ .../qemuxml2argv-net-vhostuser-fail.xml | 36 ++++ .../qemuxml2argv-net-vhostuser-multiq.args | 6 +- .../qemuxml2argv-net-vhostuser.args | 4 +- tests/qemuxml2argvtest.c | 7 + 15 files changed, 334 insertions(+), 118 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-fail.xml
I've merged patches 10 a 11 as requested, and pushed these. Thank you John for the review! Michal