- Devel - libvirt List Archives

[libvirt] [PATCH v2 2/8] Release address in function granularity than slot
by Shivaprasad G Bhat 18 May '16

18 May '16

The commit 6fe678c is partly reverted. The code is moved around and cant revert staright. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/conf/domain_addr.c | 22 +++++++++------------- src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index acd8ce6..35c7cd4 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -472,21 +472,17 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - /* We do not support hotplug multi-function PCI device now, so we should - * reserve the whole slot. The function of the PCI device must be 0. - */ - if (dev->addr.pci.function != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Only PCI device addresses with function=0" - " are supported")); - goto cleanup; - } + if (((dev->addr.pci.function == 0) && (dev->addr.pci.multi == VIR_TRISTATE_SWITCH_ON)) || + dev->addr.pci.function != 0) { - if (!virDomainPCIAddressValidate(addrs, &dev->addr.pci, - addrStr, flags, true)) - goto cleanup; + if (!virDomainPCIAddressValidate(addrs, &dev->addr.pci, + addrStr, flags, true)) + goto cleanup; - ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci, flags, false, true); + } else { + ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + } } else { ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb24808..e4953b7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -98,6 +98,7 @@ virDomainPCIAddressBusSetModel; virDomainPCIAddressEnsureAddr; virDomainPCIAddressFlagsCompatible; virDomainPCIAddressGetNextSlot; +virDomainPCIAddressReleaseAddr; virDomainPCIAddressReleaseSlot; virDomainPCIAddressReserveAddr; virDomainPCIAddressReserveNextSlot; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9c8c262..1e7d98c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1682,7 +1682,7 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, NULLSTR(devstr)); else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && - virDomainPCIAddressReleaseSlot(priv->pciaddrs, + virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci) < 0) VIR_WARN("Unable to release PCI address on %s", NULLSTR(devstr));

1 0

[libvirt] [PATCH 0/4] qemu: Assign addresses via virDomainDefPostParse
by Cole Robinson 18 May '16

18 May '16

This series adds a new domain post parse callback virDomainDefAssignAddressesCallback, which we use in the qemu driver to trigger qemuDomainAssignAddresses via PostParse. This streamlines things a bit, but is also needed for some future work. After this series, the only remaining open coded qemuDomainAssignAddresses calls involve populating the runtime VM address caches, which I discussesd here: http://www.redhat.com/archives/libvir-list/2016-May/msg01071.html Cole Robinson (4): domain: Add virDomainDefAssignAddressesCallback qemu: Assign device addresses in PostParse qemu: Remove redundant qemuDomainAssignAddresses calls qemu: Call virDomainDefPostParse via CONFIG hotplug src/conf/domain_conf.c | 7 ++ src/conf/domain_conf.h | 8 ++ src/qemu/qemu_domain.c | 25 ++++++ src/qemu/qemu_driver.c | 90 +++++++++------------- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 4 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 11 +-- 7 files changed, 83 insertions(+), 64 deletions(-) -- 2.7.4

3 21

[libvirt] [PATCH 0/2] vz: add domain snapshots functionality
by Nikolay Shirokovskiy 18 May '16

18 May '16

The first patch do all the job. It is rather large but does not touch any existing code so I found it reasonable not to split it. Nikolay Shirokovskiy (2): vz: add domain snapshots functionality vz: drop prlsdkDomainHasSnapshots src/libvirt_private.syms | 2 + src/vz/vz_driver.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 303 +++++++++++++++++++++------ src/vz/vz_sdk.h | 5 + src/vz/vz_utils.h | 1 + 5 files changed, 777 insertions(+), 69 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] Revert "qemu_hotplug: fix checking graphics ports"
by Pavel Hrdina 18 May '16

18 May '16

This reverts commit 1ccc7fbff34ea44e5b0cf01a359d127a4c62a695. We cannot check ports if autoport is set because we set ports to 0 while parsing device XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1336134 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_hotplug.c | 13 ++++++++----- .../qemuhotplug-graphics-spice-listen-network.xml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f40b34d..07b419d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2666,8 +2666,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, switch (dev->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - if (olddev->data.vnc.autoport != dev->data.vnc.autoport || - olddev->data.vnc.port != dev->data.vnc.port) { + if ((olddev->data.vnc.autoport != dev->data.vnc.autoport) || + (!dev->data.vnc.autoport && + (olddev->data.vnc.port != dev->data.vnc.port))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on vnc graphics")); goto cleanup; @@ -2709,9 +2710,11 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - if (olddev->data.spice.autoport != dev->data.spice.autoport || - olddev->data.spice.port != dev->data.spice.port || - olddev->data.spice.tlsPort != dev->data.spice.tlsPort) { + if ((olddev->data.spice.autoport != dev->data.spice.autoport) || + (!dev->data.spice.autoport && + (olddev->data.spice.port != dev->data.spice.port)) || + (!dev->data.spice.autoport && + (olddev->data.spice.tlsPort != dev->data.spice.tlsPort))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot change port settings on spice graphics")); goto cleanup; diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml index f2a6aeb..426a14d 100644 --- a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml @@ -1,4 +1,4 @@ - <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' type='spice'> + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> <channel mode='secure' name='main'/> <channel mode='secure' name='display'/> -- 2.8.2

2 1

[libvirt] [PATCH 0/4] qemu: support for SLIC ACPI tables
by Ján Tomko 18 May '16

18 May '16

Windows uses this BLOB for activation purposes. https://bugzilla.redhat.com/show_bug.cgi?id=1327537 Ján Tomko (4): Separate virDomainDefParseBootOptions conf: add <acpi table> to <os> qemu: format SLIC ACPI table command line security: label the slic_table docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 159 +++++++++++++-------- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 4 + src/security/security_dac.c | 5 + src/security/security_selinux.c | 5 + src/security/virt-aa-helper.c | 4 + .../qemuxml2argvdata/qemuxml2argv-acpi-table.args | 19 +++ tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml | 28 ++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-acpi-table.xml | 32 +++++ tests/qemuxml2xmltest.c | 3 + 13 files changed, 215 insertions(+), 63 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml -- 2.7.3

4 10

[libvirt] [PATCH v2 0/4] Don't disable auto_login for iSCSI targets
by John Ferlan 18 May '16

18 May '16

v1: http://www.redhat.com/archives/libvir-list/2016-May/msg01027.html Changes since v2: * Patch 2 * Remove the 'str' fetch/free - it was unnecessary * Initialize and free 'error' * Did not adjust reported error since with the usage of exitstatus the call to virCommandRunRegex, that means the virCommandWait code will return the error rather than reporting it. So the reporting is left to this code to handle. Kept the same error code (INTERNAL) as virCommandWait Patch 3-5 * Remove 3, combine 4 & 5, but remove the setting of the autologin for libvirt managed targets. This is essentially Fritz's initial patch: http://www.redhat.com/archives/libvir-list/2016-May/msg00002.html but with the adjustment to add the "ATTRIBUTE_UNUSED" for the initiatoriqn parameter (it'll be removed in the next patch as it is a bit more invasive). Fritz Elfert (1): util: Remove disabling of autologin for iscsi-targets John Ferlan (3): util: Add exitstatus parameter to virCommandRunRegex iscsi: Add exit status checking for virISCSIGetSession iscsi: Remove initiatoriqn from virISCSIScanTargets src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 8 ++--- src/storage/storage_backend_logical.c | 10 +++--- src/util/vircommand.c | 9 ++++-- src/util/vircommand.h | 3 +- src/util/viriscsi.c | 60 +++++++++++++++-------------------- src/util/viriscsi.h | 1 - tests/viriscsitest.c | 7 ++-- 8 files changed, 46 insertions(+), 54 deletions(-) -- 2.5.5

2 11

[libvirt] [PATCH v2 0/5] Automatically choose usable GIC version
by Andrea Bolognani 18 May '16

18 May '16

Changes from [v1]: * Factor away some of the logic to virQEMUCapsSupportsGICVersion(), as suggested by, and based on a first implementation by, Cole * Factor away the common test suite bits to testutilsqemu.{h,c} to avoid code duplication [v1] https://www.redhat.com/archives/libvir-list/2016-May/msg00637.html Andrea Bolognani (5): qemu: Add virQEMUCapsSupportsGICVersion() qemu: Automatically choose usable GIC version qemu: Add virQEMUCapsSetGICCapabilities() tests: Prepare to have different usable GIC versions tests: Try different usable GIC versions src/qemu/qemu_capabilities.c | 91 ++++++++++-- src/qemu/qemu_capabilities.h | 9 ++ src/qemu/qemu_domain.c | 49 +++++-- .../qemuxml2argv-aarch64-gic-none-both.args | 1 + .../qemuxml2argv-aarch64-gic-none-both.xml | 1 + .../qemuxml2argv-aarch64-gic-none-v2.args | 1 + .../qemuxml2argv-aarch64-gic-none-v2.xml | 1 + .../qemuxml2argv-aarch64-gic-none-v3.args | 1 + .../qemuxml2argv-aarch64-gic-none-v3.xml | 1 + tests/qemuxml2argvtest.c | 125 +++++++++++++---- .../qemuxml2xmlout-aarch64-gic-none-both.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none-v2.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none-v3.xml | 1 + tests/qemuxml2xmltest.c | 155 ++++++++++++--------- tests/testutilsqemu.c | 36 +++++ tests/testutilsqemu.h | 10 ++ 16 files changed, 361 insertions(+), 123 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml -- 2.5.5

2 13

[libvirt] [PATCH v6 REBASE 0/5] vz: add migration support
by Nikolay Shirokovskiy 18 May '16

18 May '16

Difference from v5 ================== 1. managed case is implemented 2. p2p follows managed migration flow now 3. 'vz: fix const correctness case' is needed to implement managed case. 4. misc options that are always on for vz (--live, --compressed) are not required to be set explicitly. 5. --offline is not supported anymore but migration of inactive domains is possible without this option set. Nikolay Shirokovskiy (5): vz: save session uuid on login vz: fix const correctness case vz: implement managed migration vz: implement p2p migration vz: cleanup: define vz format of uuids src/vz/vz_driver.c | 557 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 90 +++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.c | 2 +- src/vz/vz_utils.h | 6 +- 5 files changed, 645 insertions(+), 16 deletions(-) -- 1.8.3.1

2 14

[libvirt] [PATCH V2 0/3] correct libxl config file convert
by Chunyan Liu 17 May '16

17 May '16

Correct libxl config file type=vif handling. --- Changes in v2: * update xen{Parse,Format}ConfigCommon parameter vif_typename to nativeFomat. To reuse XEN_CONFIG_FORMAT_{XM,XL}, first extract XEN_CONFIG_FORMAT_{XM,XL} to xen_common.h Chunyan Liu (3): extract XEN_CONFIG_FORMAT_XM/XL to xen_common.h xenFormatNet: correct `type=netfront' to 'type=vif' to match libxl xlconfigtest: add test case for type=vif in xl format src/libxl/libxl_driver.c | 14 ++++------ src/xen/xen_driver.h | 3 --- src/xenconfig/xen_common.c | 43 ++++++++++++++++++++++-------- src/xenconfig/xen_common.h | 10 +++++-- src/xenconfig/xen_xl.c | 4 +-- src/xenconfig/xen_xm.c | 4 +-- tests/xlconfigdata/test-vif-typename.cfg | 25 ++++++++++++++++++ tests/xlconfigdata/test-vif-typename.xml | 45 ++++++++++++++++++++++++++++++++ tests/xlconfigtest.c | 1 + 9 files changed, 120 insertions(+), 29 deletions(-) create mode 100644 tests/xlconfigdata/test-vif-typename.cfg create mode 100644 tests/xlconfigdata/test-vif-typename.xml -- 2.1.4

3 8

[libvirt] [PATCH 0/2] bhyve: implement virConnectIsEncrypted and virConnectIsSecure
by Fabian Freyer 17 May '16

17 May '16

These patches implement some rather trivial missing calls in the bhyve driver. Since the bhyve connection (Interaction through /dev/vmm as well as the bhyveload, bhyvectl user-space tools) is local, encryption is not applicable, but the connection is seen as not prone to eavesdropping. Fabian Freyer (2): bhyve: Implement virConnectIsEncrypted bhyve: implement virConnectIsSecure src/bhyve/bhyve_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.7.2

2 3

[libvirt] [PATCH] spec: Remove %defattr usage
by Cole Robinson 17 May '16

17 May '16

It was only needed for rpm versions that are much older than our minimally supported distro Some more details here: https://fedorahosted.org/fpc/ticket/77 --- libvirt.spec.in | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d96917b..c7fcf85 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1514,10 +1514,8 @@ exit 0 %endif %files -%defattr(-, root, root) %files docs -%defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README TODO %doc libvirt-docs/* @@ -1539,7 +1537,6 @@ exit 0 %files daemon -%defattr(-, root, root) %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ @@ -1607,20 +1604,16 @@ exit 0 %doc examples/polkit/*.rules %files daemon-config-network -%defattr(-, root, root) %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml %files daemon-config-nwfilter -%defattr(-, root, root) %{_sysconfdir}/libvirt/nwfilter/*.xml %files daemon-driver-interface -%defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %files daemon-driver-network -%defattr(-, root, root) %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart @@ -1631,27 +1624,22 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %files daemon-driver-nodedev -%defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %files daemon-driver-nwfilter -%defattr(-, root, root) %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %ghost %dir %{_localstatedir}/run/libvirt/network/ %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %files daemon-driver-secret -%defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %files daemon-driver-storage -%defattr(-, root, root) %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so %if %{with_qemu} %files daemon-driver-qemu -%defattr(-, root, root) %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf @@ -1667,7 +1655,6 @@ exit 0 %if %{with_lxc} %files daemon-driver-lxc -%defattr(-, root, root) %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc @@ -1681,7 +1668,6 @@ exit 0 %if %{with_uml} %files daemon-driver-uml -%defattr(-, root, root) %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml %ghost %dir %{_localstatedir}/run/libvirt/uml/ @@ -1691,14 +1677,12 @@ exit 0 %if %{with_xen} %files daemon-driver-xen -%defattr(-, root, root) %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so %endif %if %{with_libxl} %files daemon-driver-libxl -%defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf @@ -1712,43 +1696,35 @@ exit 0 %if %{with_vbox} %files daemon-driver-vbox -%defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %endif %if %{with_qemu_tcg} %files daemon-qemu -%defattr(-, root, root) %endif %if %{with_qemu_kvm} %files daemon-kvm -%defattr(-, root, root) %endif %if %{with_lxc} %files daemon-lxc -%defattr(-, root, root) %endif %if %{with_uml} %files daemon-uml -%defattr(-, root, root) %endif %if %{with_xen} || %{with_libxl} %files daemon-xen -%defattr(-, root, root) %endif %if %{with_vbox} %files daemon-vbox -%defattr(-, root, root) %endif %if %{with_sanlock} %files lock-sanlock -%defattr(-, root, root) %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif @@ -1765,7 +1741,6 @@ exit 0 %endif %files client -f %{name}.lang -%defattr(-, root, root) %doc COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf @@ -1835,8 +1810,6 @@ exit 0 %endif %files devel -%defattr(-, root, root) - %{_libdir}/libvirt.so %{_libdir}/libvirt-qemu.so %{_libdir}/libvirt-lxc.so -- 2.7.4

2 1

[libvirt] [PATCH] fix build with gcc 4.8.5-4 and -Werror=inline option
by Maxim Nestratov 17 May '16

17 May '16

fix numerous inlining errors like: In file included from vircgroupmock.c:24:0: In function 'stat': virmock.h:259:1: error: inlining failed in call to 'callStat.part.1': call is unlikely and code size would grow [-Werror=inline] callStat(int (*realStat)(const char *, struct stat *), --- tests/Makefile.am | 8 +++++--- tests/virmock.c | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/virmock.h | 16 ++-------------- 3 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 tests/virmock.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 238f6da..1f73958 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1071,7 +1071,8 @@ vircgrouptest_SOURCES = \ vircgrouptest_LDADD = $(LDADDS) vircgroupmock_la_SOURCES = \ - vircgroupmock.c + vircgroupmock.c \ + virmock.c vircgroupmock_la_CFLAGS = $(AM_CFLAGS) vircgroupmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) vircgroupmock_la_LIBADD = $(MOCKLIBS_LIBS) @@ -1081,7 +1082,7 @@ vircryptotest_SOURCES = \ vircryptotest_LDADD = $(LDADDS) virhostdevtest_SOURCES = \ - virhostdevtest.c testutils.h testutils.c + virhostdevtest.c testutils.h testutils.c virmock.c virhostdevtest_LDADD = $(LDADDS) virpcitest_SOURCES = \ @@ -1089,7 +1090,8 @@ virpcitest_SOURCES = \ virpcitest_LDADD = $(LDADDS) virpcimock_la_SOURCES = \ - virpcimock.c + virpcimock.c \ + virmock.c virpcimock_la_CFLAGS = $(AM_CFLAGS) virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virpcimock_la_LIBADD = $(MOCKLIBS_LIBS) diff --git a/tests/virmock.c b/tests/virmock.c new file mode 100644 index 0000000..98dd872 --- /dev/null +++ b/tests/virmock.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#ifdef __linux__ +# include "virmock.h" + +int callStat(int (*realStat)(const char *, struct stat *), + int (*realXstat)(int, const char *, struct stat *), + int __ver, const char *__filename, struct stat *__stat_buf) +{ + if (!realXstat) { + if (__ver == _STAT_VER) { + return realStat(__filename, __stat_buf); + } else { + fprintf(stderr, "Not handled __xstat(ver=%d)", __ver); + abort(); + } + } + + return realXstat(__ver, __filename, __stat_buf); +} + +#else +/* Nothing to override on non-__linux__ platforms */ +#endif diff --git a/tests/virmock.h b/tests/virmock.h index 27c03ba..4b50976 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -255,22 +255,10 @@ static void (*real_##name)(void); \ void name(void) -static inline int +int callStat(int (*realStat)(const char *, struct stat *), int (*realXstat)(int, const char *, struct stat *), - int __ver, const char *__filename, struct stat *__stat_buf) -{ - if (!realXstat) { - if (__ver == _STAT_VER) { - return realStat(__filename, __stat_buf); - } else { - fprintf(stderr, "Not handled __xstat(ver=%d)", __ver); - abort(); - } - } - - return realXstat(__ver, __filename, __stat_buf); -} + int __ver, const char *__filename, struct stat *__stat_buf); # define VIR_MOCK_CALL_STAT(__ver, __filename, __stat_buf) \ callStat(real_stat, real___xstat, __ver, __filename, __stat_buf) -- 1.8.3.1

2 2

[libvirt] [PATCH] Change return value of VIR_APPEND*INPLACE* to void
by Jiri Denemark 17 May '16

17 May '16

The INPLACE variants of the VIR_APPEND macros cannot fail and they are inherently quiet. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/util/viralloc.h | 25 +++++++++++-------------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04f1381..3b69771 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13997,7 +13997,7 @@ virDomainChrInsertPreAlloced(virDomainDefPtr vmdef, virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); - ignore_value(VIR_APPEND_ELEMENT_INPLACE(*arrPtr, *cntPtr, chr)); + VIR_APPEND_ELEMENT_INPLACE(*arrPtr, *cntPtr, chr); } virDomainChrDefPtr diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 85c5e0c..2b2e91c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1660,7 +1660,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, goto cleanup; } - ignore_value(VIR_APPEND_ELEMENT_INPLACE(vm->def->rngs, vm->def->nrngs, rng)); + VIR_APPEND_ELEMENT_INPLACE(vm->def->rngs, vm->def->nrngs, rng); ret = 0; diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 5f4e27b..d790b3d 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -436,13 +436,17 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \ true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__) # define VIR_APPEND_ELEMENT_INPLACE(ptr, count, newelem) \ - virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ - VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \ - true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__) + ignore_value(virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ + VIR_TYPEMATCH(ptr, &(newelem)), \ + &(newelem), true, true, false, \ + VIR_FROM_THIS, __FILE__, \ + __FUNCTION__, __LINE__)) # define VIR_APPEND_ELEMENT_COPY_INPLACE(ptr, count, newelem) \ - virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ - VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \ - true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__) + ignore_value(virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ + VIR_TYPEMATCH(ptr, &(newelem)), \ + &(newelem), false, true, false, \ + VIR_FROM_THIS, __FILE__, \ + __FUNCTION__, __LINE__)) /* Quiet version of macros above */ # define VIR_APPEND_ELEMENT_QUIET(ptr, count, newelem) \ @@ -453,14 +457,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \ false, 0, NULL, NULL, 0) -# define VIR_APPEND_ELEMENT_INPLACE_QUIET(ptr, count, newelem) \ - virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ - VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \ - false. 0, NULL, NULL, 0) -# define VIR_APPEND_ELEMENT_COPY_INPLACE_QUIET(ptr, count, newelem) \ - virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ - VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \ - false, 0, NULL, NULL, 0) + /** * VIR_DELETE_ELEMENT: * @ptr: pointer to array of objects (*not* ptr to ptr) -- 2.8.2

2 1

[libvirt] [PATCH] Remove virDomainRNGInsert
by Jiri Denemark 17 May '16

17 May '16

It was just a useless wrapper around VIR_APPEND_ELEMENT*. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 12 ------------ src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 3 +-- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ed0c471..04f1381 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14024,18 +14024,6 @@ virDomainChrRemove(virDomainDefPtr vmdef, } -int -virDomainRNGInsert(virDomainDefPtr def, - virDomainRNGDefPtr rng, - bool inplace) -{ - if (inplace) - return VIR_APPEND_ELEMENT_INPLACE(def->rngs, def->nrngs, rng); - else - return VIR_APPEND_ELEMENT(def->rngs, def->nrngs, rng); -} - - ssize_t virDomainRNGFind(virDomainDefPtr def, virDomainRNGDefPtr rng) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b9e696d..3ad3604 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2909,9 +2909,6 @@ virDomainChrDefPtr virDomainChrRemove(virDomainDefPtr vmdef, virDomainChrDefPtr chr); -int virDomainRNGInsert(virDomainDefPtr def, - virDomainRNGDefPtr rng, - bool inplace); ssize_t virDomainRNGFind(virDomainDefPtr def, virDomainRNGDefPtr rng); virDomainRNGDefPtr virDomainRNGRemove(virDomainDefPtr def, size_t idx); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8408081..9514201 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -424,7 +424,6 @@ virDomainRedirdevBusTypeToString; virDomainRNGBackendTypeToString; virDomainRNGDefFree; virDomainRNGFind; -virDomainRNGInsert; virDomainRNGModelTypeToString; virDomainRNGRemove; virDomainRunningReasonTypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 37d970e..00daf72 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7914,7 +7914,7 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, return -1; } - if (virDomainRNGInsert(vmdef, dev->data.rng, false) < 0) + if (VIR_APPEND_ELEMENT(vmdef->rngs, vmdef->nrngs, dev->data.rng) < 0) return -1; dev->data.rng = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f8ab095..85c5e0c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1660,8 +1660,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, goto cleanup; } - if (virDomainRNGInsert(vm->def, rng, true) < 0) - goto audit; + ignore_value(VIR_APPEND_ELEMENT_INPLACE(vm->def->rngs, vm->def->nrngs, rng)); ret = 0; -- 2.8.2

2 1

[libvirt] [PATCH] qemu: hotplug: Report error if we hit tray status timeout
by Cole Robinson 17 May '16

17 May '16

If we exceed the timeout waiting for the tray status to change, we don't report an error. Fix it --- I hit this trying to eject floppy media for a win10 VM with F24 qemu, but I didn't dig deeper to figure out _why_ it's timing out... src/qemu/qemu_hotplug.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 03e5309..e5f8a38 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -224,7 +224,13 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, goto error; while (disk->tray_status != VIR_DOMAIN_DISK_TRAY_OPEN) { - if (virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT) != 0) + int rc2 = virDomainObjWaitUntil(vm, now + CHANGE_MEDIA_TIMEOUT); + if (rc2 == 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("timed out waiting for " + "disk tray status update")); + } + if (rc2 != 0) goto error; } } while (rc < 0); -- 2.7.4

3 8

[libvirt] [PATCH v2 0/3] Cosmetic changes to SPICE QEMU commandline
by Christophe Fergeau 17 May '16

17 May '16

Hey, This is a v2 of the series I previously sent. Changes since v1: - much nicer cmdline generation in patch 1/3 - improved commit log in 1/3 - moved part of patch 1/3 to 3/3 - added test case in 3/3 Christophe

3 14

[libvirt] [PATCH 0/6] RESEND vz: minor fixes
by Maxim Nestratov 17 May '16

17 May '16

Mikhail Feoktistov (2): vz: handle sourceless cdroms vz: fix template ct creation Nikolay Shirokovskiy (4): vz: remove check for auto file format for disks vz: fix vzCheckUnsupportedDisks format checks for cdroms vz: fix error message for readonly fs vz: make error path code idiomatic src/vz/vz_sdk.c | 29 +++++++++++++++++++---------- src/vz/vz_utils.c | 23 +++++++++-------------- 2 files changed, 28 insertions(+), 24 deletions(-) -- 2.4.3

1 8

[libvirt] [PATCH] admin: include: Rename argument dmn to conn in virAdmConnectListServers
by Erik Skultety 17 May '16

17 May '16

This is just a trivial cosmetic change, throughout all the APIs the argument is called conn as from 'connection', having 'dmn' at just this single place might look odd, so better change it now when the interface is still explicitly disabled and we still have the ability to alter the signatures and public names before officially enabling it. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- pushed under trivial rule Erik include/libvirt/libvirt-admin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h index 4e6074e..bde4aef 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -91,7 +91,7 @@ int virAdmConnectRef(virAdmConnectPtr conn); int virAdmConnectIsAlive(virAdmConnectPtr conn); int virAdmServerFree(virAdmServerPtr srv); -int virAdmConnectListServers(virAdmConnectPtr dmn, +int virAdmConnectListServers(virAdmConnectPtr conn, virAdmServerPtr **servers, unsigned int flags); -- 2.5.5

1 0

[libvirt] [PATCH v3 00/14] improve graphics listen configuration
by Pavel Hrdina 17 May '16

17 May '16

This patch series improves the way how different listen types can be specified and also introduce a new listen types for graphics devices. First improvement is to move ports out of graphics element into listen element with type address or network. This is a first step to make the code listen-driven. Second step is to create a new listen type socket to improve the current vnc configuration and to print only socket path witout any other listen types. With the new socket type now we can add support also to spice graphics. The last improvement is to introduce new listen type none for spice and vnc graphics to specify that the spice graphics shouldn't listen anywhere by default. In case of spice graphics the new listen types socket or none are required to start a guest with OpenGL support. Changes in v3: - add listen type none support for vnc - fix issues pointed out in v2 Changes in v2: - don't remove vnc_auto_unix_socket from qemu.conf - add spice_auto_unix_socket Pavel Hrdina (14): graphics: don't parse listens if socket attribute is present domain_conf: parse listen attribute while parsing listen elements graphics: make address attribute for listen type='address' optional domain_conf: cleanup virDomainGraphicsListenDefParseXML graphics: move port definition to listen element graphics: introduce listen type=socket and use it for VNC qemu_capabilites: add QEMU_CAPS_SPICE_UNIX qemu_command: refactor spice channel code spice: add support for listen type socket qemu_process: separate graphics socket and address generation tests: cleanup vnc auto socket test spice: introduce spice_auto_unix_socket config option spice: introduce listen type none vnc: add support for listen type none docs/formatdomain.html.in | 141 +++-- docs/schemas/domaincommon.rng | 63 +- src/conf/domain_conf.c | 637 ++++++++++++++------- src/conf/domain_conf.h | 31 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 53 +- src/libxl/libxl_domain.c | 17 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 17 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 273 +++++---- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 19 +- src/qemu/qemu_hotplug.c | 40 +- src/qemu/qemu_migration.c | 50 +- src/qemu/qemu_parse_command.c | 41 +- src/qemu/qemu_process.c | 351 ++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/virt-aa-helper.c | 15 +- src/vbox/vbox_common.c | 30 +- src/vbox/vbox_tmpl.c | 34 +- src/vbox/vbox_uniformed_api.h | 4 +- src/vmx/vmx.c | 54 +- src/vz/vz_sdk.c | 30 +- src/xenconfig/xen_common.c | 75 ++- src/xenconfig/xen_sxpr.c | 71 +-- src/xenconfig/xen_xl.c | 45 +- .../generic-graphics-listen-back-compat-ports.xml | 30 + ...generic-graphics-vnc-listen-element-minimal.xml | 2 +- ...aphics-vnc-listen-element-with-address-port.xml | 30 + ...ric-graphics-vnc-socket-attr-listen-address.xml | 30 + ...hics-vnc-socket-attr-listen-socket-mismatch.xml | 30 + ...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 + .../generic-graphics-listen-back-compat-ports.xml | 30 + .../generic-graphics-listen-back-compat.xml | 2 +- .../generic-graphics-vnc-listen-attr-only.xml | 2 +- ...generic-graphics-vnc-listen-element-minimal.xml | 4 +- ...aphics-vnc-listen-element-with-address-port.xml | 30 + ...ic-graphics-vnc-listen-element-with-address.xml | 2 +- .../generic-graphics-vnc-manual-port.xml | 4 +- .../generic-graphics-vnc-minimal.xml | 4 +- ...ric-graphics-vnc-socket-attr-listen-address.xml | 30 + ...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 + .../generic-graphics-vnc-socket-listen.xml | 2 +- .../generic-graphics-vnc-socket.xml | 4 +- tests/genericxml2xmltest.c | 7 + .../qemuargv2xml-graphics-vnc-policy.xml | 2 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 2 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 2 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 2 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- ...emuxml2argv-graphics-spice-auto-socket-cfg.args | 20 + ...qemuxml2argv-graphics-spice-auto-socket-cfg.xml | 30 + .../qemuxml2argv-graphics-spice-auto-socket.args | 20 + .../qemuxml2argv-graphics-spice-auto-socket.xml | 30 + .../qemuxml2argv-graphics-spice-socket.args | 20 + .../qemuxml2argv-graphics-spice-socket.xml | 30 + .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args | 22 + .../qemuxml2argv-graphics-vnc-auto-socket-cfg.xml | 34 ++ .../qemuxml2argv-graphics-vnc-auto-socket.args | 20 + .../qemuxml2argv-graphics-vnc-auto-socket.xml | 30 + .../qemuxml2argv-graphics-vnc-autosocket.args | 22 - .../qemuxml2argv-graphics-vnc-autosocket.xml | 34 -- .../qemuxml2argv-graphics-vnc-socket.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 10 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 16 + .../qemuxml2xmlout-graphics-listen-network.xml | 2 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 4 +- ...muxml2xmlout-graphics-spice-auto-socket-cfg.xml | 35 ++ .../qemuxml2xmlout-graphics-spice-auto-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-spice-compression.xml | 2 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 2 +- .../qemuxml2xmlout-graphics-spice-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmlout-graphics-spice.xml | 2 +- ...qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml | 41 ++ .../qemuxml2xmlout-graphics-vnc-auto-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-vnc-autosocket.xml | 39 -- .../qemuxml2xmlout-graphics-vnc-no-listen-attr.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-vnc-tls.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-websocket.xml | 2 +- .../qemuxml2xmlout-graphics-vnc.xml | 2 +- .../qemuxml2xmlout-interface-server.xml | 4 +- .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-pci-bridge.xml | 2 +- ...emuxml2xmlout-seclabel-dynamic-none-relabel.xml | 2 +- .../qemuxml2xmlout-serial-spiceport.xml | 2 +- .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 3 +- tests/qemuxml2xmltest.c | 19 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 4 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 4 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 4 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 4 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 4 +- tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 4 +- .../test-disk-positional-parms-full.xml | 2 +- .../test-disk-positional-parms-partial.xml | 2 +- ...est-fullvirt-direct-kernel-boot-bogus-extra.xml | 2 +- .../test-fullvirt-direct-kernel-boot-extra.xml | 2 +- .../test-fullvirt-direct-kernel-boot.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- .../xmconfigdata/test-fullvirt-default-feature.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 4 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 4 +- 172 files changed, 2310 insertions(+), 987 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-graphics-listen-back-compat-ports.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address-port.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-listen-back-compat-ports.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address-port.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml -- 2.8.2

3 24

[libvirt] [PATCH] docs: formatdomain: document virtio-mmio device addresses
by Cole Robinson 17 May '16

17 May '16

--- docs/formatdomain.html.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 58b8cb6..a461a4e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2980,6 +2980,13 @@ set to 0xfe. <span class="since">Since 1.0.4</span> </dd> + <dt><code>virtio-mmio</code></dt> + <dd>This places the device on the virtio-mmio transport, which is + currently only available for some <code>armv7l</code> and + <code>aarch64</code> virtual machines. virtio-mmio addresses + do not have any additional attributes. + <span class="since">Since 1.1.3</span> + </dd> <dt><code>isa</code></dt> <dd>ISA addresses have the following additional attributes: <code>iobase</code> and <code>irq</code>. -- 2.7.4

2 1

[libvirt] [PATCH 0/2] correct libxl config file convert
by Chunyan Liu 17 May '16

17 May '16

Correct libxl config file type=vif handling. Chunyan Liu (2): xenFormatNet: correct `type=netfront' to 'type=vif' to match libxl xlconfigtest: add test case for type=vif in xl format src/xenconfig/xen_common.c | 38 ++++++++++++++++++----------- src/xenconfig/xen_common.h | 7 +++--- src/xenconfig/xen_xl.c | 4 +-- src/xenconfig/xen_xm.c | 8 +++--- tests/xlconfigdata/test-vif-typename.cfg | 25 +++++++++++++++++++ tests/xlconfigdata/test-vif-typename.xml | 42 ++++++++++++++++++++++++++++++++ tests/xlconfigtest.c | 1 + 7 files changed, 102 insertions(+), 23 deletions(-) create mode 100644 tests/xlconfigdata/test-vif-typename.cfg create mode 100644 tests/xlconfigdata/test-vif-typename.xml -- 2.1.4

4 17

[libvirt] [PATCH] conf: Allow all volume modes for disk type='lun' sources
by Peter Krempa 17 May '16

17 May '16

Commit 82ba41108acd0f3f made possible to use direct mapped iSCSI volumes in qemu as disk sources but didn't remove the define time check. Rework the check by simplifying the condition and allow any volumes to be used with disk type='lun'. --- src/conf/domain_conf.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 571b7bf..9484404 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4184,26 +4184,18 @@ virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev, } } - /* Validate LUN configuration - * NOTE: virStorageTranslateDiskSourcePool is not run yet, so for - * disk "volume"'s, the closest we can get at config time is - * to ensure mode isn't direct since host/default will allow - * lun/block usage. At run time if it's determined the wrong - * voltype and pooltype values are set, then failure occurs - */ - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN && - !(disk->src->type == VIR_STORAGE_TYPE_BLOCK || - (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) || - (disk->src->type == VIR_STORAGE_TYPE_VOLUME && - disk->src->srcpool && - disk->src->srcpool->mode != - VIR_STORAGE_SOURCE_POOL_MODE_DIRECT))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' improperly configured for a " - "device='lun'"), - disk->dst); - return -1; + /* Validate LUN configuration */ + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + /* volumes weren't translated at this point, so accept them */ + if (!(disk->src->type == VIR_STORAGE_TYPE_BLOCK || + disk->src->type == VIR_STORAGE_TYPE_VOLUME || + (disk->src->type == VIR_STORAGE_TYPE_NETWORK && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk '%s' improperly configured for a " + "device='lun'"), disk->dst); + return -1; + } } if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && -- 2.8.2

2 2

[libvirt] [PATCH] libxl: add .domainInterfaceAddresses
by Chunyan Liu 17 May '16

17 May '16

Add .domainInterfaceAddresses so that user can have a way to get domain interface address by 'virsh domifaddr'. Currently it only supports '--source lease'. Signed-off: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_driver.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 062d6f8..f2bd6fa 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr conn, return 0; } +static int +libxlGetDHCPInterfaces(virDomainPtr dom, + virDomainObjPtr vm, + virDomainInterfacePtr **ifaces) +{ + int rv = -1; + int n_leases = 0; + size_t i, j; + size_t ifaces_count = 0; + virNetworkPtr network = NULL; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainInterfacePtr iface = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + virDomainInterfacePtr *ifaces_ret = NULL; + + if (!dom->conn->networkDriver || + !dom->conn->networkDriver->networkGetDHCPLeases) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Network driver does not support DHCP lease query")); + return -1; + } + + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + virObjectUnref(network); + network = virNetworkLookupByName(dom->conn, + vm->def->nets[i]->data.network.name); + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + goto error; + + if (n_leases) { + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) + goto error; + + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) + goto error; + + iface = ifaces_ret[ifaces_count - 1]; + /* Assuming each lease corresponds to a separate IP */ + iface->naddrs = n_leases; + + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) + goto error; + + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) + goto cleanup; + } + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + virDomainIPAddressPtr ip_addr = &iface->addrs[j]; + + if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) + goto cleanup; + + ip_addr->type = lease->type; + ip_addr->prefix = lease->prefix; + } + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + } + + *ifaces = ifaces_ret; + ifaces_ret = NULL; + rv = ifaces_count; + + cleanup: + virObjectUnref(network); + if (leases) { + for (i = 0; i < n_leases; i++) + virNetworkDHCPLeaseFree(leases[i]); + } + VIR_FREE(leases); + + return rv; + + error: + if (ifaces_ret) { + for (i = 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + VIR_FREE(ifaces_ret); + + goto cleanup; +} + + +static int +libxlDomainInterfaceAddresses(virDomainPtr dom, + virDomainInterfacePtr **ifaces, + unsigned int source, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + + switch (source) { + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: + ret = libxlGetDHCPInterfaces(dom, vm, ifaces); + break; + + default: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unsupported IP address data source %d"), + source); + break; + } + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static virHypervisorDriver libxlHypervisorDriver = { .name = LIBXL_DRIVER_NAME, .connectOpen = libxlConnectOpen, /* 0.9.0 */ @@ -5525,6 +5664,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ + .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ }; static virConnectDriver libxlConnectDriver = { -- 1.8.5.6

4 3

[libvirt] [PATCH v2 0/3] Drop QEMU_CAPS_PCI_ROMBAR and a couple more
by Andrea Bolognani 16 May '16

16 May '16

Differences from [v1]: * Instead of unconditionally enable capabilities that are guaranteed to be available on any QEMU version we support, prefix them with X_ and remove all uses, as suggested by Pavel and Cole [v1] https://www.redhat.com/archives/libvir-list/2016-May/msg00967.html Andrea Bolognani (3): qemu: Drop QEMU_CAPS_PCI_ROMBAR qemu: Drop QEMU_CAPS_CPU_HOST qemu: Drop QEMU_CAPS_VIRTIO_BLK_SG_IO src/qemu/qemu_capabilities.c | 36 ++--------- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 32 ++-------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 - .../caps_2.6.0-gicv2.aarch64.xml | 2 - .../caps_2.6.0-gicv3.aarch64.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 - tests/qemuhelptest.c | 24 ------- tests/qemuxml2argvtest.c | 73 +++++++++++----------- 18 files changed, 47 insertions(+), 159 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH] qemu: Allow suffixes for the RAM option and fix it's type
by Nishith Shah 16 May '16

16 May '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=812295 According to QEMU docs, the '-m' option for specifying RAM is by default in MiB, and a suffix of "M" or "G" may be passed for values in MiB and GiB respectively. This commit adds support and a test for the same. Also, change the type of mem from int to unsigned long long as per convention and also because virDomainDefSetMemoryTotal expects the latter. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com> --- src/qemu/qemu_parse_command.c | 14 +++++++++---- tests/qemuargv2xmldata/qemuargv2xml-m.args | 22 ++++++++++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-m.xml | 33 ++++++++++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-m.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-m.xml diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index e30586f..48076eb 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1869,15 +1869,21 @@ qemuParseCommandLine(virCapsPtr caps, } else if (STREQ(arg, "-sdl")) { have_sdl = true; } else if (STREQ(arg, "-m")) { - int mem; + unsigned long long mem; + char *end; WANT_VALUE(); - if (virStrToLong_i(val, NULL, 10, &mem) < 0) { + if (virStrToLong_ull(val, &end, 10, &mem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, \ _("cannot parse memory level '%s'"), val); goto error; } - virDomainDefSetMemoryTotal(def, mem * 1024); - def->mem.cur_balloon = mem * 1024; + if (virScaleInteger(&mem, end, 1024 * 1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, \ + _("cannot scale memory '%s'"), val); + goto error; + } + virDomainDefSetMemoryTotal(def, mem / 1024); + def->mem.cur_balloon = mem / 1024; } else if (STREQ(arg, "-smp")) { WANT_VALUE(); if (qemuParseCommandLineSmp(def, val) < 0) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-m.args b/tests/qemuargv2xmldata/qemuargv2xml-m.args new file mode 100644 index 0000000..90da94d --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-m.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 2G \ +-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-m.xml b/tests/qemuargv2xmldata/qemuargv2xml-m.xml new file mode 100644 index 0000000..8002e00 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-m.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' current='1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 48c83ea..c7bbc5b 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -264,6 +264,7 @@ mymain(void) DO_TEST("hostdev-pci-address"); + DO_TEST("m"); DO_TEST("smp"); DO_TEST("hyperv"); -- 2.1.4

2 1