- Devel - libvirt List Archives

[libvirt] [PATCH] spec: Advertise nvram paths of official fedora edk2 builds
by Cole Robinson 07 Jun '16

07 Jun '16

Fedora now ships edk2 firmware in its official repos, so adapt the nvram path list to match. Eventually we can remove the nightly links as well once some integration kinks have been worked out, and documentation updated. Move the macro building into the %build target, which lets us build up a shell variable and make things a bit more readable https://bugzilla.redhat.com/show_bug.cgi?id=1335395 --- libvirt.spec.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c7fcf85..8b88eef 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -192,12 +192,6 @@ %define qemu_group qemu -# Advertise OVMF and AAVMF from nightly firmware repo -%if 0%{?fedora} - %define arg_loader_nvram --with-loader-nvram="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" -%endif - - %if 0%{?fedora} || 0%{?rhel} >= 7 %define with_systemd_macros 1 %else @@ -1097,6 +1091,18 @@ rm -rf .git %define arg_selinux_mount --with-selinux-mount="/selinux" %endif +%if 0%{?fedora} + # Nightly firmware repo x86/OVMF + LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" + # Nightly firmware repo aarch64/AAVMF + LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" + # Fedora official x86/OVMF + LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" + # Fedora official aarch64/AAVMF + LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" + %define arg_loader_nvram --with-loader-nvram="$LOADERS" +%endif + # place macros above and build commands below this comment %if 0%{?enable_autotools} -- 2.7.4

2 3

[libvirt] [PATCH] qemu: process: Allow VIR_QEMU_PROCESS_START_NEW in qemuProcessLaunch
by Peter Krempa 07 Jun '16

07 Jun '16

The new flag was not added to virCheckFlags in commit '0d1c17aa' causing a regression where VMs were not able to start. --- Pushed under the trivial rule. src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2f5829c..66bc4b1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5062,7 +5062,8 @@ qemuProcessLaunch(virConnectPtr conn, * but doesn't hurt to check */ virCheckFlags(VIR_QEMU_PROCESS_START_COLD | VIR_QEMU_PROCESS_START_PAUSED | - VIR_QEMU_PROCESS_START_AUTODESTROY, -1); + VIR_QEMU_PROCESS_START_AUTODESTROY | + VIR_QEMU_PROCESS_START_NEW, -1); cfg = virQEMUDriverGetConfig(driver); -- 2.8.3

1 0

[libvirt] [PATCH REPOST 0/4] Couple of random and crypto adjustments
by John Ferlan 07 Jun '16

07 Jun '16

Originally posted : http://www.redhat.com/archives/libvir-list/2016-May/msg01650.html Updated to current head and reposted. John Ferlan (4): util: Add range parameters to virRandomBytes storage: Use virRandomBytes for virStorageGenerateQcowPassphrase util: Alter virCryptoEncryptData for non GNUTLS builds util: Adjust virCryptoEncryptData code to use macros src/storage/storage_backend.c | 10 +++-- src/util/vircrypto.c | 88 +++++++++++++++++++++++++---------------- src/util/virrandom.c | 13 ++++-- src/util/virrandom.h | 3 +- src/util/virstorageencryption.c | 42 +++++++------------- src/util/virstorageencryption.h | 4 +- src/util/viruuid.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/vircryptotest.c | 4 +- tests/virrandommock.c | 10 +++-- tests/virrandomtest.c | 32 +++++++++++---- 11 files changed, 124 insertions(+), 86 deletions(-) -- 2.5.5

2 9

[libvirt] [PATCH v6 0/2] qemu: Support for QXL heads
by Martin Kletzander 07 Jun '16

07 Jun '16

v6: - Change heads when migrating (revert v2) - https://www.redhat.com/archives/libvir-list/2016-June/msg00106.html v5: - Just a rebase, plus v4 had some hunk in that didn't belong there so this one's cleaner to look at - https://www.redhat.com/archives/libvir-list/2016-April/msg00721.html v4: - Added test case without "heads=" - Don't consolidate 'size_t i, j' declarations - https://www.redhat.com/archives/libvir-list/2016-March/msg01436.html v3: - rebase on top of current master in order to cleanly apply - https://www.redhat.com/archives/libvir-list/2016-March/msg01198.html v2: - don't change heads when migrating - https://www.redhat.com/archives/libvir-list/2016-March/msg00811.html v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 *** BLURB HERE *** Martin Kletzander (2): qemu: Check for qxl's max_outputs parameter qemu: Add support to QXL's max_outputs parameter src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 4 ++ src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_migration.c | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 + .../qemuxml2argv-video-qxl-heads.args | 28 +++++++++++++ .../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++++++++ .../qemuxml2argv-video-qxl-noheads.args | 24 +++++++++++ .../qemuxml2argv-video-qxl-noheads.xml | 39 ++++++++++++++++++ tests/qemuxml2argvtest.c | 16 ++++++++ .../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++++++++ .../qemuxml2xmlout-video-qxl-noheads.xml | 39 ++++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 15 files changed, 266 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml -- 2.8.3

2 5

[libvirt] [PATCH v2 0/3] Adjust qemu-img switches and checks
by John Ferlan 07 Jun '16

07 Jun '16

v1:http://www.redhat.com/archives/libvir-list/2016-June/msg00081.html (patches 4, 6, and 7) Patch 4 is now patch 1 Patch 6 was reviewed, but this patch alters it not need backingType Patch 7 reworked to accommodate patch 1 changes John Ferlan (3): storage: Adjust qemu-img switches check storage: Create helper to set backing for CreateQemuImg code storage: Create helper to set options for CreateQemuImg code src/storage/storage_backend.c | 223 ++++++++++----------- tests/storagevolxml2argvdata/qcow2-flag.argv | 2 - .../qcow2-nobacking-convert-flag.argv | 2 - .../qcow2-nobacking-convert-none.argv | 2 - .../qcow2-nobacking-flag.argv | 1 - .../qcow2-nobacking-none.argv | 1 - tests/storagevolxml2argvdata/qcow2-none.argv | 1 - tests/storagevolxml2argvtest.c | 22 +- 8 files changed, 107 insertions(+), 147 deletions(-) delete mode 100644 tests/storagevolxml2argvdata/qcow2-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-none.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-none.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-none.argv -- 2.5.5

2 5

[libvirt] [PATCH v2 00/10] Add domain config validation infrastructure
by Peter Krempa 07 Jun '16

07 Jun '16

Similarly to post parse callbacks let's add infrastructure that will allow us to introduce checks that will reject configrations that were previously valid. This is achieved by flagging all the entry points to the config parser that need to ignore invadid configurations and adding a callback infrastructure for driver specific checks. Peter Krempa (10): conf: Rename VIR_DOMAIN_DEF_PARSE_VALIDATE to VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA conf: Add infrastructure for adding configuration validation conf: drop 'def' from struct virDomainDefPostParseDeviceIteratorData conf: Add device def validation callback qemu: process: Unexport qemuProcessStartValidate qemu: process: Convert multiple boolean args to a single flag qemu: process: Call the domain config validator when starting a new VM conf: Move disk info validator to the domain conf validator conf: Move validation of disk LUN device to the appropriate place qemu: Move check that validates 'min_guarantee' to qemuDomainDefValidate src/bhyve/bhyve_driver.c | 4 +- src/conf/domain_conf.c | 225 ++++++++++++++++++++++++++++++++++-------- src/conf/domain_conf.h | 31 +++++- src/conf/snapshot_conf.c | 3 +- src/conf/virdomainobjlist.c | 6 +- src/esx/esx_driver.c | 2 +- src/libvirt_private.syms | 2 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 10 +- src/libxl/libxl_migration.c | 6 +- src/lxc/lxc_driver.c | 7 +- src/openvz/openvz_driver.c | 7 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_domain.c | 20 +++- src/qemu/qemu_driver.c | 15 +-- src/qemu/qemu_migration.c | 14 ++- src/qemu/qemu_process.c | 42 ++++---- src/qemu/qemu_process.h | 9 +- src/security/virt-aa-helper.c | 3 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 7 +- src/vbox/vbox_common.c | 5 +- src/vmware/vmware_driver.c | 4 +- src/vz/vz_driver.c | 6 +- src/xen/xen_driver.c | 4 +- src/xen/xend_internal.c | 3 +- src/xen/xm_internal.c | 3 +- src/xenapi/xenapi_driver.c | 4 +- tests/qemuxml2argvtest.c | 6 +- 29 files changed, 325 insertions(+), 132 deletions(-) -- 2.8.3

2 21

[libvirt] [PATCH v2] systemd: directly notify systemd instead of using sd_notify
by Daniel P. Berrange 07 Jun '16

07 Jun '16

The sd_notify method is used to tell systemd when libvirtd has finished starting up. All it does is send a datagram containing the string parameter to systemd on a UNIX socket named in the NOTIFY_SOCKET environment variable. Rather than pulling in the systemd libraries for this, just code the notification directly in libvirt as this is a stable ABI from systemd's POV which explicitly allows independant implementations: See "Reimplementable Independently" column in the "$NOTIFY_SOCKET Daemon Notifications" row: https://www.freedesktop.org/wiki/Software/systemd/InterfacePortabilityAndSt… Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 -- libvirt.spec.in | 12 ----------- m4/virt-systemd-daemon.m4 | 34 ------------------------------ src/Makefile.am | 4 ++-- src/util/virsystemd.c | 53 ++++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 50 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-systemd-daemon.m4 diff --git a/configure.ac b/configure.ac index 74c33b3..a63b912 100644 --- a/configure.ac +++ b/configure.ac @@ -256,7 +256,6 @@ LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 -LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_NSS @@ -2787,7 +2786,6 @@ LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 -LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_WIRESHARK LIBVIRT_RESULT_NSS diff --git a/libvirt.spec.in b/libvirt.spec.in index 8b88eef..b93a53c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -79,7 +79,6 @@ %define with_firewalld 0%{!?_without_firewalld:0} %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} -%define with_systemd_daemon 0%{!?_without_systemd_daemon:0} %define with_pm_utils 1 # Finally set the OS / architecture specific special cases @@ -133,7 +132,6 @@ # Fedora has systemd, libvirt still used sysvinit there. %if 0%{?fedora} || 0%{?rhel} >= 7 %define with_systemd 1 - %define with_systemd_daemon 1 %define with_pm_utils 0 %endif @@ -268,9 +266,6 @@ BuildRequires: python %if %{with_systemd} BuildRequires: systemd-units %endif -%if %{with_systemd_daemon} -BuildRequires: systemd-devel -%endif %if %{with_xen} || %{with_libxl} BuildRequires: xen-devel %endif @@ -1061,12 +1056,6 @@ rm -rf .git %define arg_wireshark --without-wireshark-dissector %endif -%if %{with_systemd_daemon} - %define arg_systemd_daemon --with-systemd-daemon -%else - %define arg_systemd_daemon --without-systemd-daemon -%endif - %if %{with_pm_utils} %define arg_pm_utils --with-pm-utils %else @@ -1157,7 +1146,6 @@ rm -f po/stamp-po --with-driver-modules \ %{?arg_firewalld} \ %{?arg_wireshark} \ - %{?arg_systemd_daemon} \ %{?arg_pm_utils} \ --with-nss-plugin \ %{arg_packager} \ diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4 deleted file mode 100644 index 8516e41..0000000 --- a/m4/virt-systemd-daemon.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl The libsystemd-daemon.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[ - LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1]) - - old_CFLAGS="$CFLAGS" - old_LIBS="$LIBS" - CFLAGS="$CFLAGS $SYSTEMD_DAEMON_CFLAGS" - LIBS="$LIBS $SYSTEMD_DAEMON_LIBS" - AC_CHECK_FUNCS([sd_notify]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" -]) - -AC_DEFUN([LIBVIRT_RESULT_SYSTEMD_DAEMON],[ - LIBVIRT_RESULT_LIB([SYSTEMD_DAEMON]) -]) diff --git a/src/Makefile.am b/src/Makefile.am index 12b66c2..11c79df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1106,12 +1106,12 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(SYSTEMD_DAEMON_CFLAGS) $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) \ + $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) \ -I$(srcdir)/conf libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) \ + $(SECDRIVER_LIBS) $(NUMACTL_LIBS) \ $(POLKIT_LIBS) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 4883f94..871db7e 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -21,8 +21,9 @@ #include <config.h> -#ifdef WITH_SYSTEMD_DAEMON -# include <systemd/sd-daemon.h> +#include <sys/socket.h> +#ifdef HAVE_SYS_UN_H +# include <sys/un.h> #endif #include "virsystemd.h" @@ -34,6 +35,7 @@ #include "virutil.h" #include "virlog.h" #include "virerror.h" +#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_SYSTEMD @@ -480,9 +482,50 @@ int virSystemdTerminateMachine(const char *name) void virSystemdNotifyStartup(void) { -#ifdef WITH_SYSTEMD_DAEMON - sd_notify(0, "READY=1"); -#endif +#ifdef HAVE_SYS_UN_H + const char *path; + const char *msg = "READY=1"; + int fd; + struct sockaddr_un un = { + .sun_family = AF_UNIX, + }; + struct iovec iov = { + .iov_base = (char *)msg, + .iov_len = strlen(msg), + }; + struct msghdr mh = { + .msg_name = &un, + .msg_namelen = sizeof(un), + .msg_iov = &iov, + .msg_iovlen = 1, + }; + + if (!(path = virGetEnvBlockSUID("NOTIFY_SOCKET"))) { + VIR_DEBUG("Skipping systemd notify, not requested"); + return; + } + + /* NB sun_path field is *not* NUL-terminated, hence >, not >= */ + if (strlen(path) > sizeof(un.sun_path)) { + VIR_WARN("Systemd notify socket path '%s' too long", path); + return; + } + + memcpy(un.sun_path, path, strlen(path)); + if (un.sun_path[0] == '@') + un.sun_path[0] = '\0'; + + fd = socket(AF_UNIX, SOCK_DGRAM, 0); + if (fd < 0) { + VIR_WARN("Unable to create socket FD"); + return; + } + + if (sendmsg(fd, &mh, MSG_NOSIGNAL) < 0) + VIR_WARN("Failed to notify systemd"); + + VIR_FORCE_CLOSE(fd); +#endif /* HAVE_SYS_UN_H */ } static int -- 2.5.5

4 3

[libvirt] [PATCH 0/7] Cleanup with storageencryption/qemu-img
by John Ferlan 06 Jun '16

06 Jun '16

The first 4 patches were already posted: http://www.redhat.com/archives/libvir-list/2016-May/msg01984.htm http://www.redhat.com/archives/libvir-list/2016-May/msg02147.html There was only one small change in a comment to any of those patches. The last 3 patches are new - just trying to make it easier to use the qemu-img code for creating a luks volume. John Ferlan (7): util: Clean up code formatting in virstorageencryption storage: Split out setting default secret for encryption storage: Split out a helper for encryption checks storage: Adjust qemu-img switches check storage: Create helper to set input for CreateQemuImg code storage: Create helper to set backing for CreateQemuImg code storage: Create helper to set options for CreateQemuImg code src/storage/storage_backend.c | 367 ++++++++++++++++++++++----------------- src/storage/storage_backend_fs.c | 79 +++++---- src/util/virstorageencryption.c | 58 +++---- 3 files changed, 282 insertions(+), 222 deletions(-) -- 2.5.5

2 18

[libvirt] [PATCH] systemd: directly notify systemd instead of using sd_notify
by Daniel P. Berrange 06 Jun '16

06 Jun '16

The sd_notify method is used to tell systemd when libvirtd has finished starting up. All it does is send a datagram containing the string parameter to systemd on a UNIX socket named in the NOTIFY_SOCKET environment variable. Rather than pulling in the systemd libraries for this, just code the notification directly in libvirt as this is a stable ABI from systemd's POV which explicitly allows independant implementations: See "Reimplementable Independently" column in the "$NOTIFY_SOCKET Daemon Notifications" row: https://www.freedesktop.org/wiki/Software/systemd/InterfacePortabilityAndSt… Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 -- libvirt.spec.in | 12 ----------- m4/virt-systemd-daemon.m4 | 34 ------------------------------- src/Makefile.am | 4 ++-- src/util/virsystemd.c | 52 ++++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 m4/virt-systemd-daemon.m4 diff --git a/configure.ac b/configure.ac index 74c33b3..a63b912 100644 --- a/configure.ac +++ b/configure.ac @@ -256,7 +256,6 @@ LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 -LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_WIRESHARK LIBVIRT_CHECK_NSS @@ -2787,7 +2786,6 @@ LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 -LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_WIRESHARK LIBVIRT_RESULT_NSS diff --git a/libvirt.spec.in b/libvirt.spec.in index 8b88eef..b93a53c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -79,7 +79,6 @@ %define with_firewalld 0%{!?_without_firewalld:0} %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} -%define with_systemd_daemon 0%{!?_without_systemd_daemon:0} %define with_pm_utils 1 # Finally set the OS / architecture specific special cases @@ -133,7 +132,6 @@ # Fedora has systemd, libvirt still used sysvinit there. %if 0%{?fedora} || 0%{?rhel} >= 7 %define with_systemd 1 - %define with_systemd_daemon 1 %define with_pm_utils 0 %endif @@ -268,9 +266,6 @@ BuildRequires: python %if %{with_systemd} BuildRequires: systemd-units %endif -%if %{with_systemd_daemon} -BuildRequires: systemd-devel -%endif %if %{with_xen} || %{with_libxl} BuildRequires: xen-devel %endif @@ -1061,12 +1056,6 @@ rm -rf .git %define arg_wireshark --without-wireshark-dissector %endif -%if %{with_systemd_daemon} - %define arg_systemd_daemon --with-systemd-daemon -%else - %define arg_systemd_daemon --without-systemd-daemon -%endif - %if %{with_pm_utils} %define arg_pm_utils --with-pm-utils %else @@ -1157,7 +1146,6 @@ rm -f po/stamp-po --with-driver-modules \ %{?arg_firewalld} \ %{?arg_wireshark} \ - %{?arg_systemd_daemon} \ %{?arg_pm_utils} \ --with-nss-plugin \ %{arg_packager} \ diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4 deleted file mode 100644 index 8516e41..0000000 --- a/m4/virt-systemd-daemon.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl The libsystemd-daemon.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[ - LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1]) - - old_CFLAGS="$CFLAGS" - old_LIBS="$LIBS" - CFLAGS="$CFLAGS $SYSTEMD_DAEMON_CFLAGS" - LIBS="$LIBS $SYSTEMD_DAEMON_LIBS" - AC_CHECK_FUNCS([sd_notify]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" -]) - -AC_DEFUN([LIBVIRT_RESULT_SYSTEMD_DAEMON],[ - LIBVIRT_RESULT_LIB([SYSTEMD_DAEMON]) -]) diff --git a/src/Makefile.am b/src/Makefile.am index 12b66c2..11c79df 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1106,12 +1106,12 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(SYSTEMD_DAEMON_CFLAGS) $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) \ + $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) \ -I$(srcdir)/conf libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) \ + $(SECDRIVER_LIBS) $(NUMACTL_LIBS) \ $(POLKIT_LIBS) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 4883f94..71b8f33 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -21,8 +21,9 @@ #include <config.h> -#ifdef WITH_SYSTEMD_DAEMON -# include <systemd/sd-daemon.h> +#include <sys/socket.h> +#ifdef HAVE_SYS_UN_H +# include <sys/un.h> #endif #include "virsystemd.h" @@ -34,6 +35,7 @@ #include "virutil.h" #include "virlog.h" #include "virerror.h" +#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_SYSTEMD @@ -480,9 +482,49 @@ int virSystemdTerminateMachine(const char *name) void virSystemdNotifyStartup(void) { -#ifdef WITH_SYSTEMD_DAEMON - sd_notify(0, "READY=1"); -#endif +#ifdef HAVE_SYS_UN_H + const char *path; + const char *msg = "READY=1"; + int fd; + struct sockaddr_un un = { + .sun_family = AF_UNIX, + }; + struct iovec iov = { + .iov_base = (char *)msg, + .iov_len = strlen(msg), + }; + struct msghdr mh = { + .msg_name = &un, + .msg_namelen = sizeof(un), + .msg_iov = &iov, + .msg_iovlen = 1, + }; + + if (!(path = virGetEnvBlockSUID("NOTIFY_SOCKET"))) { + VIR_DEBUG("Skipping systemd notify, not requested"); + return; + } + + if (strlen(path) > sizeof(un.sun_path)) { + VIR_WARN("Systemd notify socket path '%s' too long", path); + return; + } + + fd = socket(AF_UNIX, SOCK_DGRAM, 0); + if (fd < 0) { + VIR_WARN("Unable to create socket FD"); + return; + } + + ignore_value(virStrcpy(un.sun_path, path, sizeof(un.sun_path))); + if (un.sun_path[0] == '@') + un.sun_path[0] = '\0'; + + if (sendmsg(fd, &mh, MSG_NOSIGNAL) < 0) + VIR_WARN("Failed to notify systemd"); + + VIR_FORCE_CLOSE(fd); +#endif /* HAVE_SYS_UN_H */ } static int -- 2.5.5

2 4

[libvirt] [PATCH] docs: Document our event loop
by Michal Privoznik 06 Jun '16

06 Jun '16

I was asked the other day what's event loop and how libvirt uses it. Well, I haven't found any good sources on the Internet so I thought of writing the documentation on my own. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NB, when I will push this, the images will go to our libvirt-media repo among with the original SVGs that PNGs were rendered from. I'm sending them here for easier review. docs/internals.html.in | 1 + docs/internals/event_loop_simple.png | Bin 0 -> 16043 bytes docs/internals/event_loop_worker.png | Bin 0 -> 29696 bytes docs/internals/eventloop.html.in | 106 +++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 ++ 5 files changed, 111 insertions(+) create mode 100644 docs/internals/event_loop_simple.png create mode 100644 docs/internals/event_loop_worker.png create mode 100644 docs/internals/eventloop.html.in diff --git a/docs/internals.html.in b/docs/internals.html.in index c30f52f..fcc0758 100644 --- a/docs/internals.html.in +++ b/docs/internals.html.in @@ -14,6 +14,7 @@ <li>Introduction to basic rules and guidelines for <a href="hacking.html">hacking</a> on libvirt code</li> <li>Guide to adding <a href="api_extension.html">public APIs</a></li> + <li>Insight into libvirt <a href="internals/eventloop.html">event loop and worker pool</a></li> <li>Approach for <a href="internals/command.html">spawning commands</a> from libvirt driver code</li> <li>The libvirt <a href="internals/rpc.html">RPC infrastructure</a></li> diff --git a/docs/internals/event_loop_simple.png b/docs/internals/event_loop_simple.png new file mode 100644 index 0000000000000000000000000000000000000000..daf4338a16bc1051aca0ca1c7ea13baa4e7179f1 GIT binary patch literal 16043 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 Mp@LL_gu%=I0mPN)82|tP literal 0 HcmV?d00001 diff --git a/docs/internals/event_loop_worker.png b/docs/internals/event_loop_worker.png new file mode 100644 index 0000000000000000000000000000000000000000..1bec1ea598b2806fea24ab25dc825c9055c76ee6 GIT binary patch literal 29696 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 literal 0 HcmV?d00001 diff --git a/docs/internals/eventloop.html.in b/docs/internals/eventloop.html.in new file mode 100644 index 0000000..93d9e8d --- /dev/null +++ b/docs/internals/eventloop.html.in @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Libvirt's event loop</h1> + + <ul id="toc"></ul> + + <p> + This page describes the event loop approach used in + libvirt. Both server and client. + </p> + + <h2><a name="event_loop">Event driven programming</a></h2> + + <p>Traditionally, a program simply ran once, then terminated. + This type of program was very common in the early days of + computing, and lacked any form of user interactivity. This is + still used frequently, particularly in small one purpose + programs.</p> + + <p>However, that approach is not suitable for all the types + of applications. For instance graphical applications spend + most of their run time waiting for an input from user. Only + after it happened (in our example a button was clicked, a key + pressed, etc.) an event is generated to which they respond + by executing desired function. If generalized, this is how + many long running programs (daemons) work. Even those who are + not waiting for direct user input and have no graphical + interface. Such as Libvirt.</p> + + <img alt="event loop" src="event_loop_simple.png"/> + + <p>In Libvirt this approach is used in combination with + <code>poll(2)</code> as all the communication with its + clients (and domains it manages too) happens through sockets. + Therefore whenever new client connects, it is given exclusive + file descriptor which is then watched for incoming events, + e.g. messages. </p> + + <h2><a name="api">The event loop API</a></h2> + + <p>To work with event loop from our code we have plenty of + APIs.</p> + + <ul> + <li><code>virEventAddHandle</code>: Registers a + callback for monitoring file handle events.</li> + <li><code>virEventUpdateHandle</code>: Change set of events + monitored file handle is being watched for.</li> + <li><code>virEventRemoveHandle</code>: Unregisters + previously registered file handle so that it is no + longer monitored for any events.</li> + <li><code>virEventAddTimeout</code>: Registers a + callback for timer event.</li> + <li><code>virEventUpdateTimeout</code>: Changes frequency + for a timer.</li> + <li><code>virEventRemoveTimeout</code>: Unregisters + a timer.</li> + </ul> + + <p>For more information on these APIs continue reading <a + href="../html/libvirt-libvirt-event.html">here</a>.</p> + + <h2><a name="worker_pool">Worker pool</a></h2> + + <p>Looking back at the image above we can see one big + limitation. While processing a message event loop is blocked + and for an outside observer unresponsive. This is not + acceptable for Libvirt. Therefore we have came up with the + following solution.</p> + + <img alt="event loop" src="event_loop_worker.png"/> + + <p>The event loop does only necessary minimum and hand over + message processing to another thread. In fact, there can be + as many processing threads as configured increasing + processing power.</p> + + <p>To break this high level description into smaller pieces, + here is what happens when user calls an API:</p> + <ol> + <li>User (or management application) calls a Libvirt API. + Depending on the connection URI, this may or may not + involve server. Well, for the sake of our + demonstration we assume the former.</li> + <li>Remote driver encodes the API among it's arguments + into an <a href="rpc.html">RPC message</a> and sends + it to the server.</li> + <li>Here, server is waiting in <code>poll(2)</code> for + an event, like incoming message.</li> + <li>As soon as the first bytes of message are received, + even loop wakes up and server starts reading the + whole message.</li> + <li>Once fully read, the event loop notifies threads + known as worker threads from which one picks the incoming + message, decodes and process it.</li> + <li>As soon as API execution is finished, a reply is sent + to the client.</li> + </ol> + + <p>In case that there's no free worker to process an incoming + message in step 5, message is placed at the end of a message + queue and is processed in next iteration.</p> + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index d5cf723..757d5aa 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -397,6 +397,10 @@ <span>Adding new public libvirt APIs</span> </li> <li> + <a href="internals/eventloop.html">Event loop and worker pool</a> + <span>Libvirt's event loop and worker pool mode</span> + </li> + <li> <a href="internals/command.html">Spawning commands</a> <span>Spawning commands from libvirt driver code</span> </li> -- 2.8.3

2 1

[libvirt] [PATCH 00/32] node_device_udev: cleanups
by Ján Tomko 06 Jun '16

06 Jun '16

Mostly style changes and refactors. Ján Tomko (32): Initialize ret to -1 in nodeStateInitialize Split out pciaccess (de)initialization node_device_udev: initialize libpciaccess after the driver lock Reformat nodeStateCleanup Do not call nodeStateCleanup on early initialization error Assign node device driver private data earlier udevGetDMIData: remove unused variable udevProcessSCSIHost: use STRSKIP Rewrite usage of StrToLong_ui in udevProcess{PCI,SCSI} Remove udevStrToLong_ull Remove udevStrToLong_ui Remove udevStrToLong_i Do not VIR_STRDUP the string in udevGetDeviceProperty Move udevHasDeviceProperty earlier udevProcessFloppy; remove unnecessary allocation Fix the return value in udevKludgeStorageType Rewrite disk type checking in udevProcessStorage Only return two values in udevGetStringProperty Only return two values in udevGetUintProperty Remove extra allocation in udevGetDeviceSysfsAttr Only return two values in udevGetStringSysfsAttr Only return two values in udevGetIntSysfsAttr Only return two values in udevGetUintSysfsAttr Remove PROPERTY_* constants node_device_udev: switch to using virReportError udevProcessStorage: trim all whitespace from model and vendor Reformat udevProcessRemoveableMedia udevSetupSystemDev: return if allocation fails node_device_udev: remove yoda condition node_device_udev: remove unnecessary ret variables node_device_udev: rename labels to cleanup Add nomatch filters when enumerating udev devices src/node_device/node_device_udev.c | 1156 ++++++++++++++---------------------- src/node_device/node_device_udev.h | 3 - 2 files changed, 437 insertions(+), 722 deletions(-) -- 2.7.3

2 65

[libvirt] [PATCH 0/3] Fix 'make rpm' failure with systemd 230
by Andrea Bolognani 06 Jun '16

06 Jun '16

Turns out the libsystemd-daemon library, which we've been using for the sd_notify() feature, has been deprecated for a long time and has finally been removed as of systemd 230. This means 'make rpm' no longer works on Fedora rawhide, and that other distributions such as Debian sid are silently disabling the sd_notify() feature. Switch from libsystemd-daemon to libsystemd. Andrea Bolognani (3): maint: Use libsystemd instead of libsystemd-daemon spec: Enable libsystemd on Fedora >= 21, RHEL >= 7 systemd: Guard the call to sd_notify() properly configure.ac | 4 ++-- libvirt.spec.in | 18 +++++++++++------- m4/{virt-systemd-daemon.m4 => virt-libsystemd.m4} | 14 +++++++------- src/Makefile.am | 4 ++-- src/util/virsystemd.c | 4 ++-- 5 files changed, 24 insertions(+), 20 deletions(-) rename m4/{virt-systemd-daemon.m4 => virt-libsystemd.m4} (73%) -- 2.5.5

3 5

[libvirt] [PATCH v3 0/5] Adjustments for secinfo command line build and secret changes
by John Ferlan 06 Jun '16

06 Jun '16

v2: http://www.redhat.com/archives/libvir-list/2016-May/msg02140.html Patch 1 is the same as v2 patch 1 Patch 2 is already ACK'd - it was the previous patch 5 Patch 3 & 4 replace patches 2-4 from v2 Patch 5 is the same as v2 patch 6. John Ferlan (5): qemu: Move and rename qemuBuildObjectCommandlineFromJSON storage: Use virSecretGetSecretString qemu: Use virJSONValueObjectCreate for master key qemu: Remove need for qemuBuildSecretInfoProps secret: Move virStorageSecretType to secret_util and rename cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/conf/secret_conf.h | 2 +- src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 202 +++++++----------------------------- src/qemu/qemu_command.h | 4 - src/qemu/qemu_domain.c | 4 +- src/secret/secret_util.c | 18 ++-- src/secret/secret_util.h | 22 +++- src/storage/storage_backend_iscsi.c | 55 ++-------- src/storage/storage_backend_rbd.c | 49 +-------- src/util/virqemu.c | 142 +++++++++++++++++++++++++ src/util/virqemu.h | 34 ++++++ src/util/virstoragefile.c | 33 +++--- src/util/virstoragefile.h | 17 +-- tests/qemuargv2xmltest.c | 4 +- tests/qemucommandutiltest.c | 9 +- 19 files changed, 294 insertions(+), 312 deletions(-) create mode 100644 src/util/virqemu.c create mode 100644 src/util/virqemu.h -- 2.5.5

2 17

[libvirt] [PATCH v5 0/6] [REPOST] introduce new listen types for graphics
by Pavel Hrdina 06 Jun '16

06 Jun '16

There is no change since v4 [1], I've only rebased patches that are still waiting for review and removed the ones that are already pushed. [1] <https://www.redhat.com/archives/libvir-list/2016-May/msg01438.html> Pavel Hrdina (6): graphics: introduce listen type socket and use it for VNC qemu_capabilites: add QEMU_CAPS_SPICE_UNIX spice: add support for listen type socket spice: introduce spice_auto_unix_socket config option spice: introduce listen type none vnc: add support for listen type none docs/formatdomain.html.in | 28 +++ docs/schemas/domaincommon.rng | 15 ++ src/conf/domain_conf.c | 245 ++++++++++++++++++--- src/conf/domain_conf.h | 8 +- src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 17 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 130 ++++++----- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 28 ++- src/qemu/qemu_hotplug.c | 9 + src/qemu/qemu_migration.c | 47 +++- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 46 +++- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/virt-aa-helper.c | 15 +- ...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 +++ ...ric-graphics-vnc-socket-attr-listen-address.xml | 30 +++ ...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 +++ .../generic-graphics-vnc-socket-listen.xml | 4 +- .../generic-graphics-vnc-socket.xml | 4 +- tests/genericxml2xmltest.c | 4 + .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- 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.x86_64.xml | 1 + ...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.args | 20 ++ .../qemuxml2argv-graphics-vnc-auto-socket.xml | 30 +++ .../qemuxml2argv-graphics-vnc-none.args | 20 ++ .../qemuxml2argv-graphics-vnc-none.xml | 30 +++ .../qemuxml2argv-graphics-vnc-socket.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 10 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 14 ++ ...muxml2xmlout-graphics-spice-auto-socket-cfg.xml | 35 +++ .../qemuxml2xmlout-graphics-spice-auto-socket.xml | 35 +++ .../qemuxml2xmlout-graphics-spice-socket.xml | 35 +++ .../qemuxml2xmlout-graphics-vnc-auto-socket.xml | 35 +++ ...graphics-vnc-remove-generated-socket-active.xml | 4 +- .../qemuxml2xmlout-graphics-vnc-socket.xml | 35 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 4 +- tests/qemuxml2xmltest.c | 8 + 53 files changed, 1096 insertions(+), 145 deletions(-) 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-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.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.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.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml -- 2.8.3

2 9

[libvirt] [PATCH] conf: always format os.bootloaderArgs if set
by Fabian Freyer 06 Jun '16

06 Jun '16

At the moment the bootloader arguments never get formatted if the bootloader is unset. However, in cases where the bootloader defaults to a default value when unset, specifying bootloader arguments does make sense. --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 568c699..66bba6e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22608,6 +22608,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->os.bootloader) { virBufferEscapeString(buf, "<bootloader>%s</bootloader>\n", def->os.bootloader); + } + if (def->os.bootloaderArgs) { virBufferEscapeString(buf, "<bootloader_args>%s</bootloader_args>\n", def->os.bootloaderArgs); -- 2.7.0

3 3

[libvirt] [RFC] extend USB controller 'model' to support xen pvusb
by Chun Yan Liu 06 Jun '16

06 Jun '16

Hi, List, Currently libxl supports pvusb type USB controller hotplug and in creation time, I'd like to add the support in libvirt libxl driver too. According to current USB controller schema, we need to extend 'model' to support xen PVUSB type. Since libxl support USB controller of version 1.1 and version 2.0, we may add two models: "pvusb1" (pvusb type, version 1.1) and "pvusb2" (pvusb type, version 2.0). Do you have any opinions on that? If it is agreed, I'll try to implement. Thanks, Chunyan

1 0

[libvirt] Release of libvirt-1.3.5
by Daniel Veillard 04 Jun '16

04 Jun '16

Things didn't go as planned, I got stuck in travels etc, so I didn't push rc2 as expected earlier and I could not do any release on Friday. So I broke the rule and pushed today without an rc2, that's exceptional, but there was no negative feedback on RC1 and I didn't want to freeze development any longer, so the tree is open. Signed tarball and rpms are available at the usual place: ftp://libvirt.org/libvirt/ I also made a python binding release but it is virtually identical to 1.3.4 This is a very large release with more than 500 commits ! There is clear user visible new features, and an lot of code (and spec!) cleanups. Nonetheless libvirt-1.3.5.tar.gz is 5 Megabytes bigger than libvirt-1.3.4.tar.gz, likely due to a large update to localizations ! As usual a fair amount of bug fixes are included: Features: - admin: Introduce virAdmClientGetInfo API (Erik Skultety) - Various improvement on bhyve driver (Roman Bogorodskiy, Fabian Freyer) - Various improvement on libxl driver (Jim Fehlig, Chunyan Liu) Documentation: - Refresh po files from zanata (Daniel P. Berrange) - cpu: Fix documentation of cpuGetModels (Jiri Denemark) - docs: fix <spice><gl enable> since version (Ján Tomko) - docs: formatdomain: document virtio-mmio device addresses (Cole Robinson) - schemas: Improve outdated comment (Christophe Fergeau) - docs: Fix disk "volume" description (John Ferlan) - docs: fix version number in vlan tagging documentation (Laine Stump) - tools: virt-host-validate: fix missing translation marker (Bjoern Walk) - docs: Reformat the Controllers description (John Ferlan) - docs: clarify disk iothread support (John Ferlan) - docs: align spelling of S390 (Boris Fiuczynski) Portability: - virDomainChrGetDomainPtrsInternal: Return an integer (Michal Privoznik) - virSocketAddrIsPrivate: Work on 32bits platforms (Michal Privoznik) - makefile: fix build on systems where gnutls is not in /usr/include (Pavel Hrdina) - util: fix build without GNUTLS (Mikhail Feoktistov) - tests: qemu: test <address type='pci'/> with aarch64 (Cole Robinson) - tests: Link virtestmock with probes (Michal Privoznik) - libvit.spec.in: Add missing BuildRequires against sheepdog (Daniel P. Berrange) - libvirt.spec.in: remove client only build option (Daniel P. Berrange) - uml: only build on Linux (Roman Bogorodskiy) - virNetServerClientNewPostExecRestart: Avoid align problems (Michal Privoznik) - build: fix 32-bit build of admin (Eric Blake) Bug Fixes: - Fix building with -Og (Martin Kletzander) - virPerfEventIsEnabled: Don't crash on shut off domains (Michal Privoznik) - virDomainFormatSchedDef: Avoid false positive NULL dereference (Michal Privoznik) - ppc64Compute: Avoid possible NULL dereference (Michal Privoznik) - network: restart dnsmasq after adding/removing txt and srv records (Laine Stump) - QXL: fix reloading of vram64 attribute (Pavel Hrdina) - esxStorageVolGetXMLDesc: Lookup SCSI lun properly (Michal Privoznik) - qemuMonitorTextGetAllBlockStatsInfo: Fix line validation (Michal Privoznik) - lxc: Fix virLXCDomainObjBeginJob position in lxcDomainSetMemoryParameters (Katerina Koukiou) - esx: do not store escaped password in esxVI_Context. (Dawid Zamirski) - qemu: Fix error message when PCI bridge has index <= bus (Andrea Bolognani) - daemon: cleanup state drivers in order reverse to init order (Nikolay Shirokovskiy) - esx: use newer virtualHW version for 5.1+ hosts (Dawid Zamirski) - esx: Add VMCI device for virtualHW >= 7 (Dawid Zamirski) - esx: use lsilogic adapter type in vol create. (Dawid Zamirski) - libxl: default to qemu driver for network disks (Jim Fehlig) - lxc: Fix lxcDomainDestroyFlags endjob processing (John Ferlan) - qemu: Remove unused persistentAddrs (John Ferlan) - xenconfig: xm: check for driver on disk format (Joao Martins) - nwfilter: fix lock order deadlock (Maxim Nestratov) - maint: fix syntax-check sc_prohibit_int_ijk exclude rule (Pavel Hrdina) - vz: add error code for case if vm is already stopped (Mikhail Feoktistov) - storage: do not clear vols before volume upload (Ján Tomko) - util: Fix error path for virPCIGetVirtualFunctions (John Ferlan) - tests: Add forgotten backslash (Michal Privoznik) - qemu: bulk stats: Don't access possibly blocked storage (Peter Krempa) - qemu_cgroup: allow access to /dev/dri for virtio-vga (Ján Tomko) - Revert "qemu_hotplug: fix checking graphics ports" (Pavel Hrdina) - util: Remove disabling of autologin for iscsi-targets (Fritz Elfert) - xenFormatNet: correct `type=netfront' to 'type=vif' to match libxl (Chunyan Liu) - libxl: Free migration cookie (John Ferlan) - qemu: command: Use -name guest= if available (Cole Robinson) - qemu: command: escape commas in chardev socket path (Cole Robinson) - qemu: command: escape commas in VNC socket path (Cole Robinson) - qemu: command: escape commas in secret master path (Cole Robinson) - qemu: command: escape commas in VM name (Cole Robinson) - admin: Fix passing an incorrect readonly attribute to virNetServerServiceNew (Erik Skultety) - cpuGetModels: Fix memory leak on error (Jiri Denemark) - libxl: don't attempt to probe a non-existent emulator (Jim Fehlig) - network: log error when <bandwidth> is requested for hostdev interfaces (Laine Stump) - Call per-device post-parse callback even on implicit video (Ján Tomko) - util: Fix virGetLastErrorMessage to return proper error when 'err' is NULL (Erik Skultety) - storage: Fix virStorageBackendDiskDeleteVol for device mapper (John Ferlan) - storage: Fix algorithm generating path names for devmapper (John Ferlan) - storage: Need to clear pool prior to calling the refreshPool (John Ferlan) - storage: Fix regression cloning volume into a logical pool (John Ferlan) - conf: log error when incorrect PCI root controller is added to domain (Laine Stump) - conf: don't redefine virDomainCapsDeviceHostdev (Roman Bogorodskiy) - conf: Fix error path in virNodeDevPCICapabilityParseXML (John Ferlan) - util: polkit: Fix polkit agent startup (Peter Krempa) - qemu: domain: Don't treat unknown storage type as not having backing chain (Peter Krempa) - qemu: Reject invalid block copy targets for <disk device='lun'> (Peter Krempa) - lxc: Fix wrong error message on disk hotplug (Peter Krempa) - domain_conf: fix migration/managedsave with usb keyboard (Pavel Hrdina) - qemu: Refresh RTC adjustment on qemuProcessReconnect (Michal Privoznik) - qemu: fix error message for default panic device (Boris Fiuczynski) - fdstream: don't raise error on SIGPIPE if abort requested (Cole Robinson) - daemon: stream: Don't force error when client aborts (Cole Robinson) - daemon: stream: set stream->closed on removal (Cole Robinson) - daemon: stream: don't update events if stream->closed (Cole Robinson) - daemon: stream: Close stream on send failure (Cole Robinson) - fdstream: Raise explicit error when iohelper gets SIGPIPE (Cole Robinson) - nwfilter: Save config to disk if we generated a UUID (Cole Robinson) - nwfilter: Fix potential locking problems on ObjLoad failure (Cole Robinson) - network: Fix segfault on daemon reload (Cole Robinson) - send default USB controller in xml to destination during migration (Shivaprasad G Bhat) - conf: storage: pool: reject name containing '/' (Cole Robinson) - conf: network: reject name containing '/' (Cole Robinson) - conf: domain: reject name containing '/' (Cole Robinson) - qemu: hotplug: Fix possible memory leak of props (John Ferlan) - qemu: process: Fix failure semantics for perf events (Peter Krempa) - qemu: process: Refresh ejectable media tray state on VM start (Peter Krempa) - tools: Fix connect command (Martin Kletzander) Improvements: - Drop virPerfGetEventFd (Michal Privoznik) - virNetDevBridgeGet: Don't require users to virNetDevSetupControl (Michal Privoznik) - apibuild: Substitute only pure number tokens (Michal Privoznik) - build: use gnulib's unsetenv (Michal Privoznik) - Turn 1<<31 into 1U<<31 (Michal Privoznik) - docs: Teach apibuild to deal with (1U << 31) too (Michal Privoznik) - maint: update to latest gnulib (Eric Blake) - spec: Advertise nvram paths of official fedora edk2 builds (Cole Robinson) - maint: update to latest gnulib (Eric Blake) - esx: add pciBridge devices when SCSI is used (Dawid Zamirski) - conf: permit auto-assignment of controller indexes (Laine Stump) - conf: make virDomainControllerFindUnusedIndex() more generally usable (Laine Stump) - conf/qemu: make IS_USB2_CONTROLLER globally available (Laine Stump) - libxl: add .domainInterfaceAddresses (Chunyan Liu) - security: label the slic_table (Ján Tomko) - qemu: format SLIC ACPI table command line (Ján Tomko) - conf: add <acpi><table> to <os> (Ján Tomko) - qemucapstest: replace caps-1.6.50 with updated caps-1.7.0 (Pavel Hrdina) - qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetSchedulerParametersFlags (Peter Krempa) - qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetBlockIoTune (Peter Krempa) - qemu: Refactor qemuDomainGetSchedulerParametersFlags (Peter Krempa) - conf: Change virDomainCputune member 'shares' to unsigned long long (Peter Krempa) - qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetSchedulerParametersFlags (Peter Krempa) - qemu: Refactor qemuDomainGetBlkioParameters (Peter Krempa) - qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetBlkioParameters (Peter Krempa) - qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetMemoryParameters (Peter Krempa) - qemu: Refactor typed params assignment in qemuDomainGetBlockIoTune (Peter Krempa) - qemu: Replace virDomainLiveConfigHelperMethod in qemuDomainGetBlockIoTune (Peter Krempa) - qemu: monitor: Remove 'supportMaxOptions' argument from qemuMonitorGetBlockIoThrottle (Peter Krempa) - qemu: driver: Allow disk update of startupPolicy/snapshot for all disks (Peter Krempa) - qemu: driver: Move around code to avoid need to rollback (Peter Krempa) - Call qemuDomainObjEndJob when qemuCaps is null during hotplug (Shivaprasad G Bhat) - Unref the cfg in qemuDomainAttachHostPCIDevice() (Shivaprasad G Bhat) - qemu: Remove dead code (John Ferlan) - conf: nodedev: Set PCI_PHYSICAL_FUNCTION flag more carefully (Andrea Bolognani) - pci: Fix virPCIGetPhysicalFunction()'s callers (Andrea Bolognani) - pci: Document virPCIGetPhysicalFunction() (Andrea Bolognani) - pci: Initialize return location in virPCIGetPhysicalFunction() (Andrea Bolognani) - qemu: hotplug: wait for the tray to eject only for drives with a tray (Peter Krempa) - qemu: hotplug: Fix error reported when cdrom tray is locked (Peter Krempa) - qemu: hotplug: Extract code for waiting for tray eject (Peter Krempa) - qemu: process: Fix and improve disk data extraction (Peter Krempa) - qemu: Move and rename qemuDomainCheckEjectableMedia to qemuProcessRefreshDisks (Peter Krempa) - qemu: Extract more information about qemu drives (Peter Krempa) - qemu: Move struct qemuDomainDiskInfo to qemu_domain.h (Peter Krempa) - lxc: support <interface type='ethernet'> (Laine Stump) - lxc: completely rework reference counting (Katerina Koukiou) - lxc: use job functions in lxcDomainLxcOpenNamespace & lxcDomainSendProcessSignal (Katerina Koukiou) - qemucapstest: update caps for qemu-2.6.0 (Pavel Hrdina) - qemucapstest: update caps for qemu-2.5.0 (Pavel Hrdina) - qemucapstest: update caps for qemu-2.4.0 (Pavel Hrdina) - qemucapstest: update caps for qemu-2.1.1 (Pavel Hrdina) - qemucapstest: update caps for qemu-1.6.0 (Pavel Hrdina) - qemucapstest: update caps for qemu-1.5.3 (Pavel Hrdina) - qemucapstest: update caps for qemu-1.4.2 (Pavel Hrdina) - qemucapstest: update caps for qemu-1.3.1 (Pavel Hrdina) - qemucapstest: update caps for qemu-1.2.2 (Pavel Hrdina) - qemuxml2argvtest: skip test that depends on gnutls_cipher_encrypt() (Pavel Hrdina) - storage: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - nwfilter: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - libxl: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - bhyve: Replace VIR_ERROR with standard vir*Error in state driver init (Jovanka Gulicoska) - qemu: simplify addition of USB controller in qemuParseCommandLine (Laine Stump) - Deprecate QEMU_CAPS_PCIDEVICE (Ján Tomko) - Deprecate QEMU_CAPS_DEVICE (Ján Tomko) - Deprecate QEMU_CAPS_DRIVE_READONLY (Ján Tomko) - qemu: always assume QEMU_CAPS_DRIVE_READONLY (Ján Tomko) - tests: always assume QEMU_CAPS_DRIVE_READONLY (Ján Tomko) - tests: remove <readonly/> from IDE disks (Ján Tomko) - tests: remove disk-drive-fat test (Ján Tomko) - qemu: assume QEMU_CAPS_DEVICE almost everywhere (Ján Tomko) - qemu_command: assume QEMU_CAPS_DEVICE (Ján Tomko) - qemu: auto-assign addresses when <address type='pci'/> is specified (Laine Stump) - bhyve: auto-assign addresses when <address type='pci'/> is specified (Laine Stump) - conf: allow type='pci' addresses with no address attributes specified (Laine Stump) - conf: new functions to check if PCI address is wanted/present (Laine Stump) - conf: move virDomainDeviceInfo definition from domain_conf.h to device_conf.h (Laine Stump) - virtestmock: Mock stat() properly (Michal Privoznik) - tests: Drop VIR_MOCK_CALL_STAT (Michal Privoznik) - qemu: Utilize qemu secret objects for RBD auth/secret (John Ferlan) - tests: Allow multiple mock libraries (Peter Krempa) - qemu: Introduce qemuDomainSecretSetup (John Ferlan) - util: Introduce virCryptoGenerateRandom (John Ferlan) - util: Introduce encryption APIs (John Ferlan) - tests: Add mock for virRandomBytes (John Ferlan) - qemu: parse: Handle suffixes for -m memory (Nishith Shah) - qemu: parse: Use qemuParseCommandLineMem for -m memory (Nishith Shah) - qemu_command: refactor spice channel code (Pavel Hrdina) - qemu_process: separate graphics socket and address generation (Pavel Hrdina) - graphics: resolve address for listen type network in qemu_process (Pavel Hrdina) - qemu_command: move sasl parameter after port and addr definition (Pavel Hrdina) - domain_conf: introduce virDomainGraphicsListenDefFormatAddr (Pavel Hrdina) - graphics: rename gListen to glisten (Pavel Hrdina) - tests: cleanup vnc auto socket test (Pavel Hrdina) - qemu_domain: add a empty listen type address if we remove socket for VNC (Pavel Hrdina) - cpu: Rework CPU map loading (Jiri Denemark) - cpu_ppc64: Use array of models in CPU map (Jiri Denemark) - cpu_ppc64: Use array of vendors in CPU map (Jiri Denemark) - cpu_x86: Use array of features in CPU map (Jiri Denemark) - cpu_x86: Use array of vendors in CPU map (Jiri Denemark) - cpu_x86: Use array of models in CPU map (Jiri Denemark) - Do not mask QEMU_CAPS_DEVICE in qemuBuildDriveStr (Ján Tomko) - Introduce qemuDiskBusNeedsDeviceArg (Ján Tomko) - Assume QEMU_CAPS_DEVICE in qemuBuildDiskDriveCommandLine (Ján Tomko) - Remove DISK_BUS_XEN support from qemuBuildDiskDriveCommandLine (Ján Tomko) - qemu: always add -nodefaults (Ján Tomko) - qemu: process: Drop !QEMU_CAPS_DEVICE code (Cole Robinson) - Remove qemuProcessInitPCIAddresses with dependencies (Ján Tomko) - qemu: driver: Fix function header alignment of some functions (Peter Krempa) - conf: disk: Rename virDomainDiskDefValidate to virDomainDiskDefParseValidate (Peter Krempa) - util: Remove need for STATIC_ANALYSIS check (John Ferlan) - util: Adjust return for virPCIGetDeviceAddressFromSysfsLink (John Ferlan) - util: Remove need for ret in virPCIGetPhysicalFunction (John Ferlan) - tests: nodeinfotest: Remove virSaveLastError() usage (Cole Robinson) - More usage of virGetLastErrorMessage (Jovanka Gulicoska) - tests: More usage of virGetLastErrorMessage() (Jovanka Gulicoska) - lxc: use job functions in lxcDomain* functions that perform modify actions. (Katerina Koukiou) - lxc: use job functions in lxcDomain* functions that do query operations. (Katerina Koukiou) - lxc: add job functions in lxcDomainSetAutostart (Katerina Koukiou) - lxc: use job functions in lxcDomain{AttachDeviceFlags, DetachDeviceFlags, UpdateDeviceFlags} (Katerina Koukiou) - lxc: use job functions in lxcDomain{Suspend, Resume} (Katerina Koukiou) - lxc: use job functions in lxcDomainSetMemoryFlags (Katerina Koukiou) - lxc: use job functions in lxcDomain{CreateXMLWithFiles, CreateWithFiles} (Katerina Koukiou) - lxc: Add job support to lxc driver (Katerina Koukiou) - qemu: driver: Separate bulk stats worker for block devices (Peter Krempa) - qemu: driver: Remove unnecessary flag in qemuDomainGetStatsBlock (Peter Krempa) - perf: add support to perf event for MBM (Qiaowei Ren) - Separate virDomainDefParseBootOptions (Ján Tomko) - vz: cleanup: define vz format of uuids (Nikolay Shirokovskiy) - vz: implement p2p migration (Nikolay Shirokovskiy) - vz: implement managed migration (Nikolay Shirokovskiy) - vz: fix const correctness case (Nikolay Shirokovskiy) - vz: save session uuid on login (Nikolay Shirokovskiy) - virt-admin: Introduce commands srv-clients-info and srv-clients-set (Erik Skultety) - admin: Introduce virAdmServerSetClientLimits (Erik Skultety) - admin: Introduce virAdmServerGetClientLimits (Erik Skultety) - admin: Introduce some public constants related to server's client limits (Erik Skultety) - virnetserver: Introduce server's client-related limits getters (Erik Skultety) - qemu: address: Remove QEMU_CAPS_DEVICE usage (Cole Robinson) - tests: qemuargv2xmltest: Drop disk for s390 aes tests (Cole Robinson) - qemu: Call virDomainDefPostParse via CONFIG hotplug (Cole Robinson) - qemu: Assign device addresses in PostParse (Cole Robinson) - domain: Add virDomainDefAssignAddressesCallback (Cole Robinson) - vz: drop prlsdkDomainHasSnapshots (Nikolay Shirokovskiy) - vz: add domain snapshots functionality (Nikolay Shirokovskiy) - iscsi: Remove initiatoriqn from virISCSIScanTargets (John Ferlan) - iscsi: Add exit status checking for virISCSIGetSession (John Ferlan) - util: Add exitstatus parameter to virCommandRunRegex (John Ferlan) - tests: Try different usable GIC versions (Andrea Bolognani) - tests: Prepare to have different usable GIC versions (Andrea Bolognani) - qemu: Add virQEMUCapsSetGICCapabilities() (Andrea Bolognani) - qemu: Automatically choose usable GIC version (Andrea Bolognani) - qemu: Add virQEMUCapsSupportsGICVersion() (Andrea Bolognani) - Change return value of VIR_APPEND*INPLACE* to void (Jiri Denemark) - Remove virDomainRNGInsert (Jiri Denemark) - xlconfigtest: add test case for type=vif in xl format (Chunyan Liu) - extract XEN_CONFIG_FORMAT_XM/XL to xen_common.h (Chunyan Liu) - bhyve: implement virConnectIsSecure (Fabian Freyer) - bhyve: Implement virConnectIsEncrypted (Fabian Freyer) - spec: Remove %defattr usage (Cole Robinson) - Revert "vz: handle sourceless cdroms" (Maxim Nestratov) - qemu: hotplug: Report error if we hit tray status timeout (Cole Robinson) - admin: include: Rename argument dmn to conn in virAdmConnectListServers (Erik Skultety) - vz: make error path code idiomatic (Nikolay Shirokovskiy) - vz: fix template ct creation (Mikhail Feoktistov) - vz: fix error message for readonly fs (Nikolay Shirokovskiy) - vz: handle sourceless cdroms (Mikhail Feoktistov) - vz: fix vzCheckUnsupportedDisks format checks for cdroms (Nikolay Shirokovskiy) - vz: remove check for auto file format for disks (Nikolay Shirokovskiy) - domain_conf: cleanup virDomainGraphicsListenDefParseXML (Pavel Hrdina) - graphics: make address attribute for listen type='address' optional (Pavel Hrdina) - domain_conf: parse listen attribute while parsing listen elements (Pavel Hrdina) - graphics: don't parse listens if socket attribute is present (Pavel Hrdina) - conf: Allow all volume modes for disk type='lun' sources (Peter Krempa) - qemu: Drop QEMU_CAPS_VIRTIO_BLK_SG_IO (Andrea Bolognani) - qemu: Drop QEMU_CAPS_CPU_HOST (Andrea Bolognani) - qemu: Drop QEMU_CAPS_PCI_ROMBAR (Andrea Bolognani) - qemu: More qemu_monitor_json cleanups (John Ferlan) - bhyve: implement virConnectIsAlive (Fabian Freyer) - qemu: command: Add qemuBufferEscapeComma (Cole Robinson) - qemu: alias: Remove QEMU_CAPS_DEVICE (Cole Robinson) - cpu: Properly report errors when parsing CPU map XML (Jiri Denemark) - cpu_x86: Check vendor early (Jiri Denemark) - cpu_x86: Don't ignore parsing errors in x86ModelLoad (Jiri Denemark) - cpu_x86: Don't ignore parsing errors in x86FeatureLoad (Jiri Denemark) - cpu_x86: Don't ignore parsing errors in x86VendorLoad (Jiri Denemark) - cpu_x86: Simplify insertions into a linked list (Jiri Denemark) - cpu_x86: Remove comparisons to NULL (Jiri Denemark) - cpu_x86: Use for loop in x86Decode (Jiri Denemark) - cpu_x86: Rename cleanup labels (Jiri Denemark) - cpu_x86: Compare CPU candidates in a separate function (Jiri Denemark) - cpu_x86: Rename struct virCPUx86DataIterator (Jiri Denemark) - cpu_x86: Rename enum compare_result (Jiri Denemark) - cpu_x86: Rename struct x86_map (Jiri Denemark) - cpu_x86: Rename struct x86_model (Jiri Denemark) - cpu_x86: Rename struct x86_kvm_feature (Jiri Denemark) - cpu_x86: Rename struct x86_feature (Jiri Denemark) - cpu_x86: Rename struct x86_vendor (Jiri Denemark) - qemu: command: Ignore QEMU_CAPS_DEVICE when building drive alias (Cole Robinson) - cpu: Add support for clflushopt and tsc_adjust Intel features (Alexander Burluka) - secret: Alter virSecretGetSecretString (John Ferlan) - qemu: domain: Fix names for functions that clear security info (Peter Krempa) - util: string: Introduce helper to determine whether a byte buffer is printable (John Ferlan) - util: string: Introduce virStringEncodeBase64 (Peter Krempa) - secret: util: Refactor virSecretGetSecretString (Peter Krempa) - util: alloc: Introduce freeing helpers that clear the memory before freeing (Peter Krempa) - capabilities: Advertise cpuselection if -cpu host is usable (Jiri Denemark) - qemuaincapstest: Give better names to test data files (Jiri Denemark) - domaincapstest: Give better names to test data files (Jiri Denemark) - domaincapstest: Use arch strings (Jiri Denemark) - tests: Introduce check-file-access.pl (Michal Privoznik) - virtestmock: Print invalid file accesses into a file (Michal Privoznik) - tests: Introduce global mock library (Michal Privoznik) - virmock.h: Introduce VIR_MOCK_CALL_STAT (Michal Privoznik) - securityselinuxhelper: Adapt to virmock.h (Michal Privoznik) - nssmock: Adapt to virmock.h (Michal Privoznik) - vircgroupmock: Adapt to virmock.h (Michal Privoznik) - virpcimock: Adapt to virmock.h (Michal Privoznik) - qemu: remove ATTRIBUTE_UNUSED in connectGetType (Fabian Freyer) - bhyve: implement virConnectGetType (Fabian Freyer) - xlconfigtests: use qemu-xen in all test data files (Jim Fehlig) - virt-aa-helper: remove replace_string and use virStringReplace instead (Pavel Hrdina) - virfile: Introduce virFileRemoveLastComponent (Michal Privoznik) - leave out the default USB controller only on i440fx during migration (Shivaprasad G Bhat) - qemu: domain: Fix name of macro defining AES IV length (Peter Krempa) - qemu: Change from SecretIV or _IV to SecretAES or _AES (John Ferlan) - Fix tests to include video ram size (Ján Tomko) - Fill out default vram in DeviceDefPostParse (Ján Tomko) - Move virDomainDefPostParseInternal after virDomainDeviceDefPostParse (Ján Tomko) - spec: Fix broken indentation reported by syntax-check (Erik Skultety) - libvirt.spec.in: remove all changelog entries (Daniel P. Berrange) - libvirt.spec.in: use explicit --with-xxx for all features (Daniel P. Berrange) - libvirt.spec.in: remove nss plugin conditional (Daniel P. Berrange) - libvirt.spec.in: remove libnl conditional (Daniel P. Berrange) - libvirt.spec.in: remove macvtap conditional (Daniel P. Berrange) - libvirt.spec.in: remove libpcap conditional (Daniel P. Berrange) - libvirt.spec.in: remove nwfilter driver conditional (Daniel P. Berrange) - libvirt.spec.in: remove nodedev conditional (Daniel P. Berrange) - libvirt.spec.in: remove most storage conditionals (Daniel P. Berrange) - libvirt.spec.in: remove network driver conditiaonl (Daniel P. Berrange) - libvirt.spec.in: remove interface driver conditional (Daniel P. Berrange) - libvirt.spec.in: remove selinux conditional (Daniel P. Berrange) - libvirt.spec.in: remove yajl conditional (Daniel P. Berrange) - libvirt.spec.in: remove polkit conditional (Daniel P. Berrange) - libvirt.spec.in: remove sasl conditionals (Daniel P. Berrange) - libvirt.spec.in: remove dtrace conditional (Daniel P. Berrange) - libvirt.spec.in: remove audit conditional (Daniel P. Berrange) - libvirt.spec.in: remove netcf conditional (Daniel P. Berrange) - libvirt.spec.in: remove udev conditional (Daniel P. Berrange) - libvirt.spec.in: remove capng conditional (Daniel P. Berrange) - libvirt.spec.in: remove apparmor conditional (Daniel P. Berrange) - libvirt.spec.in: remove hal conditional (Daniel P. Berrange) - libvirt.spec.in: remove avahi conditional (Daniel P. Berrange) - libvirt.spec.in: remove libvirtd conditional (Daniel P. Berrange) - libvirt.spec.in: remove conditional for driver modules (Daniel P. Berrange) - libvirt.spec.in: drop Fedora < 20 and RHEL < 6 (Daniel P. Berrange) - libvirt.spec.in: explicitly disable xenapi & vz drivers (Daniel P. Berrange) - headers: Remove unnecessary keyword extern from function declaration (Erik Skultety) - conf: make virDomainDefAddController() public (Laine Stump) - libxl: support migration stream V2 in migration (Jim Fehlig) - libxl: support Xen migration stream V2 in save/restore (Jim Fehlig) - libxl: switch to using libxl_domain_create_restore from v4.4 API (Jim Fehlig) - qemu: Add extra checks for secret destroy API's (John Ferlan) - util: set vlan tag for macvtap passthrough mode on SRIOV VFs (Laine Stump) - seclabeltest: Update to use VIRT_TEST_MAIN (Michal Privoznik) - virt-admin: Introduce client-disconnect command (Erik Skultety) - admin: Introduce virAdmClientClose API (Erik Skultety) - admin: Remove flags checking from virAdmConnectOpen public API (Erik Skultety) - admin: Remove flags checking from public API entry points (Erik Skultety) - qemu_hotplug: fix checking graphics ports (Pavel Hrdina) - qemu_process: merge graphics code into qemuProcessSetupGraphics (Pavel Hrdina) - graphics: generate fake ports also for tests (Pavel Hrdina) - qemu_process: separate graphics port reservation (Pavel Hrdina) - configure: split out UML driver checks (Roman Bogorodskiy) - admin: Clean up error path in adminServerListClients (John Ferlan) - Use virGetLastErrorMessage to avoid Coverity message (John Ferlan) - qemu: command: unconditionally allow accel3d='no' (Cole Robinson) - domaincaps: Report video modelType (Cole Robinson) - domaincaps: Report graphics type enum (Cole Robinson) - qemu: command: Remove unnecessary label in qemuCheckDiskConfig (Peter Krempa) - conf: Kill now unused virDomainDiskSourceIsBlockType (Peter Krempa) - qemu: command: Use more appropriate checking function for block devices (Peter Krempa) - qemu: Support <disk device='lun'> for iSCSI direct mapped volumes (Peter Krempa) - util: Replace virDomainDiskSourceIsBlockType with a new helper (Peter Krempa) - qemu_monitor_json: Follow refactor (Michal Privoznik) - virsh: blkdeviotune: accept human readable values for bytes (Nishith Shah) - genericxml2xml: add several graphics tests (Pavel Hrdina) - qemu_hotplug: cleanup error messages in qemuDomainChangeGraphics (Pavel Hrdina) - qemu_process: handle port allocation for VNC the same way as for Spice (Pavel Hrdina) - qemu_process: move listen code out of qemuProcessSetupGraphics (Pavel Hrdina) - graphics: use enums instead of int (Pavel Hrdina) - virCgroupValidateMachineGroup: Reflect change in CGroup struct naming (Michal Privoznik) - domaincapstest: Add tests for QEMU 2.6 (Jiri Denemark) - qemucapabilitiestest: Add tests for aarch64 and ppc64le (Jiri Denemark) - domaincapstest: Use default machine type (Jiri Denemark) - qemucapabilitiestest: Rename *.caps to *.xml (Jiri Denemark) - qemucapabilitiestest: Test all capabilities (Jiri Denemark) - qemucapabilitiestest: Reorder flags in caps files (Jiri Denemark) - qemucapabilitiestest: Reindent *.caps files (Jiri Denemark) - qemucapabilitiestest: Uses consistent names (Jiri Denemark) - qemu: Export caps cache APIs for tests (Jiri Denemark) - qemu: Separate formatting from saving into caps cache (Jiri Denemark) - qemucapabilitiestest: Prepare for testing non-x86_64 archs (Jiri Denemark) - tests: Refactor domaincapstest (Jiri Denemark) - qemu: Introduce qemuDomainSecretIV (John Ferlan) - qemu: Separate network URI command building code (John Ferlan) - qemu: Move qemuDomainSecretDestroy to qemuProcessLaunch (John Ferlan) - qemu: Move qemuDomainSecretPrepare to qemuProcessPrepareDomain (John Ferlan) - qemu: Split out the master key create and write (John Ferlan) - qemu: Adjust names of qemuDomainSecretInfoType enums (John Ferlan) - rpc: use virNetMessageClearPayload in client (Cole Robinson) - rpc: Clear more in virNetMessageClearPayload (Cole Robinson) - rpc: Add virNetMessageClearPayload (Cole Robinson) - virNetServerClientNewPostExecRestart: Drop useless typecasts (Michal Privoznik) - Add qemucapsprobe in .gitignore (Jiri Denemark) - tests: Add qemucapsprobe helper (Jiri Denemark) - virjson: Make pretty format more compact (Jiri Denemark) - qemu: Make qemuMonitorJSONIOProcessLine available for tests (Jiri Denemark) - qemu: Make virQEMUCapsNewForBinary usable from tests (Jiri Denemark) - tests: Decouple preload code from main() (Jiri Denemark) - tests: Create a shared library with qemu driver (Jiri Denemark) - bhyve: implement domainShutdown (Roman Bogorodskiy) - bhyve: drop virProcessKillPainfully() from destroy (Roman Bogorodskiy) - virsh: Pass the correct live/config xml to virshDomainDetachInterface. (Nitesh Konkar) - virsh: Introduce virshDomainDetachInterface function (Nitesh Konkar) - admin: Add a check to reject negative argument for number of typed params (Erik Skultety) - tools: virt-host-validate: HW virt support on s390 (Bjoern Walk) - tools: virt-host-validate: improve error handling (Bjoern Walk) - tools: virt-host-validate: fix CPU flag detection (Bjoern Walk) - qemu: Add 'iothread' to command line for supported controller (John Ferlan) - qemu: Use switch for qemuCheckIOThreads (John Ferlan) - conf: Add support for virtio-scsi iothreads (John Ferlan) - Pull latest translations from zanata (Daniel P. Berrange) - libvirt.spec: remove duplicate files from -docs package (Daniel P. Berrange) - virsh: volume: Add --bytes to 'vol-info' (Peter Krempa) - daemon: Add VIR_ERR_NO_SERVER and VIR_ERR_NO_CLIENT to daemonErrorLogFilter (Erik Skultety) - conf: Move virDomainControllerModelTypeToString (John Ferlan) - qemu: Add capability for virtio-scsi iothreads (John Ferlan) - spec: Rename %{init_scripts} -> %{with_init_script} (Andrea Bolognani) - spec: Type --with-init-script correctly (Andrea Bolognani) - configure: Remove nested conditionals in LIBVIRT_CHECK_INIT_SCRIPT (Andrea Bolognani) - configure: Change RHEL default from systemd+redhat to systemd (Andrea Bolognani) - maint: Ignore all .init, .service and .socket files (Andrea Bolognani) - virt-admin: Introduce command client-info (Erik Skultety) - admin: Introduce virAdmClientGetInfo API (Erik Skultety) - virnetserverclient: Add an internal method to retrieve client's identity (Erik Skultety) - virneserverclient: Introduce virNetServerClientHasSASLSession (Erik Skultety) - virnetsocket: Provide socket address format in a more standard form (Erik Skultety) - admin: include: Introduce some client's identity related typed params macros (Erik Skultety) - admin: Introduce virAdmServerLookupClient (Erik Skultety) - qemu_monitor_json: Follow our coding style (Michal Privoznik) - maint: Don't ignore libvirtd.pod any longer (Andrea Bolognani) - gitignore: ignore virt(log|lock)d.(service|socket) (Cole Robinson) - daemon: add option to read host uuid from /etc/machine-id (Nikolay Shirokovskiy) - util: factor out reading file into preallocated buffer (Nikolay Shirokovskiy) - qemu: support configuring usb3 controller port count (Cole Robinson) - qemu: caps: introduce QEMU_CAPS_NEC_USB_XHCI_PORTS (Cole Robinson) - qemu: parse: Use virControllerDefNew (Cole Robinson) - qemu_monitor_json: Drop redundant checks (Michal Privoznik) - qemuMonitorJSONQueryRxFilter: Validate qemu reply prior parsing it (Michal Privoznik) - Remove useless os.machine NULL check (Ján Tomko) - Introduce qemuDomainMachineIsVirt (Ján Tomko) - Rewrite the condition in qemuDomainAssignARMVirtioMMIOAddresses (Ján Tomko) - Remove useless variable in qemuDomainAssignAddresses (Ján Tomko) - Return void in qemuDomainAssignARMVirtioMMIOAddresses (Ján Tomko) - Invert condition in qemuDomainDefAddDefaultDevices (Ján Tomko) - Use qemuDomainMachineIs helpers when adding default devices (Ján Tomko) - qemu: Introduce qemuMonitorGetRTCTime (Michal Privoznik) - virt-admin: Introduce srv-clients-list command (Erik Skultety) - admin: Introduce listing clients (Erik Skultety) - rpc: virnetserverclient: Implement client connection transport retrieval (Erik Skultety) - include: admin: export connection transport constants (Erik Skultety) - rpc: virnetserver: Support retrieval of a list of clients (Erik Skultety) - rpc: gendispatch: Tune it to support client structure (Erik Skultety) - admin: Introduce virAdmClient client-side object (Erik Skultety) - rpc: virnetserverclient: Introduce new attribute conn_time to client (Erik Skultety) - rpc: virnetserverclient: Identify clients by an integer ID (Erik Skultety) - configure: Introduce LIBVIRT_{CHECK,RESULT}_INIT_SCRIPT (Andrea Bolognani) - configure: Add systemd detection to --with-init-script=check (Andrea Bolognani) - configure: Improve --with-init-script=check (Andrea Bolognani) - tests: add tests for panic device model s390 (Boris Fiuczynski) - qemu: add default panic device to S390 guests (Boris Fiuczynski) - qemu: add panic device support for S390 (Boris Fiuczynski) - qemu: merge S390 and S390X default device creation (Boris Fiuczynski) - rpc: protocol: Clarify VIR_NET_ERROR usage with streams (Cole Robinson) - fdstream: Report error with virProcessTranslateStatus (Cole Robinson) - fdstream: separate out virCommandPtr cleanup (Cole Robinson) - nwfilter: Push configFile building into LoadConfig (Cole Robinson) - conf: format runtime DAC seclabel, unless MIGRATABLE (Cole Robinson) - conf: Parse more of our nodedev XML (Martin Kletzander) - schemas: Update nodedev schema to match reality (Martin Kletzander) - Move capability formatting together (Martin Kletzander) - Change virDevicePCIAddress to virPCIDeviceAddress (Martin Kletzander) - qemu: hotplug: Adjust error path for attach hostdev scsi disk (John Ferlan) - qemu: hotplug: Adjust error path for attach virtio disk (John Ferlan) - qemu: hotplug: Adjust error path for attach scsi disk (John Ferlan) - qemu: Use qemuDomainSecretInfoPtr in qemuBuildNetworkDriveURI (John Ferlan) - qemu: Introduce qemuDomainSecretHostdevPrepare and Destroy (John Ferlan) - qemu: Introduce qemuDomainHostdevPrivatePtr (John Ferlan) - qemu: Introduce qemuDomainSecretPrepare and Destroy (John Ferlan) - qemu: Introduce qemuDomainSecretInfo (John Ferlan) - Adapt augeas profile to handle negative int values. (Cédric Bosdonnat) - qemu: monitor: Kill legacy PCI hotplug code (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachControllerDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainDetachNetDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainDetachHostPCIDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainDetachControllerDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainDetachVirtioDiskDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachHostPCIDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachNetDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachVirtioDiskDevice (Peter Krempa) - qemu: monitor: Kill legacy USB monitor code (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachHostUSBDevice (Peter Krempa) - qemu: hotplug: Assume QEMU_CAPS_DEVICE in qemuDomainAttachUSBMassStorageDevice (Peter Krempa) - qemu: remove default case from few typecasted enums (Peter Krempa) - qemu: process: Don't needlesly clear the perf events in qemuDomainPerfRestart (Peter Krempa) - util: perf: Adhere to coding style of error checks in qemuDomainSetPerfEvents (Peter Krempa) - util: perf: Adhere to coding style of error checks in virPerfEventEnable (Peter Krempa) - util: perf: Use 'error' label in virPerfCmtEnable (Peter Krempa) - qemu: perf: Don't ignore perf setup if allocation fails (Peter Krempa) - qemu: hotplug: Allow update of disk default snapshot location (Peter Krempa) - qemu: domain: Check few more fields for when changing disk source (Peter Krempa) - qemu: domain: Fix error message in qemuDomainDiskChangeSupported (Peter Krempa) - qemu: hotplug: Skip waiting for tray opening if qemu doesn't notify us (Peter Krempa) - virStream{Recv,Send}All: Increase client buffer (Michal Privoznik) - virnetclientstream: Process stream messages later (Michal Privoznik) - Revert "rpc: Fix slow volume download (virsh vol-download)" (Michal Privoznik) - Post-release version bump to 1.3.5 (John Ferlan) Cleanups: - Revert "qemu_cgroup: allow access to /dev/dri for virtio-vga" (Ján Tomko) Thanks everybody who helped with this release, be it by providing ideas bugs, patches, reviews, doc or localizations, hopefully I didn't mess it by rushing that release out ... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

Re: [libvirt] [PATCH RFC 4/8] target-i386: cpu: consolidate calls of object_property_parse() in x86_cpu_parse_featurestr
by Eduardo Habkost 03 Jun '16

03 Jun '16

(CCing libvirt folks) BTW: On Thu, Jun 02, 2016 at 02:22:22PM +0200, Igor Mammedov wrote: [...] > > /* Special cases: */ > > if (!strcmp(name, "xlevel")) { > > numvalue = strtoul(val, &err, 0); > > if (!*val || *err) { > > error_setg(errp, "bad numerical value %s", val); > > return; > > } > > if (numvalue < 0x80000000) { > > error_report("xlevel value shall always be >= 0x80000000" > > ", fixup will be removed in future versions"); > > numvalue += 0x80000000; > > snprintf(num, sizeof(num), "%" PRIu32, numvalue); > > val = num; [...] > > } else if (!strcmp(name, "hv-spinlocks")) { > > const int min = 0xFFF; > > > > numvalue = strtoul(val, &err, 0); > > if (!*val || *err) { > > error_setg(errp, "bad numerical value %s", val); > > return; > > } > > if (numvalue < min) { > > error_report("hv-spinlocks value shall always be >= 0x%x" > > ", fixup will be removed in future versions", > > min); > > numvalue = min; > > } Those "fixup will be removed in future versions" warnings are present since QEMU 1.7. Assuming that libvirt never allowed those invalid values to be used in the configuration (did it?), I believe we can safely remove the hv-spinlocks and xlevel fixups in QEMU 2.7. The hv-spinlocks setter already rejects invalid values. We just need to make x86_cpu_realizefn() reject invalid xlevel values. -- Eduardo

4 8

[libvirt] [PATCH] Fix building with -Og
by Martin Kletzander 03 Jun '16

03 Jun '16

When building using -Og, gcc sees that some variables can be used uninitialized It can be debatable whether it is possible with our codeflow, but functions should be self-contained and initializations are always good. The return instead of goto is due to actualType being used in the cleanup. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/util/virbitmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 67f14fe766a5..f0948eae774e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4275,7 +4275,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Cannot attach disk until init PID is known")); - goto cleanup; + return -1; } if (virLXCProcessValidateInterface(net) < 0) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 423d069e1b26..b7be2917e29e 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1570,7 +1570,7 @@ iptablesCreateRuleInstanceStateCtrl(virFirewallPtr fw, const char *ifname, virNWFilterVarCombIterPtr vars) { - int rc; + int rc = 0; bool directionIn = false; char chainPrefix[2]; bool maySkipICMP, inout = false; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 9283aef1735b..4ca59f9d6227 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -817,7 +817,7 @@ virBitmapLastSetBit(virBitmapPtr bitmap) ssize_t i; int unusedBits; ssize_t sz; - unsigned long bits; + unsigned long bits = 0; unusedBits = bitmap->map_len * VIR_BITMAP_BITS_PER_UNIT - bitmap->max_bit; -- 2.8.3

3 4

[libvirt] [PATCH 0/9] Add runnability info to query-cpu-definitions
by Eduardo Habkost 03 Jun '16

03 Jun '16

This series extends query-cpu-definitions to include two extra fields: "runnable", and "unavailable-features". This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. This series is based on my 'x86-next' branch, at: git://github.com/ehabkost/qemu.git x86-next Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (9): target-i386: Move TCG initialization check to tcg_x86_init() target-i386: Move TCG initialization to realize time target-i386: Call cpu_exec_init() on realize target-i386: List CPU models using subclass list target-i386: Move warning code outside x86_cpu_filter_features() target-i386: Define CPUID filtering functions before x86_cpu_list() qmp: Add runnability information to query-cpu-definitions target-i386: Use "-" instead of "_" on all feature names target-i386: Return runnability information on query-cpu-definitions qapi-schema.json | 10 +- target-i386/cpu-qom.h | 4 + target-i386/cpu.c | 275 +++++++++++++++++++++++++++++++++--------------- target-i386/translate.c | 6 ++ 4 files changed, 207 insertions(+), 88 deletions(-) -- 2.5.5

6 46

[libvirt] [PATCH] storage: Adjust qemu-img switches check
by John Ferlan 03 Jun '16

03 Jun '16

Since we support QEMU 0.12 and later, checking for support of specific flags added prior to that isn't necessary. Thus start with the base of having the "-o options" available for the qemu-img create option and then determine whether we have the compat option for qcow2 files (which would be necessary up through qemu 2.0 where the default changes to compat 0.11). NOTE: Keeping old tests around since it's still possible to create in the old format. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend.c | 66 ++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 3a23cd7..eaa6f65 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -869,9 +869,19 @@ virStoragePloopResize(virStorageVolDefPtr vol, return ret; } +/* Flag values shared w/ storagevolxml2argvtest.c. + * Since it's still possible to provide the old format args, just + * keep them; however, prefix with an "X_" (similar to qemu_capabilities.c) + * to indicate the are older. + * + * QEMU_IMG_BACKING_FORMAT_OPTIONS (added in qemu 0.11) + * QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT + * was made necessary due to 2.0 change to change the default + * qcow2 file format from 0.10 to 1.1. + */ enum { - QEMU_IMG_BACKING_FORMAT_NONE = 0, - QEMU_IMG_BACKING_FORMAT_FLAG, + X_QEMU_IMG_BACKING_FORMAT_NONE = 0, + X_QEMU_IMG_BACKING_FORMAT_FLAG, QEMU_IMG_BACKING_FORMAT_OPTIONS, QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT, }; @@ -904,46 +914,18 @@ virStorageBackendQemuImgSupportsCompat(const char *qemuimg) static int virStorageBackendQEMUImgBackingFormat(const char *qemuimg) { - char *help = NULL; - char *start; - char *end; - char *tmp; - int ret = -1; - int exitstatus; - virCommandPtr cmd = virCommandNewArgList(qemuimg, "-h", NULL); - - virCommandAddEnvString(cmd, "LC_ALL=C"); - virCommandSetOutputBuffer(cmd, &help); - virCommandClearCaps(cmd); - - /* qemuimg doesn't return zero exit status on -h, - * therefore we need to provide pointer for storing - * exit status, although we don't parse it any later */ - if (virCommandRun(cmd, &exitstatus) < 0) - goto cleanup; + /* As of QEMU 0.11 the [-o options] support was added via qemu + * commit id '9ea2ea71', so we start with that base and figure + * out what else we have */ + int ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; + + /* QEMU 2.0 changed to using a format that only QEMU 1.1 and newer + * understands. Since we still support QEMU 0.12 and newer, we need + * to be able to handle the previous format as can be set via a + * compat=0.10 option. */ + if (virStorageBackendQemuImgSupportsCompat(qemuimg)) + ret = QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT; - if ((start = strstr(help, " create ")) == NULL || - (end = strstr(start, "\n")) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse qemu-img output '%s'"), - help); - goto cleanup; - } - if (((tmp = strstr(start, "-F fmt")) && tmp < end) || - ((tmp = strstr(start, "-F backing_fmt")) && tmp < end)) { - ret = QEMU_IMG_BACKING_FORMAT_FLAG; - } else if ((tmp = strstr(start, "[-o options]")) && tmp < end) { - if (virStorageBackendQemuImgSupportsCompat(qemuimg)) - ret = QEMU_IMG_BACKING_FORMAT_OPTIONS_COMPAT; - else - ret = QEMU_IMG_BACKING_FORMAT_OPTIONS; - } else { - ret = QEMU_IMG_BACKING_FORMAT_NONE; - } - - cleanup: - virCommandFree(cmd); - VIR_FREE(help); return ret; } @@ -1196,7 +1178,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn, VIR_FREE(opts); } else { if (info.backingPath) { - if (imgformat == QEMU_IMG_BACKING_FORMAT_FLAG) + if (imgformat == X_QEMU_IMG_BACKING_FORMAT_FLAG) virCommandAddArgList(cmd, "-F", backingType, NULL); else VIR_DEBUG("Unable to set backing store format for %s with %s", -- 2.5.5

1 1

[libvirt] [PATCH 0/3] Clean up some virstorageencryption code
by John Ferlan 03 Jun '16

03 Jun '16

While working through adding luks support for libvirt, I have a few patches that aren't really germane to adding support and rather than drop a large patch series when I'm done - I figured I'd post a few adjustments. In the long run the encryption code probably doesn't work, but I'm trying to move it to the side at least. John Ferlan (3): util: Clean up code formatting in virstorageencryption storage: Split out setting default secret for encryption storage: Split out a helper for encryption checks src/storage/storage_backend.c | 80 ++++++++++++++++++++++++++-------------- src/storage/storage_backend_fs.c | 79 ++++++++++++++++++++++++--------------- src/util/virstorageencryption.c | 58 ++++++++++++++--------------- 3 files changed, 128 insertions(+), 89 deletions(-) -- 2.5.5

1 4

[libvirt] [PATCH 0/2] Fix a virperf related crasher
by Michal Privoznik 03 Jun '16

03 Jun '16

I've ran into a crasher. Worse crasher over RO connection. Michal Privoznik (2): Drop virPerfGetEventFd virPerfEventIsEnabled: Don't crash on shut off domains src/libvirt_private.syms | 1 - src/util/virperf.c | 22 +++------------------- src/util/virperf.h | 3 --- 3 files changed, 3 insertions(+), 23 deletions(-) -- 2.8.3

2 4

[libvirt] Plan for the next release
by Daniel Veillard 03 Jun '16

03 Jun '16

I will be travelling end of this week and most of next week, but I think we can still try to get a release for June 1st, I suggest: - enter freeze this Thrusday 26 - Push an rc2 over the week-end - try to push the 1.3.5 release on Wed June 1st I hope this works for everybody ! Thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH v3] virDomainChrGetDomainPtrsInternal: Return an integer
by Michal Privoznik 03 Jun '16

03 Jun '16

There's this problem on the recent gcc-6.1: In file included from conf/domain_conf.c:37:0: conf/domain_conf.c: In function 'virDomainChrPreAlloc': conf/domain_conf.c:14109:35: error: potential null pointer dereference [-Werror=null-dereference] return VIR_REALLOC_N(*arrPtr, *cntPtr + 1); ^~ ./util/viralloc.h:158:73: note: in definition of macro 'VIR_REALLOC_N' # define VIR_REALLOC_N(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count), \ ^~~~~ conf/domain_conf.c: In function 'virDomainChrRemove': conf/domain_conf.c:14133:21: error: potential null pointer dereference [-Werror=null-dereference] for (i = 0; i < *cntPtr; i++) { ^~~~~~~ GCC basically fails to see, that the virDomainChrGetDomainPtrsInternal will never actually return NULL because it's never called over a domain char device with _LAST type. But to make it shut up, lets turn this function into returning an integer and check in the callers if a zero value value was returned. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - Yet another improvement as suggested in review of v2 src/conf/domain_conf.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7d46d0b..9f9fdf2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14038,7 +14038,7 @@ virDomainChrFind(virDomainDefPtr def, /* Return the address within vmdef to be modified when working with a * chrdefptr of the given type. */ -static void +static int ATTRIBUTE_RETURN_CHECK virDomainChrGetDomainPtrsInternal(virDomainDefPtr vmdef, virDomainChrDeviceType type, virDomainChrDefPtr ***arrPtr, @@ -14048,28 +14048,30 @@ virDomainChrGetDomainPtrsInternal(virDomainDefPtr vmdef, case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: *arrPtr = &vmdef->parallels; *cntPtr = &vmdef->nparallels; - break; + return 0; case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: *arrPtr = &vmdef->serials; *cntPtr = &vmdef->nserials; - break; + return 0; case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: *arrPtr = &vmdef->consoles; *cntPtr = &vmdef->nconsoles; - break; + return 0; case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: *arrPtr = &vmdef->channels; *cntPtr = &vmdef->nchannels; - break; + return 0; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: - *arrPtr = NULL; - *cntPtr = NULL; break; } + + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown char device type: %d"), type); + return -1; } @@ -14085,14 +14087,13 @@ virDomainChrGetDomainPtrs(const virDomainDef *vmdef, size_t *cntVar = NULL; /* Cast away const; we add it back in the final assignment. */ - virDomainChrGetDomainPtrsInternal((virDomainDefPtr) vmdef, type, - &arrVar, &cntVar); - if (arrVar) { + if (virDomainChrGetDomainPtrsInternal((virDomainDefPtr) vmdef, type, + &arrVar, &cntVar) < 0) { + *arrPtr = NULL; + *cntPtr = 0; + } else { *arrPtr = (const virDomainChrDef **) *arrVar; *cntPtr = *cntVar; - } else { - *arrPtr = NULL; - *cntPtr = 0; } } @@ -14104,7 +14105,9 @@ virDomainChrPreAlloc(virDomainDefPtr vmdef, virDomainChrDefPtr **arrPtr = NULL; size_t *cntPtr = NULL; - virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); + if (virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, + &arrPtr, &cntPtr) < 0) + return -1; return VIR_REALLOC_N(*arrPtr, *cntPtr + 1); } @@ -14116,7 +14119,9 @@ virDomainChrInsertPreAlloced(virDomainDefPtr vmdef, virDomainChrDefPtr **arrPtr = NULL; size_t *cntPtr = NULL; - virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); + if (virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, + &arrPtr, &cntPtr) < 0) + return; VIR_APPEND_ELEMENT_INPLACE(*arrPtr, *cntPtr, chr); } @@ -14128,7 +14133,9 @@ virDomainChrRemove(virDomainDefPtr vmdef, virDomainChrDefPtr ret = NULL, **arrPtr = NULL; size_t i, *cntPtr = NULL; - virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); + if (virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, + &arrPtr, &cntPtr) < 0) + return NULL; for (i = 0; i < *cntPtr; i++) { ret = (*arrPtr)[i]; -- 2.8.3

2 1

[libvirt] [PATCH 00/10] vz: improve locking in getting domain statistics
by Nikolay Shirokovskiy 03 Jun '16

03 Jun '16

Current stats cache uses same lock as domain cache, namely lock of virDomainObjPtr. First this is not necessary, domain cache is used to translate id of object of interest from libvirt to vzsdk one. Besides this domain object is not used. Second this is risky game as lock is dropped on waiting for stat events from sdk deep down on stack so callers throughout the stack should be written very carefully. This patch series makes stats cache self locking and thus making code much more solid. This is done thru introducing extra lock for stats cache. Statistics API functions first use domain cache then drop domain lock, query stats cache and unreference domain object. Patches 1-4 conform API functions to this structure. Patches 5-7 makes subsidiary improvments. Patch 8 finally introduce new lock. Last patches are cleanup[9] and bugfix[10]. Nikolay Shirokovskiy (10): vz: pass string instead of disk definition to block stat function vz: prepare disks names before getting all disks stats vz: move getting stats in vzDomainGetVcpus to the end vz: move getting stats in vzDomainGetInfo to the end vz: use consistent naming for different domain object in vz_driver.c vz: simplify refcount on sdkdom in prlsdkLoadDomain vz: hold stats cache in a pointer in vzDomObj vz: introduce stats cache lock vz: extract on stats cache update into a function vz: fix many stat request issue src/vz/vz_driver.c | 397 +++++++++++++++++++++++++++++++++++------------------ src/vz/vz_sdk.c | 230 +++++++++++++++++++++---------- src/vz/vz_sdk.h | 15 +- src/vz/vz_utils.c | 9 -- src/vz/vz_utils.h | 6 +- 5 files changed, 438 insertions(+), 219 deletions(-) -- 1.8.3.1

1 11

[libvirt] libvirt-tck test failure after commit b3d06987
by Jim Fehlig 02 Jun '16

02 Jun '16

We've noticed libvirt-tck test 100-apply-verify-host.t failing recently on libvirt.git master and I finally got around to bisecting it to commit b3d06987. I haven't looked at the test in detail, but it appears to expect a broadcast address of 10.1.2.255, however finds an address of 0.0.0.0 after commit b3d06987. I'm not terribly familiar with this code, but the following hunk of b3d06987 looks suspect @@ -1039,21 +1039,28 @@ virNetDevCreateNetlinkAddressMessage(int messageType, const char *ifname, virSocketAddr *addr, unsigned int prefix, - virSocketAddr *broadcast) + virSocketAddr *broadcast, + virSocketAddr *peer) { struct nl_msg *nlmsg = NULL; struct ifaddrmsg ifa; unsigned int ifindex; void *addrData = NULL; + void *peerData = NULL; void *broadcastData = NULL; size_t addrDataLen; if (virNetDevGetIPAddressBinary(addr, &addrData, &addrDataLen) < 0) return NULL; - if (broadcast && virNetDevGetIPAddressBinary(broadcast, &broadcastData, - &addrDataLen) < 0) - return NULL; + if (peer && VIR_SOCKET_ADDR_VALID(peer)) { + if (virNetDevGetIPAddressBinary(peer, &peerData, &addrDataLen) < 0) + return NULL; + } else if (broadcast) { + if (virNetDevGetIPAddressBinary(broadcast, &broadcastData, + &addrDataLen) < 0) + return NULL; + } /* Get the interface index */ if ((ifindex = if_nametoindex(ifname)) == 0) Vasiliy, I can look in more detail tomorrow, but in the meantime any suggestions you have would be much appreciated. Regards, Jim

3 3

[libvirt] [PATCH v2 0/4] Final round of build fixes
by Michal Privoznik 02 Jun '16

02 Jun '16

diff to v1: - Some patches from the original patch set are pushed now - For the other ones, I've managed to work in review suggestions Michal Privoznik (4): virNetDevBridgeGet: Don't require users to virNetDevSetupControl ppc64Compute: Avoid possible NULL dereference virDomainChrGetDomainPtrsInternal: Return an integer virDomainFormatSchedDef: Avoid false positive NULL dereference src/conf/domain_conf.c | 44 ++++++++++++++++++++++++++++++-------------- src/cpu/cpu_ppc64.c | 12 ++++++------ src/util/virnetdevbridge.c | 35 ++++++++++++----------------------- 3 files changed, 48 insertions(+), 43 deletions(-) -- 2.8.3

2 10

[libvirt] Python listDefinedDomains broken?
by Marc Richter 02 Jun '16

02 Jun '16

Hi everyone, please, don't roast me if I'm asking stupid things or fail to provide info, since I'm a freshman, using libvirt. I have two servers, both running the following versions: Compiled against library: libvirt 1.3.1 Using library: libvirt 1.3.1 Using API: QEMU 1.3.1 Running hypervisor: QEMU 0.14.0 I'm trying to create a Python program, which gets a list of all defined domains for each host and give a list for domains only defined on one of these hosts. This Python script is running on a third host (my workstation), using these versions: Python: 3.5.1 libvirt-python: 1.3.1 When I'm running virsh on my workstation (version 1.3.1), like this: virsh -c "qemu+ssh://root@host1/system?keyfile=/home/user/.ssh/id_rsa_libvirt" --readonly list --all Then a domain named "winxp_ausgeschaltet" is within that list: Id Name State ---------------------------------------------------- ... - winxp_ausgeschaltet shut off When I do the same for the second host, it is also in that list: Id Name State ---------------------------------------------------- ... 7 winxp_ausgeschaltet running When I do the following in Python, this domain is listed for the first host (where it's state is "shut off"), but not for the second one: import libvirt import sys class kvmhost: def __init__(self, host, keyfile): self.conn = self.connect_kvm(host, keyfile) self.doms = sorted(self.get_doms()) def connect_kvm(self, host, keyfile): try: conn = libvirt.openReadOnly('qemu+ssh://root@' + host + '/system?keyfile=' + keyfile) except libvirt.libvirtError as lve: print('Error: ' + str(lve)) sys.exit(1) return conn def get_doms(self): try: alldoms = self.conn.listDefinedDomains() except libvirt.libvirtError as lve: print('Error: ' + str(lve)) self.conn.close() sys.exit(1) return alldoms host1 = kvmhost('host1', '/path/to/ssh_keyfile') host2 = kvmhost('host2', '/path/to/ssh_keyfile') print(host1.doms) print(host2.doms) What am I doing wrong here or: is there a missbehavior in libvirt or the python module? Using listAllDomains instead of listDefinedDomains gives: libvirt: Remote Driver error : unknown procedure: 273 What is the difference between listAllDomains and listDefinedDomains at all? Thanks for your help. Marc

3 3

[libvirt] [PATCH v2 0/2] qemu: expand domain memory statistics
by Derbyshev Dmitriy 01 Jun '16

01 Jun '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Changes since v1: * Enum numeration fixed * Macro getting "usage" field fixed Derbyshev Dmitry (2): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp include/libvirt/libvirt-domain.h | 11 ++++++++++- src/libvirt-domain.c | 5 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++---------- tools/virsh-domain-monitor.c | 4 ++++ 4 files changed, 32 insertions(+), 11 deletions(-) -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH 0/4] Move secret object command line building helpers
by John Ferlan 01 Jun '16

01 Jun '16

More "extractable" changes from my work on adding luks support. While working through changes in storage_backend.c I found that the building of the 'qemu-img' command to create a luks volume will need to create a secret object. In order to do that I found if I took the qemu_command code and moved things around a bit, then I would be able to access the API's that I need. Moving the command line building from qemu_command.c to virjson.c seemed logical since it was multipurpose/generic anyway. I'm not "tied" to the API name chosen - if there's suggestions, I'll adjust. Then splitting out the generation of the secret object props into their own API and then eventually into secret_util.c seemed to be the best avenue. I can then include secret_util into the storage driver. The last change just cleans up the secinfo command building processing. It was "complicated" when there was going to be hostdev and disk code trying to generate the same objects... Now that just seems less important. When/if iSCSI/hostdev support for the AES secret is added, I'll made the appropriate adjustments then. John Ferlan (4): qemu: Move and rename qemuBuildObjectCommandlineFromJSON qemu: Introduce qemuBuildSecretObjectProps qemu: Move and rename qemuBuildSecretObjectProps qemu: Rework secinfo command line building src/libvirt_private.syms | 4 +- src/qemu/qemu_command.c | 199 ++++++-------------------------------------- src/qemu/qemu_command.h | 4 - src/secret/secret_util.c | 59 +++++++++++++ src/secret/secret_util.h | 10 +++ src/util/virjson.c | 117 +++++++++++++++++++++++++- src/util/virjson.h | 12 ++- tests/qemucommandutiltest.c | 7 +- 8 files changed, 219 insertions(+), 193 deletions(-) -- 2.5.5

3 23

[libvirt] KVM Forum 2016: Call For Participation
by Paolo Bonzini 01 Jun '16

01 Jun '16

================================================================= KVM Forum 2016: Call For Participation August 24-26, 2016 - Westin Harbor Castle - Toronto, Canada (All submissions must be received before midnight May 1, 2016) ================================================================= KVM Forum is an annual event that presents a rare opportunity for developers and users to meet, discuss the state of Linux virtualization technology, and plan for the challenges ahead. We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2016. At this highly technical conference, developers driving innovation in the KVM virtualization stack (Linux, KVM, QEMU, libvirt) can meet users who depend on KVM as part of their offerings, or to power their data centers and clouds. KVM Forum will include sessions on the state of the KVM virtualization stack, planning for the future, and many opportunities for attendees to collaborate. As we celebrate ten years of KVM development in the Linux kernel, KVM continues to be a critical part of the FOSS cloud infrastructure. This year, KVM Forum is joining LinuxCon and ContainerCon in Toronto, Canada. Selected talks from KVM Forum will be presented on Wednesday August 24 to the full audience of LinuxCon and ContainerCon. Also, attendees of KVM Forum will have access to all of the LinuxCon and ContainerCon talks on Wednesday. http://events.linuxfoundation.org/cfp Suggested topics: KVM and Linux * Scaling and optimizations * Nested virtualization * Linux kernel performance improvements * Resource management (CPU, I/O, memory) * Hardening and security * VFIO: SR-IOV, GPU, platform device assignment * Architecture ports QEMU * Management interfaces: QOM and QMP * New devices, new boards, new architectures * Scaling and optimizations * Desktop virtualization and SPICE * Virtual GPU * virtio and vhost, including non-Linux or non-virtualized uses * Hardening and security * New storage features * Live migration and fault tolerance * High availability and continuous backup * Real-time guest support * Emulation and TCG * Firmware: ACPI, UEFI, coreboot, u-Boot, etc. * Testing Management and infrastructure * Managing KVM: Libvirt, OpenStack, oVirt, etc. * Storage: glusterfs, Ceph, etc. * Software defined networking: Open vSwitch, OpenDaylight, etc. * Network Function Virtualization * Security * Provisioning * Performance tuning =============== SUBMITTING YOUR PROPOSAL =============== Abstracts due: May 1, 2016 Please submit a short abstract (~150 words) describing your presentation proposal. Slots vary in length up to 45 minutes. Also include the proposal type -- one of: - technical talk - end-user talk Submit your proposal here: http://events.linuxfoundation.org/cfp Please only use the categories "presentation" and "panel discussion" You will receive a notification whether or not your presentation proposal was accepted by May 27, 2016. Speakers will receive a complimentary pass for the event. In the instance that your submission has multiple presenters, only the primary speaker for a proposal will receive a complementary event pass. For panel discussions, all panelists will receive a complimentary event pass. TECHNICAL TALKS A good technical talk should not just report on what has happened over the last year; it should present a concrete problem and how it impacts the user and/or developer community. Whenever applicable, focus on work that needs to be done, difficulties that haven't yet been solved, and on decisions that other developers should be aware of. Summarizing recent developments is okay but it should not be more than a small portion of the overall talk. END-USER TALKS One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user talk. As an end user, this is a unique opportunity to get your input to developers. HANDS-ON / BOF SESSIONS We will reserve some time for people to get together and discuss strategic decisions as well as other topics that are best solved within smaller groups. These sessions will be announced during the event. If you are interested in organizing such a session, please add it to the list at http://www.linux-kvm.org/page/KVM_Forum_2016_BOF Let people you think might be interested know about it, and encourage them to add their names to the wiki page as well. Please try to add your ideas to the list before KVM Forum starts. PANEL DISCUSSIONS If you are proposing a panel discussion, please make sure that you list all of your potential panelists in your abstract. We will request full biographies if a panel is accepted. =============== HOTEL / TRAVEL =============== This year's event will take place at the Westin Harbour Castle Toronto. For information on discounted room rates for conference attendees and on other hotels close to the conference, please visit http://events.linuxfoundation.org/events/kvm-forum/attend/hotel-travel. As of March 15, 2016, non-US citizens need either a visa or an Electronic Travel Authorization (eTA) in order to enter Canada. Detailed information on the travel documentation required for your country of origin can be found at http://www.cic.gc.ca/english/visit/visas.asp and http://events.linuxfoundation.org/events/kvm-forum/attend/hotel-travel. ** We urge you to start this process as quickly as possible to ensure ** receipt of appropriate travel documentation in time for your conference ** travel to Canada. For processing times for visa applications, please visit ** http://www.cic.gc.ca/english/information/times/. =============== IMPORTANT DATES =============== Notification: May 27, 2015 Schedule announced: June 3, 2015 Event dates: August 24-26, 2016 Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2016 in August! -your KVM Forum 2016 Program Committee Please contact us with any questions or comments at kvm-forum-2016-pc(a)redhat.com

2 2

[libvirt] [PATCH v2 0/6] Move secret object command line building helpers
by John Ferlan 01 Jun '16

01 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-May/msg02017.html Changes in v2: Patch 1 - Move function to a new src/util/virqemu.c with adjustments to other affected areas Patches 2-4 - Similarly adjust the flow/name of the patches with an adjustment so that patch 2 is just the new code in virqemu.c and patch 3 shows how the master secret code would use the same function to build it's command line. Patch 4 just follows suit... Patch 5 was reviewed/ACK'd - this patch just shows the changes to remove the "virSecretPtr secret = NULL;" and "virObjectUnref(secret);" Patch 6 is unchanged John Ferlan (6): qemu: Move and rename qemuBuildObjectCommandlineFromJSON util: Introduce virQEMUBuildSecretObjectProps qemu: Use virQEMUBuildSecretObjectProps to build secret objects qemu: Rework secinfo command line building storage: Use virSecretGetSecretString secret: Move virStorageSecretType to secret_util and rename cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 5 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 219 +++++---------------- src/qemu/qemu_command.h | 4 - src/qemu/qemu_domain.c | 4 +- src/secret/secret_util.c | 18 +- src/secret/secret_util.h | 22 ++- src/storage/storage_backend_iscsi.c | 55 +----- src/storage/storage_backend_rbd.c | 49 +---- src/util/virqemu.c | 211 ++++++++++++++++++++ src/util/virqemu.h | 42 ++++ src/util/virstoragefile.c | 33 ++-- src/util/virstoragefile.h | 17 +- tests/qemuargv2xmltest.c | 4 +- tests/qemucommandutiltest.c | 9 +- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-master-key.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 3 +- 21 files changed, 380 insertions(+), 328 deletions(-) create mode 100644 src/util/virqemu.c create mode 100644 src/util/virqemu.h -- 2.5.5

1 7

[libvirt] RFC: turn cpu 'host-model' into 'custom' for active config on domain start
by Nikolay Shirokovskiy 01 Jun '16

01 Jun '16

Hi, everyone. Cpu mode 'host-model' is not convinient for migration in current form. Consider migration from less capable host to more capable one - it is possible. But then migration backwards is impossible despite the fact that qemu process on destination is running with the same model and features as on source because migration does not update 'host-model' cpu upon migration on destination. The problem is that on migrating back instead of taking current cpu config 'host-model' is expanded again and gain extra features of destination and migration failed by source (new destination) side. What if we change cpu for active config from 'host-model' into 'custom' in the starting process? Then this issue will be fixed. It is quite reasonable from my POV - 'host-model' is effectively about taking active domain cpu from host on start, after that active domain cpu is on its own. Persistent config stays 'host-model' so migrating of active domain and restarting it gains extra features of new host as before. Nikolay

3 2

[libvirt] NFS over AF_VSOCK in <filesystem>
by Stefan Hajnoczi 01 Jun '16

01 Jun '16

virtio-vsock support has been added to the nfs-ganesha NFS server. I'm currently working on upstreaming virtio-vsock into Linux and QEMU. I also have patches for the Linux NFS client and server. Users wishing to share a file system with the guest will need to configure the NFS server. Perhaps libvirt could handle that given that it already has <filesystem> syntax. The basic task is setting up either the kernel nfsd or nfs-ganesha for the VM to access the NFS export(s). When the VM is destroy the NFS server can be shut down. Does this sound like a responsibility that libvirt should handle? Stefan

4 11

[libvirt] [PATCH 0/3] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 01 Jun '16

01 Jun '16

The following series of patches implement virConnectDomainXMLFromNative. This is mostly some boiler plate code generating argv-lists from the native command string, and two getopt-based argument parsers for the /usr/sbin/bhyve and /usr/sbin/bhyveload commands. Since there is quite some string handling involved especially in the first patch that I am not 100% sure about, I'd appreciate a thorough review. Fabian Freyer (3): bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader po/POTFILES.in | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 ++ src/bhyve/bhyve_parse_command.c | 869 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 ++ 5 files changed, 944 insertions(+) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h -- 2.7.0

1 4

Re: [libvirt] [ovs-dev] [PATCH v2 2/2] netdev-dpdk: Support user-defined socket attribs
by Ansis Atteka 01 Jun '16

01 Jun '16

On Mon, May 30, 2016 at 12:29 AM, Christian Ehrhardt <christian.ehrhardt(a)canonical.com> wrote: > On Tue, May 24, 2016 at 4:10 PM, Aaron Conole <aconole(a)redhat.com> wrote: > >> Daniele Di Proietto <diproiettod(a)vmware.com> writes: >> >> > Hi Aaron, >> > >> > I'm still a little bit nervous about calling chown on a (partially) >> > user controlled file name. >> >> I agree, that always seems scary. >> >> > Before moving forward I wanted to discuss a couple of other options: >> > >> > * Ansis (in CC) suggested using -runas parameter in qemu. This way >> > qemu can open the socket as root and drop privileges before starting >> > guest execution. >> >> I'm not sure how to do this with libvirt, or via the OpenStack Neutron >> plugin. I also don't know if it would be an acceptable workaround for >> users. Additionally, I recall there being something of a "don't even >> know if this works" around it. Maybe Christian or Ansis (both in CC) >> can expound on it. >> Cross-posting to libvirt mailing list to hear opinion from libvirt developers. In short - the problem is that libvirtd process starts qemu process under non-root user. Since qemu starts under non-root process, then qemu can't connect to DPDK unix domain sockets created by ovs-vswitcd process that runs under "root". There are two solutions to this problem: 1. let ovs-vswitchd process to chown its socket from "root" to "libvirt" group and/or user (this is what Aarons patch proposes) 2. make libvirtd process to start qemu process under "root" but then let qemu to downgrade via "-run-as" flag after qemu has opened the Unix Domain socket. Regarding solution #2. I think the necessary changes roughly would be to: 1. invoke virCommandAddArgPair(cmd, "-runas", "libvirt") before starting qemu process; AND 2. revert virCommandSetUID() that automatically downgrades user from "root" to "libvirt" even before qemu starts. I would like to hear feasibility of such solution from libvirt developers? Or maybe there is even a better solution that I am missing? Regarding solution #1. There have already been precedents that other daemons are chowning their sockets so that non-privileged daemons could connect to them. IMHO this is not elegant from security perspective but will at least get the job done if Linux Distribution maintainers (Aaron and Christian) need to ship something out ASAP . The thing I am concerned about this solutions is that ovs-vswitchd could be used to chown() arbitrary files and sockets on file system if there happens to be a bug. Also, this socket is not created by ovs-vswitchd code base itself but rather from Intel DPDK library where ovs-vswitchd calls into. > Hi, > IIRC we kind of agree that long term a proper MAC will be much better but > most involved people needed something to get it working like "now". > Since they are complementary (other than the fix removing a bit of the > urgency for more MAC) it was kind of the least bad option. > > You have to be aware that I brought up the discussion on dev(a)dpdk.org - see > [1] and [2]: > But this will take time and eventually still be the applications task to > "do something" - no matter if via API or via the chmod's right now. > So Aaron is trying to get something that works now until the long term > things are in place, which I appreciate. > > FYI - I was even more in a hurry as it was clear that OVS-2.5 won't get > this in time I run with [3] for now. > I never intended to suggest that, but with the discussion in place, one > could ask if you (Aaron) want to pick up that instead. > That would keep OVS free for now until DPDK made up the API (see [2]) for > socket ownership control and this then could be implemented in OVS? > > (I hope) In some months/years we will all be happy to drop this bunch of > interim solutions, never the less we need it for now. > > [1]: http://dpdk.org/dev/patchwork/patch/12222/ > [2]: http://dpdk.org/ml/archives/dev/2015-December/030326.html > [3]: > https://git.launchpad.net/~ubuntu-server/dpdk/commit/?h=ubuntu-xenial-to-dp… > > [...] > > >> I think originally we quickly discussed 4 possible solutions (and >> hopefully I captured them correctly): >> >> 1. OVS downgrades to the ovs user, and kvm runs under the ovs >> group. I don't actually like this solution because kvm could then >> pollute the ovs database. >> >> 2. OVS runs as some user and sets the user/group ownership of the socket >> via chown/chmod where permissions come from the database (the >> original context had ovs running as root - but as I described above >> it doesn't need to be root provided ovs+DPDK can start without root). >> >> 3. OVS runs as some user, kvm starts as root, opens the socket and >> downgrades. IIRC, this doesn't actually work, or it may have >> implications on other projects. I don't remember exactly what was >> not as great about this solution, TBH. >> >> 4. OVS and KVM run as whatever users; MAC is used to enforce the >> layering between them. >> >> I think solution 2 and solution 4 don't actually interfere with each >> other, and can be used to a complementary effect (if implemented >> properly) so that the MAC layer enforces access, but even without MAC, >> the DAC layer can provide appropriate whitelisting behavior. >> > > I also remember several complex changes needed for the #1 and #3 that > always would end up with huge effort and a high risk not being accepted. > Probably that is what you refer to with "implications on other projects". > > Also keep in mind the position of dpdk out of the last few discussions > which I'd like to summarize as "dpdk got this path from an app, so this app > OWNS that path". > _______________________________________________ > dev mailing list > dev(a)openvswitch.org > http://openvswitch.org/mailman/listinfo/dev

3 4

[libvirt] [PATCH] Removed function virDomainDefNewFull.
by Tomáš Ryšavý 31 May '16

31 May '16

The function virDomainDefNewFull() in src/conf/domain_conf.c was a thin wrapper around virDomainDefNew() that was only used in a few places in the code. The function was removed and the callers were re-implemented. --- src/conf/domain_conf.c | 22 ---------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - src/vz/vz_utils.c | 8 +++++++- src/xen/xen_hypervisor.c | 26 ++++++++++++++++++-------- src/xen/xend_internal.c | 23 +++++++++++++++++++---- src/xen/xm_internal.c | 24 ++++++++++++++++++++++-- 7 files changed, 66 insertions(+), 41 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fb05bf7..5721800 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2754,28 +2754,6 @@ virDomainDefNew(void) } -virDomainDefPtr -virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id) -{ - virDomainDefPtr def; - - if (!(def = virDomainDefNew())) - return NULL; - - if (VIR_STRDUP(def->name, name) < 0) { - VIR_FREE(def); - return NULL; - } - - memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); - def->id = id; - - return def; -} - - void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, bool live, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 82e581b..afb722c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2507,9 +2507,6 @@ void virDomainDefFree(virDomainDefPtr vm); virDomainChrDefPtr virDomainChrDefNew(void); virDomainDefPtr virDomainDefNew(void); -virDomainDefPtr virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id); void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb5b419..1a09a95 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -234,7 +234,6 @@ virDomainDefMaybeAddController; virDomainDefMaybeAddInput; virDomainDefNeedsPlacementAdvice; virDomainDefNew; -virDomainDefNewFull; virDomainDefParseFile; virDomainDefParseNode; virDomainDefParseString; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 5427314..0e98a39 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -166,9 +166,15 @@ vzNewDomain(vzDriverPtr driver, const char *name, const unsigned char *uuid) virDomainObjPtr dom = NULL; vzDomObjPtr pdom = NULL; - if (!(def = virDomainDefNewFull(name, uuid, -1))) + if (!(def = virDomainDefNew())) goto error; + if (VIR_STRDUP(def->name, name) < 0) + goto error; + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = -1; + if (VIR_ALLOC(pdom) < 0) goto error; diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index fc9e1c6..1b9d2e1 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2634,10 +2634,15 @@ xenHypervisorLookupDomainByID(virConnectPtr conn, int id) if (!name) return NULL; - ret = virDomainDefNewFull(name, - XEN_GETDOMAININFO_UUID(dominfo), - id); - VIR_FREE(name); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, XEN_GETDOMAININFO_UUID(dominfo), VIR_UUID_BUFLEN); + ret->id = id; + return ret; } @@ -2699,10 +2704,15 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid) if (!name) return NULL; - ret = virDomainDefNewFull(name, uuid, id); - if (ret) - ret->id = id; - VIR_FREE(name); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, uuid, VIR_UUID_BUFLEN); + ret->id = id; + return ret; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 4dd6b41..2ba5459 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -1111,12 +1111,21 @@ sexpr_to_domain(virConnectPtr conn ATTRIBUTE_UNUSED, const struct sexpr *root) if (sexpr_node(root, "domain/domid")) id = sexpr_int(root, "domain/domid"); - return virDomainDefNewFull(name, uuid, id); + if (!(ret = virDomainDefNew())) + goto error; + + if (VIR_STRDUP(ret->name, name) < 0) + goto error; + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = id; + + return ret; error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse Xend domain information")); - virObjectUnref(ret); + virDomainDevFree(ret); return NULL; } @@ -2003,9 +2012,15 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (name == NULL) return NULL; - ret = virDomainDefNewFull(name, uuid, id); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, uuid, VIR_UUID_BUFLEN); + ret->id = id; - VIR_FREE(name); return ret; } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index ef1a460..ca4577f 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -848,7 +848,17 @@ xenXMDomainLookupByName(virConnectPtr conn, const char *domname) if (!(entry = virHashLookup(priv->configCache, filename))) goto cleanup; - ret = virDomainDefNewFull(domname, entry->def->uuid, -1); + if (!(ret = virDomainDefNew())) + goto cleanup; + + if (VIR_STRDUP(ret->name, domname) < 0) { + virDomainDevFree(ret); + ret = NULL; + goto cleanup; + } + + memcpy(def->uuid, entry->def->uuid, VIR_UUID_BUFLEN); + def->id = -1; cleanup: xenUnifiedUnlock(priv); @@ -891,7 +901,17 @@ xenXMDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (!(entry = virHashSearch(priv->configCache, xenXMDomainSearchForUUID, (const void *)uuid))) goto cleanup; - ret = virDomainDefNewFull(entry->def->name, uuid, -1); + if (!(ret = virDomainDefNew())) + goto cleanup; + + if (VIR_STRDUP(ret->name, entry->def->name) < 0) { + virDomainDevFree(ret); + ret = NULL; + goto cleanup; + } + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = -1; cleanup: xenUnifiedUnlock(priv); -- 2.5.5

3 2

[libvirt] [PATCH] network: restart dnsmasq after adding/removing txt and srv records
by Laine Stump 31 May '16

31 May '16

Although dns host records are stored in a separate configuration file that is reread by dnsmasq when it receives a SIGHUP, the txt and srv records are directly in the dnsmasq .conf file which can't be reread after initial dnsmasq startup. This means that if an srv or txt record is modified in a network config, libvirt needs to restart the dnsmasq process rather than just sending a SIGHUP. This was pointed out in a question in https://bugzilla.redhat.com/show_bug.cgi?id=988718 , but no separate BZ was filed. --- src/network/bridge_driver.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0fd2095..7c8d2cc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3404,9 +3404,14 @@ networkUpdate(virNetworkPtr net, if (section == VIR_NETWORK_SECTION_BRIDGE || section == VIR_NETWORK_SECTION_DOMAIN || section == VIR_NETWORK_SECTION_IP || - section == VIR_NETWORK_SECTION_IP_DHCP_RANGE) { - /* these sections all change things on the dnsmasq commandline, - * so we need to kill and restart dnsmasq. + section == VIR_NETWORK_SECTION_IP_DHCP_RANGE || + section == VIR_NETWORK_SECTION_DNS_TXT || + section == VIR_NETWORK_SECTION_DNS_SRV) { + /* these sections all change things on the dnsmasq + * commandline (i.e. in the .conf file), so we need to + * kill and restart dnsmasq, because dnsmasq sets its uid + * to "nobody" after it starts, and is unable to re-read + * the conf file (owned by root, mode 600) */ if (networkRestartDhcpDaemon(driver, network) < 0) goto cleanup; @@ -3434,12 +3439,10 @@ networkUpdate(virNetworkPtr net, goto cleanup; } - } else if (section == VIR_NETWORK_SECTION_DNS_HOST || - section == VIR_NETWORK_SECTION_DNS_TXT || - section == VIR_NETWORK_SECTION_DNS_SRV) { - /* these sections only change things in config files, so we - * can just update the config files and send SIGHUP to - * dnsmasq. + } else if (section == VIR_NETWORK_SECTION_DNS_HOST) { + /* this section only changes data in an external file + * (not the .conf file) so we can just update the config + * files and send SIGHUP to dnsmasq. */ if (networkRefreshDhcpDaemon(driver, network) < 0) goto cleanup; -- 2.5.5

2 1

[libvirt] [PATCH 0/2] qemu: expand domain memory statistics
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Derbyshev Dmitry (2): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp include/libvirt/libvirt-domain.h | 12 +++++++++++- src/libvirt-domain.c | 5 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++---------- tools/virsh-domain-monitor.c | 4 ++++ 4 files changed, 33 insertions(+), 11 deletions(-) -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH] qemu: expand domain memory statistics with 'last-update' timestamp
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp along with other memory statistics, but this information is not saved into domain statistics. It could be useful to determine if the data reported is fresh or not. Balloon statistics are not reported in hrf, so no modifications are made in qemu_monitor_text.c. --- include/libvirt/libvirt-domain.h | 6 +++++- src/libvirt-domain.c | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++---------- tools/virsh-domain-monitor.c | 2 ++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e1d9a0d..51f9785 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -603,11 +603,15 @@ typedef enum { * is in kB */ VIR_DOMAIN_MEMORY_STAT_RSS = 7, + + /* Timestamp of the last update of statistics */ + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE = 8, + /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 8, + VIR_DOMAIN_MEMORY_STAT_NR = 9, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3e144b6..b1c7d73 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5988,6 +5988,8 @@ virDomainGetInterfaceParameters(virDomainPtr domain, * The total amount of memory available to the domain's OS (in kb). * VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON: * Current balloon value (in kb). + * VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE + * Timestamp of the last statistic * * Returns: The number of stats provided or -1 in case of failure. */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e767414..175ef10 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1602,10 +1602,10 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, * rates and/or whether data has been collected since a previous cycle. * It's currently unused. */ -#define GET_BALLOON_STATS(FIELD, TAG, DIVISOR) \ - if (virJSONValueObjectHasKey(statsdata, FIELD) && \ +#define GET_BALLOON_STATS(OBJECT, FIELD, TAG, DIVISOR) \ + if (virJSONValueObjectHasKey(OBJECT, FIELD) && \ (got < nr_stats)) { \ - if (virJSONValueObjectGetNumberUlong(statsdata, FIELD, &mem) < 0) { \ + if (virJSONValueObjectGetNumberUlong(OBJECT, FIELD, &mem) < 0) { \ VIR_DEBUG("Failed to get '%s' value", FIELD); \ } else { \ /* Not being collected? No point in providing bad data */ \ @@ -1676,19 +1676,20 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } - GET_BALLOON_STATS("stat-swap-in", + GET_BALLOON_STATS(statsdata, "stat-swap-in", VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 1024); - GET_BALLOON_STATS("stat-swap-out", + GET_BALLOON_STATS(statsdata, "stat-swap-out", VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 1024); - GET_BALLOON_STATS("stat-major-faults", + GET_BALLOON_STATS(statsdata, "stat-major-faults", VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 1); - GET_BALLOON_STATS("stat-minor-faults", + GET_BALLOON_STATS(statsdata, "stat-minor-faults", VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 1); - GET_BALLOON_STATS("stat-free-memory", + GET_BALLOON_STATS(statsdata, "stat-free-memory", VIR_DOMAIN_MEMORY_STAT_UNUSED, 1024); - GET_BALLOON_STATS("stat-total-memory", + GET_BALLOON_STATS(statsdata, "stat-total-memory", VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 1024); - + GET_BALLOON_STATS(data, "last-update", + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 1); cleanup: virJSONValueFree(cmd); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0a93949..3893b90 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -373,6 +373,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "actual %llu\n", stats[i].val); if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) vshPrint(ctl, "rss %llu\n", stats[i].val); + if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE) + vshPrint(ctl, "last_update %llu\n", stats[i].val); } ret = true; -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH 0/3] Do not check for domain liveness in virDomainObjSetDefTransient
by Ján Tomko 31 May '16

31 May '16

virDomainObjSetDefTransient has an unintuitive attribute 'live': when set to 'true', it ignores the virDomainObjIsActive test. The most common usage is on domain startup, where most of the callers want to create a transient definition even though the domain is not yet active. The only place where live=false is still required is virDomainObjGetPersistentDef (and its usage could possibly be cleaned up too, since it's only called in the drivers that already do SetDefTransient on domain startup). Split out the virDomainObjIsActive check into virDomainObjGetPersistentDef and remove it for the rest of the callers along with the 'live' attribute. Ján Tomko (3): Clean up redundant usage of virDomainObjSetDefTransient Check if the domain is active in virDomainObjGetPersistentDef Do not check for domain liveness in virDomainObjSetDefTransient src/conf/domain_conf.c | 15 ++++----------- src/conf/domain_conf.h | 3 +-- src/libxl/libxl_domain.c | 3 +-- src/lxc/lxc_process.c | 6 +----- src/qemu/qemu_process.c | 4 ++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 5 ++--- 7 files changed, 12 insertions(+), 26 deletions(-) -- 2.7.3

2 6

[libvirt] [PATCH v5 0/2] qemu: Support for QXL heads
by Martin Kletzander 31 May '16

31 May '16

v5: - Just a rebase, plus v4 had some hunk in that didn't belong there so this one's cleaner to look at - https://www.redhat.com/archives/libvir-list/2016-March/msg01436.html v4: - Added test case without "heads=" - Don't consolidate 'size_t i, j' declarations v3: - rebase on top of current master in order to cleanly apply - https://www.redhat.com/archives/libvir-list/2016-March/msg01198.html v2: - don't change heads when migrating - https://www.redhat.com/archives/libvir-list/2016-March/msg00811.html v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Martin Kletzander (2): qemu: Check for qxl's max_outputs parameter qemu: Add support to QXL's max_outputs parameter src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 4 ++ src/qemu/qemu_command.c | 8 +++ src/qemu/qemu_migration.c | 64 ++++++++++++++++++++-- .../qemuxml2argv-video-qxl-heads.args | 28 ++++++++++ .../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2argv-video-qxl-noheads.args | 24 ++++++++ .../qemuxml2argv-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2argvtest.c | 16 ++++++ .../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2xmlout-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2xmltest.c | 3 + 12 files changed, 319 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml -- 2.8.1

4 6

[libvirt] [PATCH v3 0/2] Add support for zero-write detection
by Martin Kletzander 31 May '16

31 May '16

v3: - I know Peter said he'll review it, but there are conflicts every once in a while, so rebased version will apply cleanly for a while - And it's actually not that big of a change to wait for some bigger things to be designed, I believe =) - https://www.redhat.com/archives/libvir-list/2016-April/msg01926.html v2: - use 'zeroes' instead of 'zeros' - https://www.redhat.com/archives/libvir-list/2016-February/msg01146.html v1: - https://www.redhat.com/archives/libvir-list/2015-December/msg00511.html Martin Kletzander (2): conf: Add support of zero-detection for disks qemu: Add support for zero-detection writes docs/formatdomain.html.in | 10 +++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 21 +++++++++- src/conf/domain_conf.h | 11 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argv-disk-drive-detect-zeroes.args | 27 +++++++++++++ .../qemuxml2argv-disk-drive-detect-zeroes.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-disk-drive-detect-zeroes.xml | 1 + tests/qemuxml2xmltest.c | 1 + 17 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml -- 2.8.1

2 4

[libvirt] [PATCH 0/6] Final round of build fixes
by Michal Privoznik 31 May '16

31 May '16

Hopefully. Michal Privoznik (6): virNetDevBridgeGet: Avoid NULL dereference virDomainFormatSchedDef: Handle case when func returns NULL esxStorageVolGetXMLDesc: Lookup SCSI lun properly qemuMonitorTextGetAllBlockStatsInfo: Fix line validation ppc64Compute: Avoid false positive domain_conf: Avoid false positive src/conf/domain_conf.c | 27 ++++++++++++++++++++++++--- src/cpu/cpu_ppc64.c | 12 +++++++++++- src/esx/esx_storage_backend_iscsi.c | 4 ++-- src/qemu/qemu_monitor_text.c | 2 +- src/util/virnetdevbridge.c | 6 +++++- 5 files changed, 43 insertions(+), 8 deletions(-) -- 2.8.3

2 24

[libvirt] [libvirt-perl][PATCH 0/2] Catch up with latest libvirt
by Michal Privoznik 31 May '16

31 May '16

Two public constants are to be introduced in libvirt. While touching that are of code, update documentation to a constant of the same origin. Michal Privoznik (2): Add PERF_PARAM_MBML and PERF_PARAM_MBMT constants Expand description for PERF_PARAM_CMT constant Changes | 1 + Virt.xs | 2 ++ lib/Sys/Virt/Domain.pm | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) -- 2.8.3

2 4

[libvirt] [PATCH 0/3] docs/website: drop some old bits
by Cole Robinson 31 May '16

31 May '16

Patches to drop the (busted) website search, (busted) static todo list, and not-very-useful ChangeLog-old Cole Robinson (3): docs: website: remove search docs: website: drop the static todo list page docs: drop ChangeLog-old .gitignore | 2 - ChangeLog-old | 16699 ---------------------------------------------- Makefile.am | 1 - TODO | 22 +- docs/404.html.in | 9 +- docs/Makefile.am | 31 +- docs/devhelp/html.xsl | 4 - docs/index.py | 1266 ---- docs/libvirt.css | 24 - docs/page.xsl | 8 - docs/search.php.code.in | 225 - docs/search.php.in | 18 - docs/sitemap.html.in | 2 +- docs/todo.cfg-example | 26 - docs/todo.pl | 125 - 15 files changed, 13 insertions(+), 18449 deletions(-) delete mode 100644 ChangeLog-old delete mode 100755 docs/index.py delete mode 100644 docs/search.php.code.in delete mode 100644 docs/search.php.in delete mode 100644 docs/todo.cfg-example delete mode 100755 docs/todo.pl -- 2.7.4

2 6

[libvirt] [PATCH 0/2] Yet another round of build fixes
by Michal Privoznik 30 May '16

30 May '16

After these regular errors, I still cannot build cleanly: ../../src/conf/domain_conf.c: In function 'virDomainChrPreAlloc': ../../src/conf/domain_conf.c:14109:57: error: potential null pointer dereference [-Werror=null-dereference] return VIR_REALLOC_N(*arrPtr, *cntPtr + 1); ^ ../../src/conf/domain_conf.c: In function 'virDomainChrRemove': ../../src/conf/domain_conf.c:14133:21: error: potential null pointer dereference [-Werror=null-dereference] for (i = 0; i < *cntPtr; i++) { ^~~~~~~ cc1: all warnings being treated as errors These are obviously false positives. I know some developers here are not very fond of fixing those, so my question is - is it worth the effort or will my patches be NACKed straight away? Michal Privoznik (2): apibuild: Substitute only pure number tokens virSocketAddrIsPrivate: Work on 32bits platforms docs/apibuild.py | 2 +- src/util/virsocketaddr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.8.3

2 4

[libvirt] [PATCH] conf: Skip MAC checks when using an auto-generated one during detach-device
by Kothapally Madhu Pavan 30 May '16

30 May '16

When we try to detach a network device without specifying the mac address, random mac address is generated. As the generated mac address will not be available in the running vm, detaching device will fail erroring out "error: operation failed: no device matching mac address xx:xx:xx:xx:xx:xx found". This patch allows to match DetachDeviec xml using PCI address when mac address is not specified. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 116 +++++++++++++++++++++++++++++----------------- src/conf/domain_conf.h | 6 ++ src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_driver.c | 40 ++++++++++++++-- src/qemu/qemu_hotplug.c | 16 ++++-- src/qemu/qemu_hotplug.h | 3 + 7 files changed, 132 insertions(+), 59 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 568c699..f07f178 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13613,14 +13613,20 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) return 0; } -/* virDomainNetFindIdx: search according to mac address and guest side - * PCI address (if specified) +/* virDomainNetFindIdx: + * search according to mac address and guest side PCI address (if specified). + * + * @def: pointer to domain definition + * @net: pointer to network definition that has to be looked up for + * @MACAddrNotSpecified: when detaching a device it takes "true" when mac address is + * not specified in device xml and a random mac is generated which + * cannot be found in the domain def. * * Return: index of match if unique match found * -1 otherwise and an error is logged */ int -virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) +virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net, bool MACAddrNotSpecified) { size_t i; int matchidx = -1; @@ -13628,50 +13634,76 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); - for (i = 0; i < def->nnets; i++) { - if (virMacAddrCmp(&def->nets[i]->mac, &net->mac)) - continue; - - if ((matchidx >= 0) && !PCIAddrSpecified) { - /* there were multiple matches on mac address, and no - * qualifying guest-side PCI address was given, so we must - * fail (NB: a USB address isn't adequate, since it may - * specify only vendor and product ID, and there may be - * multiples of those. - */ - virReportError(VIR_ERR_OPERATION_FAILED, - _("multiple devices matching mac address %s found"), - virMacAddrFormat(&net->mac, mac)); - return -1; - } + /* MAC address is not specified in device xml. So, we need not check for it. + * Here we check for matching PCI address if specified. */ + if (MACAddrNotSpecified) { if (PCIAddrSpecified) { - if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, - &net->info.addr.pci)) { - /* exit early if the pci address was specified and - * it matches, as this guarantees no duplicates. + for (i = 0; i < def->nnets; i++) { + if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, + &net->info.addr.pci)) { + matchidx = i; + break; + } + } + if (matchidx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device found on " + "%.4x:%.2x:%.2x.%.1x"), + net->info.addr.pci.domain, + net->info.addr.pci.bus, + net->info.addr.pci.slot, + net->info.addr.pci.function); + } + } else { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("mac address and pci address not specified in device xml")); + } + } else { + for (i = 0; i < def->nnets; i++) { + if (virMacAddrCmp(&def->nets[i]->mac, &net->mac)) + continue; + + if ((matchidx >= 0) && !PCIAddrSpecified) { + /* there were multiple matches on mac address, and no + * qualifying guest-side PCI address was given, so we must + * fail (NB: a USB address isn't adequate, since it may + * specify only vendor and product ID, and there may be + * multiples of those. */ + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + return -1; + } + if (PCIAddrSpecified) { + if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, + &net->info.addr.pci)) { + /* exit early if the pci address was specified and + * it matches, as this guarantees no duplicates. + */ + matchidx = i; + break; + } + } else { + /* no PCI address given, so there may be multiple matches */ matchidx = i; - break; } - } else { - /* no PCI address given, so there may be multiple matches */ - matchidx = i; } - } - if (matchidx < 0) { - if (PCIAddrSpecified) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("no device matching mac address %s found on " - "%.4x:%.2x:%.2x.%.1x"), - virMacAddrFormat(&net->mac, mac), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, - _("no device matching mac address %s found"), - virMacAddrFormat(&net->mac, mac)); + if (matchidx < 0) { + if (PCIAddrSpecified) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device matching mac address %s found on " + "%.4x:%.2x:%.2x.%.1x"), + virMacAddrFormat(&net->mac, mac), + net->info.addr.pci.domain, + net->info.addr.pci.bus, + net->info.addr.pci.slot, + net->info.addr.pci.function); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + } } } return matchidx; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b1953b3..d3ebcdc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2581,6 +2581,8 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8, /* allow updates in post parse callback that would break ABI otherwise */ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, + /* indicates mac address is generated when not provided in device xml */ + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR = 1 << 10, } virDomainDefParseFlags; typedef enum { @@ -2710,7 +2712,9 @@ int virDomainDiskSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSourcePtr src); -int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); +int virDomainNetFindIdx(virDomainDefPtr def, + virDomainNetDefPtr net, + bool MACAddrNotSpecified); virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); bool virDomainHasNet(virDomainDefPtr def, virDomainNetDefPtr net); int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 95dfc01..1c53c5f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3422,7 +3422,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, libxl_device_nic_init(&nic); - if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; @@ -3521,7 +3521,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 67f14fe..3d1396a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3929,7 +3929,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, switch (dev->type) { case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) goto cleanup; virDomainNetDefFree(vmdef->nets[idx]); @@ -3975,7 +3975,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) goto cleanup; /* this is guaranteed to succeed */ @@ -4759,7 +4759,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, virDomainNetDefPtr detach = NULL; virNetDevVPortProfilePtr vport = NULL; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 10d3e3d..e6c811c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4105,6 +4105,31 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virObjectUnref(cfg); } +static bool qemuIsMacAvailable(const char *xmlStr) +{ + xmlNodePtr cur; + xmlXPathContextPtr ctxt = NULL; + + if (!virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt)) + goto endjob; + + cur = ctxt->node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "mac")) + goto cleanup; + } + cur = cur->next; + } + + endjob: + xmlXPathFreeContext(ctxt); + return false; + + cleanup: + xmlXPathFreeContext(ctxt); + return true; +} static void syncNicRxFilterMacAddr(char *ifname, virNetDevRxFilterPtr guestFilter, @@ -7587,7 +7612,8 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver, static int qemuDomainDetachDeviceLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev, - virDomainPtr dom) + virDomainPtr dom, + unsigned int parse_flags) { virQEMUDriverPtr driver = dom->conn->privateData; int ret = -1; @@ -7603,7 +7629,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, ret = qemuDomainDetachLease(driver, vm, dev->data.lease); break; case VIR_DOMAIN_DEVICE_NET: - ret = qemuDomainDetachNetDevice(driver, vm, dev); + ret = qemuDomainDetachNetDevice(driver, vm, dev, parse_flags); break; case VIR_DOMAIN_DEVICE_HOSTDEV: ret = qemuDomainDetachHostDevice(driver, vm, dev); @@ -7932,6 +7958,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainChrDefPtr chr; virDomainFSDefPtr fs; int idx; + bool skipMac = parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR ? true : false; switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -7946,7 +7973,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, skipMac)) < 0) return -1; /* this is guaranteed to succeed */ @@ -8115,7 +8142,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((pos = virDomainNetFindIdx(vmdef, net)) < 0) + if ((pos = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; virDomainNetDefFree(vmdef->nets[pos]); @@ -8452,6 +8479,9 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; + if (!qemuIsMacAvailable(xml)) + parse_flags |= VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); @@ -8495,7 +8525,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; - if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom)) < 0) + if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom, parse_flags)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6ce0a84..2bf82b4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2163,7 +2163,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, int ret = -1; int changeidx = -1; - if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) + if ((changeidx = virDomainNetFindIdx(vm->def, newdev, false)) < 0) goto cleanup; devslot = &vm->def->nets[changeidx]; @@ -3825,7 +3825,7 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, * function so that mac address / virtualport are reset */ if (detach->parent.type == VIR_DOMAIN_DEVICE_NET) - return qemuDomainDetachNetDevice(driver, vm, &detach->parent); + return qemuDomainDetachNetDevice(driver, vm, &detach->parent, 0); else return qemuDomainDetachThisHostDevice(driver, vm, detach); } @@ -3833,14 +3833,20 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) + virDomainDeviceDefPtr dev, + unsigned int parse_flags) { int detachidx, ret = -1; virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) - goto cleanup; + if (parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR) { + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, true)) < 0) + goto cleanup; + } else { + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) + goto cleanup; + } detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 165d345..f144879 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -82,7 +82,8 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, virDomainDeviceDefPtr dev); int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev); + virDomainDeviceDefPtr dev, + unsigned int parse_flags); int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev);

2 1

[libvirt] [PATCH 0/3] Couple of build fixes
by Michal Privoznik 30 May '16

30 May '16

I've noticed couple of build failures with a bleeding edge gcc. Here are fixes to some of them. Michal Privoznik (3): docs: Teach apibuild to deal with (1U << 31) too Turn 1<<31 into 1U<<31 build: use gnulib's unsetenv bootstrap.conf | 1 + docs/apibuild.py | 3 ++- include/libvirt/libvirt-domain.h | 2 +- src/util/virtypedparam.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) -- 2.8.3

2 7

[libvirt] Entering freeze fro libvirt-1.3.5
by Daniel Veillard 28 May '16

28 May '16

Due to travel etc... I forgot to push RC1 on Thursday and could not yesterday, but I just tagged rc1 in git and am pushing signed tarball and rpms to the usual place now: ftp://libvirt.org/libvirt/ I think I can try to push rc2 on Tuesday or Wednesday, and then I will try to push 1.3.5 on Friday (3rd then), sorry for the delay, please give it a try, thanks Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH rfc 0/1] storage: vzstorage storage pool
by Olga Krishtal 28 May '16

28 May '16

In-Reply-To: This is first draft, that supports vzstorage in storage pools.i Virtuozzo Storage is a fault-tolerant distributed storage system, optimized for virtualization workloads. Vzstorage pool supports the same volume formats as directory, nfs, etc. In terms of volume management - there is no difference between these pools. You can find more information here: https://openvz.org/Virtuozzo_Storage XML: <pool type='vz'> <name>vz7_pool</name> <uuid>b27a72b5-a92e-4e58-a172-a80ba73b30fe</uuid> <capacity unit='bytes'>0</capacity> <allocation unit='bytes'>0</allocation> <available unit='bytes'>0</available> <source> <host name='127.0.0.2'/> <device path='vz7-vzstorage'/> <dir path='/pool1'/> </source> <target> <path>/vz7-vzstorage</path> </target> </pool> To compile libvirt with vz pool support use key --with-storage-vz I need some help to resolve some problems: - how to detect that pool is alredy mounted. - when we show pool sources do we need to show folders that may reside on vzstorage - I am not quite sure that we need host name in xml. I will be glad to here your opinion.

2 3

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Pulls in several portability fixes, including the fact that gnulib now only works on platforms with two's complement signed integers. Also makes for a smaller delta on the next update (we are waiting on a license change to unsetenv for the sake of mingw). * .gnulib: Update to latest. * bootstrap: Resync from upstream. * tests/virstringtest.c: Drop use of obsolete probes of integer properties. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'd like to get this in now, before RC1 is cut, so that we maximize the testing of the bulk of the gnulib changes (rather than waiting for the unsetenv change needed for mingw to land, but forcing the gnulib update to only get testing in RC2). * .gnulib 6cc32c6...8d807a9 (127): > gendocs.sh: Set default TOP_NODE_UP_URL in HTML output. > manywarnings: update for GCC 6.1 > autoupdate > intdiv0, memmem, nocrash, strcasestr, strstr: no exit > glob: size_t overflow checks > glob: don't assume INT_MAX < SIZE_MAX > Fix undefined behaviour in gettext.h. > autoupdate > git-version-gen: avoid undefined shift > update from texinfo > glob: merge glibc changes into lib/glob.c > mktime: spelling fix in comment > mktime: port to stricter signed overflow checking > mktime: speed up DEBUG_MKTIME benchmarks > mktime: resurrect DEBUG_MKTIME testing > mktime: simplify DEBUG_MKTIME > Port mktime_internal offset to unsigned time_t > xstrtol: prohibit monstrosities like "1bB" > xstrtod: reinstate setting of *result upon ERANGE > xstrtod: modify *result only if no errors > btowc: document problems in C locale > autoupdate > update from texinfo > mktime: improve integer overflow checking > intprops: check two's complement assumption > intprops, mktime, strtol: assume two's complement > stdint: port to strict C11 left shift > mbrtowc: work around glibc bug#19932 > update from texinfo > autoupdate > stdint: detect good enough pre-C++11 stdint.h in C++ mode > argp: merge changes from glibc > Prefer American spelling for "initialize" > autoupdate > stddef: support configuring with g++ > autoupdate > autoupdate > update from texinfo > test-framework-sh: minor cleanups > test-framework-sh: revert port to NetBSD 7.0 > autoupdate > Port better to Alpine Linux > test-framework-sh: port to NetBSD 7.0 > update from texinfo > gitlog-to-changelog: suppress ignored chatter > update from texinfo > update from texinfo > setlocale: add "sv" to Windows language table > update from texinfo > sys_select: port to new Cygwin > test-userspec.c: do not trigger gcc's new -Wmisleading-indentation > time_rz: port to clang -Wunused-const-variable > std-gnu11: improve clang support > select: port more to Intel 2016.1.150 compiler > select: try to port to 2016.1.150 compiler > localename-tests: memory allocation fixes > intprops: make .h file license match module > acl: fix missing return on Cygwin > update from texinfo > update from texinfo > extern-inline: port to PGI CC > update from texinfo > update from texinfo > signbit: port back to pre-C++11 GCC > mountlist: recognize autofs-mounted remote file systems, too > signbit: port to C++ with GCC 6 > regex: make it closer to libc > regex: merge patches from libc > update from texinfo > update from texinfo > autoupdate > autoupdate > stdalign: port to older HP and IBM cc > stdalign: port to clang 3.7.0 > update from texinfo > readdir_r: now obsolescent > Use modern texinfo when syncing install.texi output from autoconf > update from texinfo > sync install.texi from autoconf > misc: port better to gcc -fsanitize=address > update from texinfo > autoupdate > verify-tests: also remove stray test-verify.Tpo > std-gnu11: new module > update from texinfo > update from texinfo > get-permissions, strftime: fix grammar in comments > gettext: mark as obsolete > gnulib-tool: don't give up on ln -s so easily > closedir: fix OS/2-related typos > openat_proc_name: fix that last '/' is overwritten on OS/2 kLIBC > regex: treat [x] as x if x is a unibyte encoding error > closedir, dirfd, opendir: port to OpenSolaris 5.10 > bootstrap: use American spelling > @item needed inside @itemize > hash-pjw-bare: fix comment > wcwidth: Replace also on OpenBSD 5.8 > update from texinfo > gnu-web-doc-update: fix addition of new files > utimens-tests: avoid pulling gettext .m4 files > regex: pacify static checkers > regex: fix [ diagnostic > regex: fix memory leaks > fts: don't unconditionally use leaf optimization for NFS > * gnulib-tool: fix stray debug line in previous patch > gnulib-tool: don't assume ln -s works > utimes: detect utimes() correctly on OS/2 kLIBC > openat_proc_name: port to OS/2 kLIBC > stdint: check _INTPTR_T_DECLARED for intptr_t etc. > doc: mention unfixed issues with unsupported localtime() values > Go back to gettext-0.19.7 > opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC > dup, dup2, fcntl: support a directory fd on OS/2 kLIBC > pipe_filter_ii_execute: port to OS/2 kLIBC > wchar: fix "conflicting types" error for __wcwidth on OS/2 kLIBC > w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC > pipe-filter-aux: undefine HAVE_SELECT on KLIBC > binary-io: don't put fd in binary mode if it is a console on EMX > doc: mention setlocale() issues on OpenBSD > sig2str: list all signals on FreeBSD >= 7 > acl-permissions: port to USE_ACL==0 platforms > mktime: rename macro to avoid glibc clash > Port "$@" to OpenIndiana ksh93 > autoupdate > Port Universal Time settings to strict POSIX > update from texinfo > update from texinfo .gnulib | 2 +- bootstrap | 6 +++--- tests/virstringtest.c | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gnulib b/.gnulib index 6cc32c6..8d807a9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 +Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 diff --git a/bootstrap b/bootstrap index 294c0bc..f060bab 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2014-12-08.12; # UTC +scriptversion=2016-01-24.06; # UTC # Bootstrap this package from checked-out sources. @@ -42,7 +42,7 @@ export LC_ALL local_gl_dir=gl -# Honour $PERL, but work even if there is none +# Honor $PERL, but work even if there is none. PERL="${PERL-perl}" me=$0 @@ -1021,6 +1021,6 @@ echo "$0: done. Now you can run './configure'." # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 7a1dcfd..63b8009 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2016 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 @@ -23,7 +23,6 @@ #include <stdlib.h> #include "testutils.h" -#include "intprops.h" #include "verify.h" #include "virerror.h" #include "viralloc.h" @@ -409,13 +408,11 @@ struct stringToLongData { /* This test makes assumptions about our compilation platform that are * not guaranteed by POSIX. Good luck to you if you are crazy enough - * to try and port libvirt to a platform with 16-bit int. */ + * to try and port libvirt to a platform with 16-bit int. Gnulib + * already assumes that signed integers are two's complement. */ verify(sizeof(int) == 4); -verify(TYPE_TWOS_COMPLEMENT(int)); verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); -verify(TYPE_TWOS_COMPLEMENT(long)); verify(sizeof(long long) == 8); -verify(TYPE_TWOS_COMPLEMENT(long long)); static int testStringToLong(const void *opaque) -- 2.5.5

7 12

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Fix a regression in checking for realpath (which caused link failures regarding duplicate rpl_canonicalize_file_name), and fix the mingw build regarding unsetenv. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Fixes the reported failure with canonicalize_file_name, but there's still the issue of new gcc warnings enabled which affect F24 with its newer gcc. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) * .gnulib 8d807a9...246b3b2 (3): > canonicalize: Fix broken probe for realpath. > unsetenv: relax to LGPLv2+ > update from texinfo diff --git a/.gnulib b/.gnulib index 8d807a9..246b3b2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 +Subproject commit 246b3b28808ee5f4664be674dce573af9497fc7a -- 2.5.5

1 0

[libvirt] inconsistency in attribute usage between hv drivers
by Laine Stump 27 May '16

27 May '16

I just came across this problem while looking for the proper place to put <ip> info for the host side of <interface type='ethernet'>. I don't think there's really anything that can be done about it now, since everything below has been in place for so long, but maybe it can serve as a cautionary tale. Prologue: A week or two ago, I made patches to support <interface type='ethernet'> in the LXC driver. I did this not because I have a need for that, but because it seemed like the perfect avenue for investigating the best way to add IP address and route config to <interface>, as it is one environment where we have a need *and* the ability to setup IP info for both the host and guest sides of the interface. I accomplished this by simply generalizing the existing <interface type='bridge'> code to not attach the host-side veth device to a bridge. This makes all common attributes between type='ethernet' and type='bridge' consistent, including the configuration of guest-side and host-side device names, and here we come to the first inconsistency - the device name for the veth/tap on the host side is in the <target> element (which I've always been told is supposed to be used for device-specific info about how the device will be presented on the *guest* side, but I suppose this is because <interface type='direct'> uses <source dev='blah'> to provide the name of the physical device that the macvtap device (named in <target dev='macvblah'/> is attached to). And I guess because the dev attribute was already in-use in <target> the much more recently added guest-side name is given in the <guest> subelement (in LXC at least): <interface type='ethernet'> <target dev='hostblah'/> <-- name of veth on host side <guest dev='guestblah'/> <-- name of veth on guest side ... Now, this "is what it is". There is no changing it. In particular, the use of <target dev> for the host-side device name has been in use for so long and is so deeply ingrained that it's just part of the scenery. Moving for a minute to the IP address/route info for the guest side is already configured in the toplevel <ip> and <route> subelements of <interface>, <interface type='ethernet'> <ip address='1.2.3.4' .../> </interface> My first thought was to put the <ip> for the host side inside <source>: <interface type='ethernet'> <source> <ip address='1.2.3.5' .../> <-- host side </source> <ip address='1.2.3.4' .../> <-- guest side </interface> That makes sense to me because it parallels what we do with PCI addresses for hostdev - the PCI address in <source> tells what the address is on the host, and the one at the toplevel of <hostdev> tells what the PCI address will be in the guest. It *doesn't* fit well with the fact that the device we're setting up is named in <target> though, so we're already inconsistent, but putting the host-side IP config in <target> seems like an invitation to mix things up even more in the future, since <target> is used everywhere else as a place to put stuff related to what the device looks like in the guest (although... for <interface>, <target> *is* currently used only for the host-side tap/veth device name; so maybe we just can define the purpose of <target> differently in this one case... But I digress). So I went to the code to add parsing of <ip> inside <source>, and found that the type-specific data for ethernet has a dev, and that field in the object is set during parsing from <source dev='blah'/>, *and* that the openvz driver uses that dev name as the name of the network device in the *guest*! (even though my understanding of <source> is that it is supposed to be used for information about the *host* side of any device. Sigh.) So on openvz, we have this: <interface type='ethernet'> <target dev='hostblah'/> <-- name of interface on host side <source dev='guestblah'/> <-- name of interface on guest side ... which seems exactly the opposite of what it should be. Note that this doesn't seem to be documented anywhere except in the few lines in openvz_driver.c that implement it. (Note that, prior to commit 9a4b705f7 back in 2010, which added support for type='ethernet' in openvz, the "dev" field was already in the ethernet-specific sub-object of virDomainNetDef, but it was only used to hold the name of the bridge that a tap device was attached to when converting from a qemu commandline to XML (also, as previously stated, for type='direct' it is used to name the physical device on the host that the macvtap interface is connected to, i.e. *exactly* the opposite end of the chain). It looks like the poster of the openvz patch just saw an opportune existing-but-unused-by-type=ethernet attribute and took advantage, and it wasn't noticed in review). I'm actually skeptical that anyone even uses this, since openvz is a less-used driver, type='ethernet' is less used among interface types, and even after that it's valid to not provide a name, in which case one is automatically generated. But there is no way to verify that, so we're stuck with it. It is true that the LXC version of type='ethernet' was added only a few days ago, and there hasn't yet been a release, so I *could* modify it to be consistent with the attribute usage in the openvz driver. But that would make <interface type='ethernet'> in LXC inconsistent with <interface type='bridge'> in LXC, which is a much worse situation. IT seems there is nothing to change. As I said above "it is what it is". So why am I writing this message? Partly to just vent frustration (aka "whine") I suppose :-). Also partly as public testimony that my seemingly excessive worrying over attribute naming and placement is justified, and not just OCD. Also, as I said above, as a cautionary tale that any patch adding *any* XML config knob, or making use of an existing XML config knob needs extra scrutiny to help minimize such messes in the future.

1 0

[libvirt] [PATCH] unsetenv: relax to LGPLv2+
by Eric Blake 27 May '16

27 May '16

Especially since setenv is also LGPLv2+, and it makes sense for the two modules to stay in sync. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Libvirt wants LGPLv2+ when it uses gnulib, and recently ran into a problem where it can use the setenv module for mingw but not the unsetenv module. Barring any negative reviews, I'll push this in 24 hours, or sooner if I get a positive review; then libvirt will have to pick up the latest gnulib to make use of it. modules/unsetenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/unsetenv b/modules/unsetenv index 015ac4e..909cec9 100644 --- a/modules/unsetenv +++ b/modules/unsetenv @@ -24,7 +24,7 @@ Include: <stdlib.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.5.5

1 1

[libvirt] [PATCH] lxc: Fix virLXCDomainObjBeginJob position in lxcDomainSetMemoryParameters
by Katerina Koukiou 27 May '16

27 May '16

Adjust the code to perform the virLXCDomainObjBeginJob first and then the call virDomainLiveConfigHelperMethod. As Ján Tomko pointed out, in virDomainLiveConfigHelperMethod, there is a check to see if the domain is active when AFFECT_LIVE is set. Since virLXCDomainObjBeginJob unlocks the virDomainObjPtr lock, the domain could possibly be destroyed while we wait for the job and the check results would no longer be valid. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3aadd64..f883ffb 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -841,14 +841,16 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, cfg = virLXCDriverGetConfig(driver); if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0 || - !(caps = virLXCDriverGetCapabilities(driver, false)) || - virDomainLiveConfigHelperMethod(caps, driver->xmlopt, - vm, &flags, &vmdef) < 0) + !(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, + vm, &flags, &vmdef) < 0) + goto endjob; + if (flags & VIR_DOMAIN_AFFECT_LIVE && !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_MEMORY)) { virReportError(VIR_ERR_OPERATION_INVALID, -- 2.7.4

2 1

[libvirt] New account at Wiki
by Artur Zochniak 26 May '16

26 May '16

Hello! Can I have an account for wiki? I ask here because I am following http://wiki.libvirt.org/page/Main_Page#libvirt_Wiki preferred username: arjamizo Thanks! BR Artur

1 0

[libvirt] [PATCHv2] Added hook for network modification event
by Khramov Anton 26 May '16

26 May '16

From: Anton Khramov <anton(a)endocode.com> Anton Khramov (1): network: Added hook for network modification event docs/hooks.html.in | 2 ++ src/network/bridge_driver.c | 5 +++++ src/util/virhook.c | 3 ++- src/util/virhook.h | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) -- 1.9.1

2 2

[libvirt] [PATCH v2] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- Changes made since v1: * Also patch esxVI_EnsureSession * Added cleanup to esxVI_Context_Connect to make sure escapedPassword is freed where appropiate. Also move the code block that escapes the password to happen earlier in the function body so that it can bail earlier in the event of failure and skip the rest of the processing. * Updated virReportError calls to pass syntax-check src/esx/esx_driver.c | 22 ++++--------------- src/esx/esx_vi.c | 62 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 6520196..5fb2279 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,39 +996,52 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + int result = -1; + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_CURL_Alloc(&ctx->curl) < 0 || esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || VIR_STRDUP(ctx->url, url) < 0 || VIR_STRDUP(ctx->ipAddress, ipAddress) < 0 || VIR_STRDUP(ctx->username, username) < 0 || VIR_STRDUP(ctx->password, password) < 0) { - return -1; + goto cleanup; } if (VIR_ALLOC(ctx->sessionLock) < 0) - return -1; + goto cleanup; + if (virMutexInit(ctx->sessionLock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize session mutex")); - return -1; + goto cleanup; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) - return -1; + goto cleanup; if (STRNEQ(ctx->service->about->apiType, "HostAgent") && STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->apiVersion, @@ -1036,14 +1049,14 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Minimum supported %s version is %s but found version '%s'"), "VI API", "2.5", ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->version, @@ -1051,7 +1064,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); - return -1; + goto cleanup; } if (STREQ(ctx->service->about->productLineId, "gsx")) { @@ -1060,7 +1073,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), "2.0", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_GSX; @@ -1071,7 +1084,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), "3.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_ESX; @@ -1081,7 +1094,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), "2.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_VPX; @@ -1090,7 +1103,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); - return -1; + goto cleanup; } if (ctx->productLine == esxVI_ProductLine_ESX) { @@ -1107,12 +1120,19 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { - return -1; + goto cleanup; } - return 0; + result = 0; + + cleanup: + VIR_FREE(escapedPassword); + + return result; } int @@ -2062,6 +2082,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) esxVI_ObjectContent *sessionManager = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_UserSession *currentSession = NULL; + char *escapedPassword = NULL; if (!ctx->sessionLock) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no mutex")); @@ -2075,6 +2096,14 @@ esxVI_EnsureSession(esxVI_Context *ctx) goto cleanup; } + escapedPassword = esxUtil_EscapeForXml(ctx->password); + + if (!escapedPassword) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_String_AppendValueToList(&propertyNameList, "currentSession") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, @@ -2101,7 +2130,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (!currentSession) { esxVI_UserSession_Free(&ctx->session); - if (esxVI_Login(ctx, ctx->username, ctx->password, NULL, + if (esxVI_Login(ctx, ctx->username, escapedPassword, NULL, &ctx->session) < 0) { goto cleanup; } @@ -2117,6 +2146,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) cleanup: virMutexUnlock(ctx->sessionLock); + VIR_FREE(escapedPassword); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(&currentSession); -- 2.7.4

2 1

[libvirt] [PATCH] testutils.c: unsetenv() iff platform has it
by Michal Privoznik 26 May '16

26 May '16

I've encountered the following problem (introduced by 6326865e): ../../tests/testutils.c: In function 'virtTestRun': ../../tests/testutils.c:289:5: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("VIR_TEST_MOCK_TESTNAME"); Apparently, mingw does not have unsetenv(). Therefore we should call it iff we are sure platform we are building for has it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is a tentative patch. Ideally, we would use gnulib's implementation (like we do for setenv()), but there are some licensing problems right now [1]. If they are resolved before our release, we can just pick new gnulib. If, however, they are not, we can just push this patch. 1: https://www.redhat.com/archives/libvir-list/2016-May/msg01952.html tests/testutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index f4fbad2..8b7bf70 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -286,7 +286,9 @@ virtTestRun(const char *title, } #endif /* TEST_OOM */ +#ifdef HAVE_UNSETENV unsetenv("VIR_TEST_MOCK_TESTNAME"); +#endif return ret; } -- 2.8.3

2 2

[libvirt] [PATCH] qemu: Fix error message when PCI bridge has index <= bus
by Andrea Bolognani 26 May '16

26 May '16

Commit ff2126225df0 changed the error message to be more detailed about the failure at hand; however, while the new error message claims that "bus must be <= index", the error message is displayed if "idx <= addr->bus", ie. when bus is bigger than or *equal to* index. Change the error message to report the correct constraint, and format it in a way that mirrors the check exactly to make it clearer to people reading the code. The new error message reads "must be index > bus". --- I'm assuming the code, which is pre-existing, is correct here. CC'ing Laine for insights. src/qemu/qemu_domain_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7bd8ee5..650cb2a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1598,14 +1598,14 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, break; } - /* check if every PCI bridge controller's ID is greater than + /* check if every PCI bridge controller's index is greater than * the bus it is placed onto */ if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && idx <= addr->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("PCI controller at index %d (0x%02x) has " - "bus='0x%02x', but bus must be <= index"), + "bus='0x%02x'; must be index > bus"), idx, idx, addr->bus); goto cleanup; } -- 2.5.5

2 2

[libvirt] inconsistent handling of "qemu64" CPU model
by Chris Friesen 26 May '16

26 May '16

Hi, I'm not sure where the problem lies, hence the CC to both lists. Please copy me on the reply. I'm playing with OpenStack's devstack environment on an Ubuntu 14.04 host with a Celeron 2961Y CPU. (libvirt detects it as a Nehalem with a bunch of extra features.) Qemu gives version 2.2.0 (Debian 1:2.2+dfsg-5expubuntu9.7~cloud2). If I don't specify a virtual CPU model, it appears to give me a "qemu64" CPU, and /proc/cpuinfo in the guest instance looks something like this: processor 0 vendor_id GenuineIntel cpu family 6 model 6 model name: QEMU Virtual CPU version 2.2.0 stepping: 3 microcode: 0x1 flags: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm rep_good nopl pni vmx cx16 x2apic popcnt hypervisor lahf_lm abm vnmi ept However, if I explicitly specify a custom CPU model of "qemu64" the instance refuses to boot and I get a log saying: libvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svmlibvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svm When this happens, some of the XML for the domain looks like this: <os> <type arch='x86_64' machine='pc-i440fx-utopic'>hvm</type> .... <cpu mode='custom' match='exact'> <model fallback='allow'>qemu64</model> <topology sockets='1' cores='1' threads='1'/> </cpu> Of course "svm" is an AMD flag and I'm running an Intel CPU. But why does it work when I just rely on the default virtual CPU? Is kvm_default_unset_features handled differently when it's implicit vs explicit? If I explicitly specify a custom CPU model of "kvm64" then it boots, but of course I get a different virtual CPU from what I get if I don't specify anything. Following some old suggestions I tried turning off nested kvm, deleting /var/cache/libvirt/qemu/capabilities/*, and restarting libvirtd. Didn't help. So...anyone got any ideas what's going on? Is there no way to explicitly specify the model that you get by default? Thanks, Chris

3 3

[libvirt] [PATCH 0/8] lxc: add job support
by Katerina Koukiou 26 May '16

26 May '16

This patch series adds job support to the lxc driver, using techiques from the libxl driver. One benefit is no longer blocking get operations during long running modify operations. E.g. with these patches 'vish dominfo dom' will work while 'virsh save dom ...' is in progress. The first patch adds the job support machinery, followed by several patches that make use of it. Although this might look not needed that much right now, it is preparing environment for future work. This patch series has been reviewed by Michal Privoznik who is my mentor for GSoC 2016. Katerina Koukiou (8): lxc: Add job support to lxc driver lxc: use job functions in lxcDomain{CreateXMLWithFiles, CreateWithFiles} lxc: use job functions in lxcDomainSetMemoryFlags lxc: use job functions in lxcDomain{Suspend, Resume} lxc: use job functions in lxcDomain{AttachDeviceFlags, DetachDeviceFlags, UpdateDeviceFlags} lxc: add job functions in lxcDomainSetAutostart lxc: use job functions in lxcDomain* functions that do query operations. lxc: use job functions in lxcDomain* functions that perform modify actions. src/lxc/lxc_domain.c | 154 ++++++++++++++++++++-- src/lxc/lxc_domain.h | 37 ++++++ src/lxc/lxc_driver.c | 351 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 428 insertions(+), 114 deletions(-) -- 2.7.4

4 12

[libvirt] [PATCH] daemon: cleanup state drivers in order reverse to init order
by Nikolay Shirokovskiy 26 May '16

26 May '16

This patch aims to fix observed crash on daemon shutdown. Main thread is in the process of state drivers cleanup, network driver is cleaned up and qemu driver is not yet. Meanwhile eof event from qemu process triggers qemuProcessStop -> networkReleaseActualDevice and crash happens as network driver is already cleaned up. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 114e88c..d79fe75 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -800,12 +800,12 @@ virStateInitialize(bool privileged, int virStateCleanup(void) { - size_t i; + int r; int ret = 0; - for (i = 0; i < virStateDriverTabCount; i++) { - if (virStateDriverTab[i]->stateCleanup && - virStateDriverTab[i]->stateCleanup() < 0) + for (r = virStateDriverTabCount - 1; r >= 0; r--) { + if (virStateDriverTab[r]->stateCleanup && + virStateDriverTab[r]->stateCleanup() < 0) ret = -1; } return ret; -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] esx: improve virtualHW > 7 handling.
by Dawid Zamirski 26 May '16

26 May '16

Hello, The following patches are for issues found when using libvirt to create/manage VMs on ESXi hosts (5.5 and 6). The first patch addresses a fairly common issue with creating VMs on ESXi with SCSI controllers. The other two are to less common but work around known ESX issues e.g. 4TB drive size limit and vMotion compatibility. Dawid Zamirski (3): esx: add pciBridge devices when SCSI is used esx: Add VMCI device for virtualHW >= 7 esx: use newer virtualHW version for 5.1+ hosts src/esx/esx_vi.c | 17 ++++++++++++++ src/vmx/vmx.c | 27 ++++++++++++++++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 14 +++++++++++ .../xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 + tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 14 +++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 14 +++++++++++ 7 files changed, 88 insertions(+) -- 2.7.4

2 6

[libvirt] Question on output of virsh capabilities
by Eli Qiao 26 May '16

26 May '16

hi I am confused by the libvirt's "virsh capabilities" help said: DESCRIPTION Returns capabilities of hypervisor/driver. I got follow outtput of a host. <cpu> <arch>x86_64</arch> <model>Broadwell-noTSX</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> <feature name='invtsc'/> <feature name='mpx'/> <feature name='abm'/> <feature name='pdpe1gb'/> <feature name='rdrand'/> <feature name='f16c'/> <feature name='osxsave'/> <feature name='pdcm'/> <feature name='xtpr'/> <feature name='tm2'/> <feature name='est'/> <feature name='vmx'/> <feature name='ds_cpl'/> <feature name='monitor'/> <feature name='dtes64'/> <feature name='pbe'/> <feature name='tm'/> <feature name='ht'/> <feature name='ss'/> <feature name='acpi'/> <feature name='ds'/> <feature name='vme'/> <pages unit='KiB' size='4'/> <pages unit='KiB' size='2048'/> <pages unit='KiB' size='1048576'/> </cpu> but from cat /proc/cpuinfo flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp The output of virsh seems missed some of the cpu features so my question what doesn't the features of "virsh capibalities" mean? why not pass all cpu flags? I see there is a cpu_map.xml in libvirt source, what does it used for? I have requirements to get all the hypervisors feature, what should I do? Thanks. -- Best Regards, Eli Qiao (乔立勇) Intel OTC China

2 1

[libvirt] [PATCH 00/19] Drop virt prefix from tests
by Tomáš Ryšavý 26 May '16

26 May '16

Replacig virt prefix with vir prefix in tests. It was suggested on wikipage: http://wiki.libvirt.org/page/BiteSizedTasks#Rename_test_suite_routines_from… Tomáš Ryšavý (19): tests: Rename virtTestRun to virTestRun. tests: Rename virtTestDifference to virTestDifference. tests: Rename virtTestLoadFile to virTestLoadFile. tests: Rename virtTestCompareToFile to virTestCompareToFile. tests: Rename virtTestDifferenceFull to virTestDifferenceFull. tests: Rename virtTestClearCommandPath to virTestClearCommandPath. tests: Rename virtTest00MActive to virTest00MActive. tests: Rename virtTestCounterReset to virTestCounterReset. tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset. tests: Rename virtTestUseTerminalColors to virTestUseTerminalColors. tests: Rename virtTestQuiesceLibvirtErrors to virTestQuiesceLibvirtErrors. tests: Rename virtTestDifferenceFullNoRegenerate. tests: Rename virtTestDifferenceFullInternal to virTestDifferenceFullInternal. tests: Rename virtTestCaptureProgramExecChild to virTestCaptureProgramExecChild. tests: Rename virtTestDifferenceBin to virTestDifferenceBin. tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput. tests: Rename virtTestCounterNext to virTestCounterNext. tests: Rename virtTestErrorFuncQuiet to virTestErrorFuncQuiet. tests: Rename virtTestMain to virTestMain. tests/bhyvexml2argvtest.c | 8 ++--- tests/bhyvexml2xmltest.c | 2 +- tests/commandtest.c | 18 +++++----- tests/cputest.c | 8 ++--- tests/domaincapstest.c | 6 ++-- tests/domainconftest.c | 2 +- tests/domainsnapshotxml2xmltest.c | 8 ++--- tests/esxutilstest.c | 10 +++--- tests/eventtest.c | 2 +- tests/fchosttest.c | 10 +++--- tests/fdstreamtest.c | 8 ++--- tests/genericxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 6 ++-- tests/jsontest.c | 8 ++--- tests/libvirtdconftest.c | 2 +- tests/lxcconf2xmltest.c | 6 ++-- tests/lxcxml2xmltest.c | 2 +- tests/metadatatest.c | 10 +++--- tests/networkxml2conftest.c | 6 ++-- tests/networkxml2firewalltest.c | 6 ++-- tests/networkxml2xmltest.c | 4 +-- tests/networkxml2xmlupdatetest.c | 6 ++-- tests/nodedevxml2xmltest.c | 6 ++-- tests/nodeinfotest.c | 8 ++--- tests/nsstest.c | 2 +- tests/nwfilterebiptablestest.c | 42 +++++++++++----------- tests/nwfilterxml2firewalltest.c | 6 ++-- tests/nwfilterxml2xmltest.c | 4 +-- tests/objecteventtest.c | 18 +++++----- tests/openvzutilstest.c | 6 ++-- tests/qemuagenttest.c | 2 +- tests/qemuargv2xmltest.c | 10 +++--- tests/qemucapabilitiestest.c | 6 ++-- tests/qemucaps2xmltest.c | 6 ++-- tests/qemucommandutiltest.c | 4 +-- tests/qemuhelptest.c | 6 ++-- tests/qemuhotplugtest.c | 10 +++--- tests/qemumonitorjsontest.c | 14 ++++---- tests/qemumonitortest.c | 6 ++-- tests/qemuxml2argvtest.c | 64 ++++++++++++++++----------------- tests/qemuxml2xmltest.c | 14 ++++---- tests/scsihosttest.c | 4 +-- tests/secretxml2xmltest.c | 4 +-- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 26 +++++++------- tests/sexpr2xmltest.c | 6 ++-- tests/sockettest.c | 66 +++++++++++++++++----------------- tests/storagebackendsheepdogtest.c | 4 +-- tests/storagepoolxml2xmltest.c | 4 +-- tests/storagevolxml2argvtest.c | 4 +-- tests/storagevolxml2xmltest.c | 4 +-- tests/sysinfotest.c | 4 +-- tests/testutils.c | 74 +++++++++++++++++++------------------- tests/testutils.h | 68 +++++++++++++++++------------------ tests/utiltest.c | 6 ++-- tests/vboxsnapshotxmltest.c | 10 +++--- tests/viralloctest.c | 14 ++++---- tests/viratomictest.c | 4 +-- tests/virauthconfigtest.c | 16 ++++----- tests/virbitmaptest.c | 26 +++++++------- tests/virbuftest.c | 16 ++++----- tests/vircaps2xmltest.c | 4 +-- tests/vircapstest.c | 8 ++--- tests/vircgrouptest.c | 36 +++++++++---------- tests/vircryptotest.c | 4 +-- tests/virdbustest.c | 20 +++++------ tests/virdrivermoduletest.c | 8 ++--- tests/virendiantest.c | 4 +-- tests/virfiletest.c | 6 ++-- tests/virfirewalltest.c | 36 +++++++++---------- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viridentitytest.c | 12 +++---- tests/viriscsitest.c | 6 ++-- tests/virkeycodetest.c | 4 +-- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 6 ++-- tests/virlockspacetest.c | 14 ++++---- tests/virlogtest.c | 2 +- tests/virnetdaemontest.c | 4 +-- tests/virnetdevbandwidthtest.c | 4 +-- tests/virnetdevtest.c | 2 +- tests/virnetmessagetest.c | 16 ++++----- tests/virnetserverclienttest.c | 2 +- tests/virnetsockettest.c | 32 ++++++++--------- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 58 +++++++++++++++--------------- tests/virpcitest.c | 6 ++-- tests/virpolkittest.c | 12 +++---- tests/virportallocatortest.c | 8 ++--- tests/virrandomtest.c | 2 +- tests/virrotatingfiletest.c | 26 +++++++------- tests/virscsitest.c | 4 +-- tests/virshtest.c | 38 ++++++++++---------- tests/virstoragetest.c | 12 +++---- tests/virstringtest.c | 62 ++++++++++++++++---------------- tests/virsystemdtest.c | 52 +++++++++++++-------------- tests/virtimetest.c | 52 +++++++++++++-------------- tests/virtypedparamtest.c | 8 ++--- tests/viruritest.c | 24 ++++++------- tests/virusbtest.c | 14 ++++---- tests/vmwarevertest.c | 4 +-- tests/vmx2xmltest.c | 6 ++-- tests/xencapstest.c | 24 ++++++------- tests/xlconfigtest.c | 10 +++--- tests/xmconfigtest.c | 10 +++--- tests/xml2sexprtest.c | 4 +-- tests/xml2vmxtest.c | 4 +-- 108 files changed, 707 insertions(+), 707 deletions(-) -- 2.5.5

2 21

[libvirt] [PATCH] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- src/esx/esx_driver.c | 22 ++++------------------ src/esx/esx_vi.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bf6f228..872cb7d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,6 +996,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -1107,7 +1109,16 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to escape password for XML")); + return -1; + } + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { return -1; } -- 2.7.4

3 3

[libvirt] [PATCH] lxc: support <interface type='ethernet'>
by Laine Stump 25 May '16

25 May '16

This is identical to type='bridge', but without the "connect to a bridge" part, so it can be handled by using the same functions (and often even the same cases in switch statements), after renaming virLXCProcessSetupInterfaceBridged() to virLXCProcessInterfaceTap() and enhancing it to skip bridge-related items when brname == NULL. To be truly useful, we need to support setting the ip address on the host side veth as well as guest side veth (already supported for type='bridge'), as well as setting the peer address for both. The <script> element isn't supported in this patch because I have no need for it. I'd rather add it after determining it's needed rather than adding it for no reason and than being required to support it forever. --- I wrote this mostly so that I could experiment with setting the peer addresses of both sides of the veth pair to see what was usable and what we needed to support in terms of setting IP addresses. I had intended to post this patch along with patches to re-enable the peer address setting patches that I reverted just before 1.3.4 was released, but decided that having lxc <interface type='ethernet'> already in might help in any discussion we had about that (since it gives everyone a working example where libvirt has control of both the host-side and guest-side interface config. This will of course be much more useful once the IP addresses can be set from within libvirt, but all code that is here will remain and, as I said above, it provides a useful platform for experimentation. src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 16 ++++--- src/lxc/lxc_native.c | 15 +++---- src/lxc/lxc_process.c | 36 +++++++-------- src/lxc/lxc_process.h | 6 +-- tests/lxcconf2xmldata/lxcconf2xml-ethernet.config | 44 ++++++++++++++++++ tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml | 54 +++++++++++++++++++++++ tests/lxcconf2xmltest.c | 1 + tests/lxcxml2xmldata/lxc-ethernet.xml | 42 ++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 10 files changed, 181 insertions(+), 38 deletions(-) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml create mode 100644 tests/lxcxml2xmldata/lxc-ethernet.xml diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0304354..25f28ea 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_controller.c: linux container process controller @@ -371,6 +371,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) switch (ctrl->def->nets[i]->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (ctrl->def->nets[i]->ifname == NULL) continue; if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, @@ -386,7 +387,6 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) break; case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a226850..f811053 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -4225,15 +4225,15 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(vm->def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, brname))) goto cleanup; } break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: { - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - vm->def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, vm->def, net))) goto cleanup; } break; default: @@ -4270,6 +4270,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); break; @@ -4695,6 +4696,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevVethDelete(detach->ifname) < 0) { virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 31ffce7..0bea32e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -360,14 +360,13 @@ lxcCreateNetDef(const char *type, net->mac = macAddr; if (STREQ(type, "veth")) { - if (!linkdev) - goto error; - - net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - - if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) - goto error; - + if (linkdev) { + net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) + goto error; + } else { + net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + } } else if (STREQ(type, "macvlan")) { net->type = VIR_DOMAIN_NET_TYPE_DIRECT; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 8981d9a..f8a0c32 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -256,9 +256,9 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, } -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname) +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname) { char *ret = NULL; char *parentVeth; @@ -277,13 +277,15 @@ char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, if (virNetDevSetMAC(containerVeth, &net->mac) < 0) goto cleanup; - if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, - vm->uuid, vport, virDomainNetGetActualVlan(net)) < 0) - goto cleanup; - } else { - if (virNetDevBridgeAddPort(brname, parentVeth) < 0) - goto cleanup; + if (brname) { + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, vm->uuid, + vport, virDomainNetGetActualVlan(net)) < 0) + goto cleanup; + } else { + if (virNetDevBridgeAddPort(brname, parentVeth) < 0) + goto cleanup; + } } if (virNetDevSetOnline(parentVeth, true) < 0) @@ -546,20 +548,18 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, brname))) goto cleanup; } break; - + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, def, net))) goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index b6c8083..fcb50a8 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -47,9 +47,9 @@ void virLXCProcessAutostartAll(virLXCDriverPtr driver); int virLXCProcessReconnectAll(virLXCDriverPtr driver, virDomainObjListPtr doms); -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname); +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname); char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config new file mode 100644 index 0000000..d39917d --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config @@ -0,0 +1,44 @@ +# Template used to create this container: opensuse +# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef + +lxc.network.type = veth +lxc.network.flags = up +lxc.network.hwaddr = 02:00:15:8f:05:c1 +lxc.network.name = eth0 +lxc.network.ipv4 = 192.168.122.2/24 +lxc.network.ipv4.gateway = 192.168.122.1 +lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 + +#remove next line if host DNS configuration should not be available to container +lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 +lxc.mount.entry = sysfs sys sysfs defaults 0 0 +lxc.mount.entry = tmpfs run tmpfs size=8m,mode=0755,nodev,nosuid 0 0 +lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind,ro 0 0 +lxc.rootfs = /var/lib/lxc/migrate_test/rootfs +lxc.utsname = migrate_test +lxc.arch = x86 +lxc.autodev=1 +lxc.tty = 2 +lxc.pts = 1024 +lxc.cap.drop = sys_module mac_admin mac_override mknod + +# When using LXC with apparmor, uncomment the next line to run unconfined: +#lxc.aa_profile = unconfined + +lxc.cgroup.devices.deny = a +# /dev/null and zero +lxc.cgroup.devices.allow = c 1:3 rwm +lxc.cgroup.devices.allow = c 1:5 rwm +# consoles +lxc.cgroup.devices.allow = c 5:1 rwm +lxc.cgroup.devices.allow = c 5:0 rwm +lxc.cgroup.devices.allow = c 4:0 rwm +lxc.cgroup.devices.allow = c 4:1 rwm +# /dev/{,u}random +lxc.cgroup.devices.allow = c 1:9 rwm +lxc.cgroup.devices.allow = c 1:8 rwm +lxc.cgroup.devices.allow = c 136:* rwm +lxc.cgroup.devices.allow = c 5:2 rwm +# rtc +lxc.cgroup.devices.allow = c 254:0 rwm diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml new file mode 100644 index 0000000..24b017a --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml @@ -0,0 +1,54 @@ +<domain type='lxc'> + <name>migrate_test</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>65536</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>exe</type> + <init>/sbin/init</init> + </os> + <features> + <capabilities policy='allow'> + <mac_admin state='off'/> + <mac_override state='off'/> + <mknod state='off'/> + <sys_module state='off'/> + </capabilities> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/var/lib/lxc/migrate_test/rootfs'/> + <target dir='/'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='8192' units='KiB'/> + <target dir='/run'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/etc/resolv.conf'/> + <target dir='/etc/resolv.conf'/> + <readonly/> + </filesystem> + <interface type='ethernet'> + <mac address='02:00:15:8f:05:c1'/> + <ip address='192.168.122.2' family='ipv4' prefix='24'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> + <guest dev='eth0'/> + <link state='up'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + <console type='pty'> + <target type='lxc' port='1'/> + </console> + </devices> +</domain> diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 83895cd..7a0893e 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -119,6 +119,7 @@ mymain(void) DO_TEST("cputune", false); DO_TEST("cpusettune", false); DO_TEST("blkiotune", false); + DO_TEST("ethernet", false); virObjectUnref(xmlopt); virObjectUnref(caps); diff --git a/tests/lxcxml2xmldata/lxc-ethernet.xml b/tests/lxcxml2xmldata/lxc-ethernet.xml new file mode 100644 index 0000000..6c4a739 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-ethernet.xml @@ -0,0 +1,42 @@ +<domain type='lxc'> + <name>8675309</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <idmap> + <uid start='0' target='100000' count='100000'/> + <gid start='0' target='100000' count='100000'/> + </idmap> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/8675309'/> + <target dir='/'/> + </filesystem> + <interface type='ethernet'> + <mac address='00:16:3e:0f:ef:8a'/> + <ip address='192.168.122.12' family='ipv4' prefix='24'/> + <ip address='192.168.122.13' family='ipv4' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> + <target dev='veth0'/> + <guest dev='eth2'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index fec0142..001aa8d 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -94,6 +94,7 @@ mymain(void) DO_TEST("idmap"); DO_TEST("capabilities"); DO_TEST("sharenet"); + DO_TEST("ethernet"); DO_TEST_FULL("filesystem-root", 0, false, VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); -- 2.5.5

4 15

[libvirt] [PATCH v2 0/3] auto-assign controller indexes
by Laine Stump 25 May '16

25 May '16

Patches 1 and 2 just shuffle a couple of existing functions. Patch 3 gets to the point. v1->v2 changes are explained in patch 3. Laine Stump (3): conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 128 ++++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 7 - src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_hotplug.c | 8 ++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 53 +++++++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml | 54 ++++++++ tests/qemuxml2argvtest.c | 9 ++ .../qemuxml2xmlout-autoindex.xml | 153 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 10 +- 13 files changed, 421 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml -- 2.5.5

2 5

[libvirt] [PATCH 0/2] Add virFirmware object for use by driver config
by Jim Fehlig 25 May '16

25 May '16

While refreshing and testing my series to add domain capabilities and UEFI support to the libxl driver [1], I realized it would be useful to support the '--with-loader-nvram' configure option as well. This would allow users/packagers to specify system-provided firmwares instead of those provided by the Xen installation. Instead of copying code from the qemu driver, I decided to create a virFirmware object containing the firmware name (loader) and associated nvram, along with a few operations on the object. Patch1 introduces the object in src/util/virfirmware.[ch] and switches the qemu driver to use. The patch could be split along those lines, but I thought it would be review-friendly to see the movement of code in a single patch. But it can be split if preferred. Patch2 adds virFirmware to the libxl driver config. It is unused in this series, but if this approach is aggreable it will be used when rebasing the domain capabilities series. Note that currently Xen does not support storage for non-volitile variables for UEFI firmware (OVMF), so 'nvram' will be unused for the time being. Adding a 'nvram' option to libxl.conf can be deferred until support is added to Xen. But even with this limitation, folks are using UEFI + HVM guests with xl/libxl and would like to do the same with libvirt. Patch1 is a lot of code movement to avoid copying virQEMUDriverConfigLoaderNVRAMParse (and eventually virQEMUDriverConfigNVRAMParse). But I've complained about copy/paste in some of my recent reviews and shouldn't be doing the same in my own patches :-). [1] https://www.redhat.com/archives/libvir-list/2016-April/msg01358.html Jim Fehlig (2): driver config: Introduce virFirmware object libxl: add default firmwares to driver config object po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 ++ src/libxl/libxl_conf.c | 21 +++++++ src/libxl/libxl_conf.h | 4 ++ src/qemu/qemu_capabilities.c | 22 +++---- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_conf.c | 127 ++++++---------------------------------- src/qemu/qemu_conf.h | 7 +-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/util/virfirmware.c | 135 +++++++++++++++++++++++++++++++++++++++++++ src/util/virfirmware.h | 51 ++++++++++++++++ tests/domaincapstest.c | 3 +- 14 files changed, 260 insertions(+), 131 deletions(-) create mode 100644 src/util/virfirmware.c create mode 100644 src/util/virfirmware.h -- 2.1.4

2 9

Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses
by Jim Fehlig 25 May '16

25 May '16

On 05/22/2016 09:34 PM, Chun Yan Liu wrote: > >>>> On 5/17/2016 at 11:46 PM, in message > <2fa0cb6f-ea83-d6f3-18f8-51a671574205(a)laine.org>, Laine Stump <laine(a)laine.org> > wrote: >> On 05/16/2016 06:05 PM, Jim Fehlig wrote: >>> Chun Yan Liu wrote: >>>>>>> On 5/14/2016 at 07:47 AM, in message <5736677D.8030209(a)suse.com>, Jim Fehlig >>>> <jfehlig(a)suse.com> wrote: >>>>> On 05/13/2016 12:21 AM, Chunyan Liu wrote: >>>>>> 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; >>>>>> +} >>>>> >>>>> It's unfortunate this is a copy-paste from the qemu driver. The code is not >>>>> trivial and any bug fixes in one copy could be missed in the other. A lot >> of >>>>> the >>>>> function is domain related, so probably can't be abstracted further to the >>>>> network code. Have you considered approaches that allow the drivers to >> share >>>>> this code? >>>> Well, it can be extracted and placed in bridge_driver.c as >> networkGetDHCPInterfaces, >>>> but I don't know if that is acceptable? >>> Hmm, maybe something like networkGetDHCPLeasesAll() is a better name. >> Regardless >>> of the name, I see that other functions in bridge_driver.c take a >>> virDomainDefPtr, so maybe extracting the code to bridge_driver.c is >> acceptable. >> >> Well, I don't really *like* the way that those network*() functions are >> implemented (just by exporting a symbol, implying that any hypervisor >> driver that uses them must directly link the bridge driver in, rather >> than being able to load an alternative), but that was the most expedient >> way of handling the need at the time, and nobody complained about it, >> so... :-) >> >> Definitely duplication of code is bad (I say that although I do it a lot >> myself!). And if a function is all about "doing something with a network >> device / connection" and it will need access to the network object, I >> think the network driver is the place to have it. *AND* if it's >> something that's not needed directly in the public API, then making it >> available as a public API call is a bad idea (since you're then stuck >> with it forever). >> >> However, I don't know that I like the idea of a function in the network >> driver that is trawling through the virDomainDef object. It may seem >> like a fine distinction - returning the lease info for a single >> interface vs. returning the lease info for all interfaces in the domain, >> but it does take the co-mingling between the network and hypervisor >> drivers to a new level. Yes, it's true that there are already functions >> that are part of this "backend super double secret network API" (watch >> Animal House and you'll understand the reference) that take a >> virDomainDefPtr as an argument; but they only use it to format the >> domain XML and send it to the network hook script. Technically there's >> nothing preventing a function in the network driver from accessing every >> attribute of the domain, or even modifying it :-O, that doesn't mean we >> should do it though. >> >> I'm trying to completely recall a vague memory of something similar to >> this that happened in the past - something that was needed in multiple >> hypervisors (which would imply that it should live either in util or >> conf), but that also needed to call a network function (or maybe some >> other driver, I forget). When trying to maintain some sort of separation >> and rules of engagement between the various components, there tend to be >> cases that just don't fit within the mold. >> >> In this case, I'm wondering if maybe the duplication can be reduced by >> creating a function in conf (either domain_conf.c or one of its >> subsidiaries) that takes a *function as an argument and calls that >> function for each interface. Something like this: >> >> int >> virDomainGetDHCPInterfaces(virDomainDefPtr def, >> virDomainDefGetDHCPLeasesCB getLeases, >> virDomainInterfacePtr **ifaces) >> { >> >> for (i = 0; i < def->nnets; i++) { >> virDomainNetDefPtr net = def->nets[i]; >> >> if (virDomainNetDefGetActualType(net) != >> VIR_DOMAIN_NET_TYPE_NETWORK) >> continue; >> if ((n_leases = getLeases(net->data.network.name, net->mac, >> &leases)) < 0) { >> OH NOES!!!!! >> goto error; >> if (n_leases) { >> bobloblawlawblog.com .... >> } >> >> etc etc. >> } >> >> various cleanup stuff etc. >> >> } >> >> The function getLeases would be a thin (if any) wrapper around a >> function in the network driver called networkGetDHCPLeases(). The >> toplevel function in qemu and libxl would then be simple a bit of glue >> followed by a call to virDomainGetDHCPInterfaces() with a pointer to the >> appropriate getLeases function. >> >> This way we would eliminate almost all of the duplicate code (most would >> go into domain_conf.c, and a bit into bridge_driver.c) without needing >> to teach the network driver about the internal workings of a domain def. >> >> Does that make any sense? > Had a look at this and tried, seems hard to put into domain_conf.c: > except for the vm->def->nets, almost all the other things are called > from src/libvirt-domain.c or src/libvirt-network.c, not only the > getLeases cb of a specific network, but even the virDomainInterfacePtr > itself is defined in libvirt-domain.h and also its Free function (in case of > error, virNetworkDHCPLeaseFree and virDomainInterfaceFree are also > needed). Ideas? Hrm, maybe just go with the small amount of copied code? :-) When originally looking at the patch, I thought it might be quite disruptive to factor it out into something that could be used by both drivers. Unless others have a clever idea, I'm leaning towards pushing this patch as is. Regards, Jim

2 2

[libvirt] [PATCHv2 0/3] qemu: support for SLIC ACPI tables
by Ján Tomko 25 May '16

25 May '16

Windows uses this BLOB for activation purposes. https://bugzilla.redhat.com/show_bug.cgi?id=1327537 In v2: * make <table> a subelement of <acpi> * minor documentation fixes * comma-escape the value on QEMU command line * mention that this option was added in 2009 Ján Tomko (3): conf: add <acpi><table> to <os> qemu: format SLIC ACPI table command line security: label the slic_table docs/formatdomain.html.in | 8 ++++ docs/schemas/domaincommon.rng | 18 +++++++++ src/conf/domain_conf.c | 46 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++ 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 | 30 ++++++++++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-acpi-table.xml | 34 ++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 13 files changed, 182 insertions(+) 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

2 8

[libvirt] [PATCH] esx: use lsilogic adapter type in vol create.
by Dawid Zamirski 25 May '16

25 May '16

ESX will refuse to attach VMDKS that have buslogic adatper type to 64bit VMs whereas lsilogic works fine both 32bit and 64bit VMs. --- src/esx/esx_storage_backend_vmfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index d03d33a..a1a660b 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -966,9 +966,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, /* * FIXME: The adapter type is a required parameter, but there is no * way to let the user specify it in the volume XML config. Therefore, - * default to 'busLogic' here. + * default to 'lsilogic' here. */ - virtualDiskSpec->adapterType = (char *)"busLogic"; + virtualDiskSpec->adapterType = (char *)"lsilogic"; virtualDiskSpec->capacityKb->value = VIR_DIV_UP(def->target.capacity, 1024); /* Scale from byte to kilobyte */ -- 2.7.4

2 1

[libvirt] [PATCH v2] qemucapstest: replace caps-1.6.50 with updated caps-1.7.0
by Pavel Hrdina 25 May '16

25 May '16

The qemu-1.6.50 is a beta before the new minor version, let's replace it with the release qemu-1.7.0. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml | 78 - tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 78 + tests/domaincapstest.c | 2 +- .../caps_1.6.50.x86_64.replies | 2848 ----------------- tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 197 -- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 3195 ++++++++++++++++++++ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 200 ++ tests/qemucapabilitiestest.c | 2 +- 8 files changed, 3475 insertions(+), 3125 deletions(-) delete mode 100644 tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml diff --git a/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml b/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml deleted file mode 100644 index 161d0ab..0000000 --- a/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml +++ /dev/null @@ -1,78 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-i440fx-1.7</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <os supported='yes'> - <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - </loader> - </os> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>kvm</value> - <value>vfio</value> - </enum> - </hostdev> - </devices> - <features> - <gic supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml new file mode 100644 index 0000000..161d0ab --- /dev/null +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -0,0 +1,78 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>kvm</domain> + <machine>pc-i440fx-1.7</machine> + <arch>x86_64</arch> + <vcpu max='255'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>qxl</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 3436197..670f4fb 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -286,7 +286,7 @@ mymain(void) #if WITH_QEMU - DO_TEST_QEMU("1.6.50", "caps_1.6.50", + DO_TEST_QEMU("1.7.0", "caps_1.7.0", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies deleted file mode 100644 index d23249c..0000000 --- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies +++ /dev/null @@ -1,2848 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 50, - "minor": 6, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 50, - "minor": 6, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "query-rx-filter" - }, - { - "name": "chardev-remove" - }, - { - "name": "chardev-add" - }, - { - "name": "query-tpm-types" - }, - { - "name": "query-tpm-models" - }, - { - "name": "query-tpm" - }, - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "nbd-server-stop" - }, - { - "name": "nbd-server-add" - }, - { - "name": "nbd-server-start" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-command-line-options" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "drive-mirror" - }, - { - "name": "blockdev-snapshot-delete-internal-sync" - }, - { - "name": "blockdev-snapshot-internal-sync" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-complete" - }, - { - "name": "block-job-resume" - }, - { - "name": "block-job-pause" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "drive-backup" - }, - { - "name": "block-commit" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-set-global-dirty-log" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "ringbuf-read" - }, - { - "name": "ringbuf-write" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu-add" - }, - { - "name": "cpu" - }, - { - "name": "send-key" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "return": { - "fd": 10, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - -{ - "id": "libvirt-6", - "error": { - "class": "GenericError", - "desc": "Parameter 'top' is missing" - } -} - -{ - "return": [ - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "virtio-blk-device" - }, - { - "name": "ib700" - }, - { - "name": "ICH9 LPC" - }, - { - "name": "port92" - }, - { - "name": "i6300esb" - }, - { - "name": "kvm-pci-assign" - }, - { - "name": "virtio-scsi-device" - }, - { - "name": "apic" - }, - { - "name": "pc-testdev" - }, - { - "name": "fusbh200-ehci-usb" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "usb-ehci" - }, - { - "name": "exynos4210-ehci-usb" - }, - { - "name": "xlnx,ps7-usb" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "ich9-usb-ehci2" - }, - { - "name": "ich9-ahci" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "isa-ide" - }, - { - "name": "ICH9 SMB" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "sb16" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "hpet" - }, - { - "name": "vmmouse" - }, - { - "name": "i82801b11-bridge" - }, - { - "name": "nvme" - }, - { - "name": "lsi53c810" - }, - { - "name": "vmxnet3" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "vmware-svga" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "fw_cfg" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "usb-audio" - }, - { - "name": "virtio-9p-device" - }, - { - "name": "i82557c" - }, - { - "name": "i82557b" - }, - { - "name": "i82557a" - }, - { - "name": "IndustryPack" - }, - { - "name": "qxl" - }, - { - "name": "pvscsi" - }, - { - "name": "rtl8139" - }, - { - "name": "isa-applesmc" - }, - { - "name": "xen-platform" - }, - { - "name": "container" - }, - { - "name": "virtio-mmio" - }, - { - "name": "vfio-pci" - }, - { - "name": "cfi.pflash01" - }, - { - "name": "usb-kbd" - }, - { - "name": "ich9-usb-uhci5" - }, - { - "name": "isa-vga" - }, - { - "name": "pci-testdev" - }, - { - "name": "usb-tablet" - }, - { - "name": "vmport" - }, - { - "name": "virtio-rng-pci" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "xen-pci-passthrough" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "ich9-usb-uhci6" - }, - { - "name": "ipoctal232" - }, - { - "name": "mch" - }, - { - "name": "mc146818rtc" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "pci-serial-4x" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "virtio-balloon-device" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "virtconsole" - }, - { - "name": "ich9-usb-uhci4" - }, - { - "name": "isa-parallel" - }, - { - "name": "pci-serial" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "PCI" - }, - { - "name": "adlib" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "usb-bot" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "isa-serial" - }, - { - "name": "PCIE" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "System" - }, - { - "name": "kvm-apic" - }, - { - "name": "ich9-intel-hda" - }, - { - "name": "virtio-net-device" - }, - { - "name": "q35-pcihost" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "xen-apic" - }, - { - "name": "scsi-cd" - }, - { - "name": "pci-ohci" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "virtserialport" - }, - { - "name": "pci-serial-2x" - }, - { - "name": "icc-bridge" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "rng-random" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "vhost-scsi" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "pvpanic" - }, - { - "name": "virtio-serial-device" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "vhost-scsi-pci" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "tegra2-ehci-usb" - }, - { - "name": "usb-net" - }, - { - "name": "virtio-mmio-bus" - }, - { - "name": "usb-hub" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "cs4231a" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "isa-i8259" - }, - { - "name": "sga" - }, - { - "name": "isa-debug-exit" - }, - { - "name": "virtio-rng-device" - }, - { - "name": "qemu-console" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "PIIX3" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "rng-egd" - }, - { - "name": "cirrus-vga" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "xen-pvdevice" - }, - { - "name": "icc-bus" - }, - { - "name": "ide-drive" - }, - { - "name": "x3130-upstream" - }, - { - "name": "virtio-pci-bus" - }, - { - "name": "qxl-vga" - }, - { - "name": "usb-uas" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559c" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "usb-storage" - }, - { - "name": "isa-pit" - }, - { - "name": "tpci200" - }, - { - "name": "gus" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "x-data-plane", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "mq", - "type": "on/off" - }, - { - "name": "ctrl_guest_offloads", - "type": "on/off" - }, - { - "name": "ctrl_mac_addr", - "type": "on/off" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "any_layout", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - } - ], - "id": "libvirt-11" -} - -{ - "id": "libvirt-12", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" - } -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "configfd", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "share_intx", - "type": "on/off" - }, - { - "name": "prefer_msi", - "type": "on/off" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "x-vga", - "type": "on/off" - }, - { - "name": "x-intx-mmap-timeout-ms", - "type": "uint32" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-22" -} - -{ - "id": "libvirt-23", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-host' not found" - } -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "pci-hole64-size", - "type": "size" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "pci-hole64-size", - "type": "size" - }, - { - "name": "MCFG", - "type": "uint64" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-28" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-29" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "mmio", - "type": "on/off" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-30" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-31" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-32" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-33" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-36" -} - -{ - "id": "libvirt-37", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "return": [ - ], - "id": "libvirt-38" -} - -{ - "return": [ - { - "name": "msi", - "type": "on/off" - }, - { - "name": "msix", - "type": "on/off" - }, - { - "name": "intrs", - "type": "uint32" - }, - { - "name": "slots", - "type": "uint32" - }, - { - "name": "2", - "type": "uint32" - }, - { - "name": "p3", - "type": "uint32" - } - ] -} - -{ - "return": [ - { - "name": "xenpv", - "cpu-max": 1 - }, - { - "name": "pc-q35-1.4", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.5", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.6", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.7", - "cpu-max": 255, - "alias": "q35" - }, - { - "name": "xenfv", - "cpu-max": 128 - }, - { - "name": "isapc", - "cpu-max": 1 - }, - { - "name": "pc-0.10", - "cpu-max": 255 - }, - { - "name": "pc-0.11", - "cpu-max": 255 - }, - { - "name": "pc-0.12", - "cpu-max": 255 - }, - { - "name": "pc-0.13", - "cpu-max": 255 - }, - { - "name": "pc-0.14", - "cpu-max": 255 - }, - { - "name": "pc-0.15", - "cpu-max": 255 - }, - { - "name": "pc-1.0", - "cpu-max": 255 - }, - { - "name": "pc-1.1", - "cpu-max": 255 - }, - { - "name": "pc-1.2", - "cpu-max": 255 - }, - { - "name": "pc-1.3", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.4", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.5", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.6", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.7", - "is-default": true, - "cpu-max": 255, - "alias": "pc" - }, - { - "name": "none", - "cpu-max": 1 - } - ], - "id": "libvirt-39" -} - -{ - "return": [ - { - "name": "Opteron_G5" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Haswell" - }, - { - "name": "SandyBridge" - }, - { - "name": "Westmere" - }, - { - "name": "Nehalem" - }, - { - "name": "Penryn" - }, - { - "name": "Conroe" - }, - { - "name": "n270" - }, - { - "name": "athlon" - }, - { - "name": "pentium3" - }, - { - "name": "pentium2" - }, - { - "name": "pentium" - }, - { - "name": "486" - }, - { - "name": "coreduo" - }, - { - "name": "kvm32" - }, - { - "name": "qemu32" - }, - { - "name": "kvm64" - }, - { - "name": "core2duo" - }, - { - "name": "phenom" - }, - { - "name": "qemu64" - } - ], - "id": "libvirt-40" -} - -{ - "return": { - "enabled": false, - "present": true - }, - "id": "libvirt-41" -} - -{ - "return": [ - ], - "id": "libvirt-42" -} - -{ - "return": [ - ], - "id": "libvirt-43" -} - -{ - "return": [ - { - "parameters": [ - ], - "option": "smbios" - }, - { - "parameters": [ - { - "name": "seamless-migration", - "type": "boolean" - }, - { - "name": "playback-compression", - "type": "boolean" - }, - { - "name": "agent-mouse", - "type": "boolean" - }, - { - "name": "streaming-video", - "type": "string" - }, - { - "name": "zlib-glz-wan-compression", - "type": "string" - }, - { - "name": "jpeg-wan-compression", - "type": "string" - }, - { - "name": "image-compression", - "type": "string" - }, - { - "name": "plaintext-channel", - "type": "string" - }, - { - "name": "tls-channel", - "type": "string" - }, - { - "name": "tls-ciphers", - "type": "string" - }, - { - "name": "x509-dh-key-file", - "type": "string" - }, - { - "name": "x509-cacert-file", - "type": "string" - }, - { - "name": "x509-cert-file", - "type": "string" - }, - { - "name": "x509-key-password", - "type": "string" - }, - { - "name": "x509-key-file", - "type": "string" - }, - { - "name": "x509-dir", - "type": "string" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "disable-agent-file-xfer", - "type": "boolean" - }, - { - "name": "disable-copy-paste", - "type": "boolean" - }, - { - "name": "disable-ticketing", - "type": "boolean" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "addr", - "type": "string" - }, - { - "name": "tls-port", - "type": "number" - }, - { - "name": "port", - "type": "number" - } - ], - "option": "spice" - }, - { - "parameters": [ - ], - "option": "acpi" - }, - { - "parameters": [ - { - "name": "sock_fd", - "type": "number" - }, - { - "name": "socket", - "type": "string" - }, - { - "name": "readonly", - "type": "boolean" - }, - { - "name": "writeout", - "type": "string" - }, - { - "name": "security_model", - "type": "string" - }, - { - "name": "mount_tag", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "fsdriver", - "type": "string" - } - ], - "option": "virtfs" - }, - { - "parameters": [ - { - "name": "sock_fd", - "type": "number" - }, - { - "name": "socket", - "type": "string" - }, - { - "name": "readonly", - "type": "boolean" - }, - { - "name": "writeout", - "type": "string" - }, - { - "name": "security_model", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "fsdriver", - "type": "string" - } - ], - "option": "fsdev" - }, - { - "parameters": [ - { - "name": "timestamp", - "type": "boolean" - } - ], - "option": "msg" - }, - { - "parameters": [ - { - "name": "mlock", - "type": "boolean" - } - ], - "option": "realtime" - }, - { - "parameters": [ - ], - "option": "tpmdev" - }, - { - "parameters": [ - ], - "option": "object" - }, - { - "parameters": [ - { - "name": "opaque", - "help": "free-form string used to describe fd", - "type": "string" - }, - { - "name": "set", - "help": "ID of the fd set to add fd to", - "type": "number" - }, - { - "name": "fd", - "help": "file descriptor of which a duplicate is added to fd set", - "type": "number" - } - ], - "option": "add-fd" - }, - { - "parameters": [ - { - "name": "enable", - "type": "boolean" - } - ], - "option": "sandbox" - }, - { - "parameters": [ - { - "name": "strict", - "type": "string" - }, - { - "name": "reboot-timeout", - "type": "string" - }, - { - "name": "splash-time", - "type": "string" - }, - { - "name": "splash", - "type": "string" - }, - { - "name": "menu", - "type": "boolean" - }, - { - "name": "once", - "type": "string" - }, - { - "name": "order", - "type": "string" - } - ], - "option": "boot-opts" - }, - { - "parameters": [ - { - "name": "maxcpus", - "type": "number" - }, - { - "name": "threads", - "type": "number" - }, - { - "name": "cores", - "type": "number" - }, - { - "name": "sockets", - "type": "number" - }, - { - "name": "cpus", - "type": "number" - } - ], - "option": "smp-opts" - }, - { - "parameters": [ - { - "name": "usb", - "help": "Set on/off to enable/disable usb", - "type": "boolean" - }, - { - "name": "mem-merge", - "help": "enable/disable memory merge support", - "type": "boolean" - }, - { - "name": "dump-guest-core", - "help": "Include guest memory in a core dump", - "type": "boolean" - }, - { - "name": "dt_compatible", - "help": "Overrides the \"compatible\" property of the dt root node", - "type": "string" - }, - { - "name": "phandle_start", - "help": "The first phandle ID we may generate dynamically", - "type": "number" - }, - { - "name": "dumpdtb", - "help": "Dump current dtb to a file and quit", - "type": "string" - }, - { - "name": "dtb", - "help": "Linux kernel device tree file", - "type": "string" - }, - { - "name": "append", - "help": "Linux kernel command line", - "type": "string" - }, - { - "name": "initrd", - "help": "Linux initial ramdisk file", - "type": "string" - }, - { - "name": "kernel", - "help": "Linux kernel image file", - "type": "string" - }, - { - "name": "kvm_shadow_mem", - "help": "KVM shadow MMU size", - "type": "size" - }, - { - "name": "kernel_irqchip", - "help": "use KVM in-kernel irqchip", - "type": "boolean" - }, - { - "name": "accel", - "help": "accelerator list", - "type": "string" - }, - { - "name": "type", - "help": "emulated machine", - "type": "string" - } - ], - "option": "machine" - }, - { - "parameters": [ - { - "name": "romfile", - "type": "string" - }, - { - "name": "bootindex", - "type": "number" - } - ], - "option": "option-rom" - }, - { - "parameters": [ - { - "name": "file", - "type": "string" - }, - { - "name": "events", - "type": "string" - } - ], - "option": "trace" - }, - { - "parameters": [ - { - "name": "pretty", - "type": "boolean" - }, - { - "name": "default", - "type": "boolean" - }, - { - "name": "chardev", - "type": "string" - }, - { - "name": "mode", - "type": "string" - } - ], - "option": "mon" - }, - { - "parameters": [ - { - "name": "value", - "type": "string" - }, - { - "name": "property", - "type": "string" - }, - { - "name": "driver", - "type": "string" - } - ], - "option": "global" - }, - { - "parameters": [ - { - "name": "driftfix", - "type": "string" - }, - { - "name": "clock", - "type": "string" - }, - { - "name": "base", - "type": "string" - } - ], - "option": "rtc" - }, - { - "parameters": [ - ], - "option": "net" - }, - { - "parameters": [ - ], - "option": "netdev" - }, - { - "parameters": [ - ], - "option": "numa" - }, - { - "parameters": [ - ], - "option": "device" - }, - { - "parameters": [ - { - "name": "chardev", - "type": "string" - }, - { - "name": "size", - "type": "size" - }, - { - "name": "debug", - "type": "number" - }, - { - "name": "name", - "type": "string" - }, - { - "name": "signal", - "type": "boolean" - }, - { - "name": "mux", - "type": "boolean" - }, - { - "name": "rows", - "type": "number" - }, - { - "name": "cols", - "type": "number" - }, - { - "name": "height", - "type": "number" - }, - { - "name": "width", - "type": "number" - }, - { - "name": "telnet", - "type": "boolean" - }, - { - "name": "delay", - "type": "boolean" - }, - { - "name": "server", - "type": "boolean" - }, - { - "name": "wait", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "to", - "type": "number" - }, - { - "name": "localport", - "type": "string" - }, - { - "name": "localaddr", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "host", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "backend", - "type": "string" - } - ], - "option": "chardev" - }, - { - "parameters": [ - ], - "option": "drive" - } - ], - "id": "libvirt-44" -} - -{ - "return": [ - { - "capability": "xbzrle", - "state": false - }, - { - "capability": "x-rdma-pin-all", - "state": false - }, - { - "capability": "auto-converge", - "state": false - }, - { - "capability": "zero-blocks", - "state": false - } - ], - "id": "libvirt-45" -} diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml deleted file mode 100644 index 296f769..0000000 --- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml +++ /dev/null @@ -1,197 +0,0 @@ -<qemuCaps> - <qemuctime>0</qemuctime> - <selfctime>0</selfctime> - <selfvers>0</selfvers> - <usedQMP/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='chardev'/> - <flag name='enable-kvm'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='smp-topology'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> - <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='pci-configfd'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> - <flag name='vga-qxl'/> - <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> - <flag name='hda-duplex'/> - <flag name='drive-aio'/> - <flag name='pci-multibus'/> - <flag name='pci-bootindex'/> - <flag name='ccid-emulated'/> - <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> - <flag name='virtio-tx-alg'/> - <flag name='device-qxl-vga'/> - <flag name='pci-multifunction'/> - <flag name='virtio-blk-pci.ioeventfd'/> - <flag name='sga'/> - <flag name='virtio-blk-pci.event_idx'/> - <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> - <flag name='piix3-usb-uhci'/> - <flag name='piix4-usb-uhci'/> - <flag name='usb-ehci'/> - <flag name='ich9-usb-ehci1'/> - <flag name='vt82c686b-usb-uhci'/> - <flag name='pci-ohci'/> - <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> - <flag name='ich9-ahci'/> - <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> - <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> - <flag name='scsi-disk.channel'/> - <flag name='scsi-block'/> - <flag name='transaction'/> - <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> - <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> - <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> - <flag name='lsi'/> - <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> - <flag name='seccomp-sandbox'/> - <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> - <flag name='block-commit'/> - <flag name='vnc'/> - <flag name='drive-mirror'/> - <flag name='blockdev-snapshot-sync'/> - <flag name='qxl'/> - <flag name='VGA'/> - <flag name='cirrus-vga'/> - <flag name='vmware-svga'/> - <flag name='device-video-primary'/> - <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> - <flag name='nbd-server'/> - <flag name='virtio-rng'/> - <flag name='rng-random'/> - <flag name='rng-egd'/> - <flag name='dtb'/> - <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> - <flag name='pci-bridge'/> - <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> - <flag name='mem-merge'/> - <flag name='vnc-websocket'/> - <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> - <flag name='dmi-to-pci-bridge'/> - <flag name='i440fx-pci-hole64-size'/> - <flag name='q35-pci-hole64-size'/> - <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> - <flag name='virtio-mmio'/> - <flag name='ich9-intel-hda'/> - <flag name='kvm-pit-lost-tick-policy'/> - <flag name='boot-strict'/> - <flag name='pvpanic'/> - <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> - <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> - <flag name='msg-timestamp'/> - <flag name='numa'/> - <flag name='usb-audio'/> - <flag name='splash-timeout'/> - <flag name='ivshmem'/> - <flag name='VGA.vgamem_mb'/> - <flag name='vmware-svga.vgamem_mb'/> - <flag name='qxl.vgamem_mb'/> - <flag name='qxl-vga.vgamem_mb'/> - <flag name='pci-serial'/> - <flag name='ioh3420'/> - <flag name='x3130-upstream'/> - <flag name='xio3130-downstream'/> - <flag name='rtl8139'/> - <flag name='e1000'/> - <flag name='virtio-net'/> - <flag name='qxl.vram64_size_mb'/> - <flag name='qxl-vga.vram64_size_mb'/> - <flag name='device-tray-moved-event'/> - <flag name='nec-usb-xhci-ports'/> - <version>1006050</version> - <kvmVersion>0</kvmVersion> - <package></package> - <arch>x86_64</arch> - <cpu name='Opteron_G5'/> - <cpu name='Opteron_G4'/> - <cpu name='Opteron_G3'/> - <cpu name='Opteron_G2'/> - <cpu name='Opteron_G1'/> - <cpu name='Haswell'/> - <cpu name='SandyBridge'/> - <cpu name='Westmere'/> - <cpu name='Nehalem'/> - <cpu name='Penryn'/> - <cpu name='Conroe'/> - <cpu name='n270'/> - <cpu name='athlon'/> - <cpu name='pentium3'/> - <cpu name='pentium2'/> - <cpu name='pentium'/> - <cpu name='486'/> - <cpu name='coreduo'/> - <cpu name='kvm32'/> - <cpu name='qemu32'/> - <cpu name='kvm64'/> - <cpu name='core2duo'/> - <cpu name='phenom'/> - <cpu name='qemu64'/> - <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/> - <machine name='xenpv' maxCpus='1'/> - <machine name='pc-q35-1.4' maxCpus='255'/> - <machine name='pc-q35-1.5' maxCpus='255'/> - <machine name='pc-q35-1.6' maxCpus='255'/> - <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/> - <machine name='xenfv' maxCpus='128'/> - <machine name='isapc' maxCpus='1'/> - <machine name='pc-0.10' maxCpus='255'/> - <machine name='pc-0.11' maxCpus='255'/> - <machine name='pc-0.12' maxCpus='255'/> - <machine name='pc-0.13' maxCpus='255'/> - <machine name='pc-0.14' maxCpus='255'/> - <machine name='pc-0.15' maxCpus='255'/> - <machine name='pc-1.0' maxCpus='255'/> - <machine name='pc-1.1' maxCpus='255'/> - <machine name='pc-1.2' maxCpus='255'/> - <machine name='pc-1.3' maxCpus='255'/> - <machine name='pc-i440fx-1.4' maxCpus='255'/> - <machine name='pc-i440fx-1.5' maxCpus='255'/> - <machine name='pc-i440fx-1.6' maxCpus='255'/> -</qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies new file mode 100644 index 0000000..50e4042 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -0,0 +1,3195 @@ +{ + "QMP": { + "version": { + "qemu": { + "micro": 0, + "minor": 7, + "major": 1 + }, + "package": "" + }, + "capabilities": [ + ] + } +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 7, + "major": 1 + }, + "package": "" + }, + "id": "libvirt-2" +} + +{ + "return": { + "arch": "x86_64" + }, + "id": "libvirt-3" +} + +{ + "return": [ + { + "name": "blockdev-add" + }, + { + "name": "query-rx-filter" + }, + { + "name": "chardev-remove" + }, + { + "name": "chardev-add" + }, + { + "name": "query-tpm-types" + }, + { + "name": "query-tpm-models" + }, + { + "name": "query-tpm" + }, + { + "name": "query-target" + }, + { + "name": "query-cpu-definitions" + }, + { + "name": "query-machines" + }, + { + "name": "device-list-properties" + }, + { + "name": "qom-list-types" + }, + { + "name": "change-vnc-password" + }, + { + "name": "nbd-server-stop" + }, + { + "name": "nbd-server-add" + }, + { + "name": "nbd-server-start" + }, + { + "name": "qom-get" + }, + { + "name": "qom-set" + }, + { + "name": "qom-list" + }, + { + "name": "query-block-jobs" + }, + { + "name": "query-balloon" + }, + { + "name": "query-migrate-capabilities" + }, + { + "name": "migrate-set-capabilities" + }, + { + "name": "query-migrate" + }, + { + "name": "query-command-line-options" + }, + { + "name": "query-uuid" + }, + { + "name": "query-name" + }, + { + "name": "query-spice" + }, + { + "name": "query-vnc" + }, + { + "name": "query-mice" + }, + { + "name": "query-status" + }, + { + "name": "query-kvm" + }, + { + "name": "query-pci" + }, + { + "name": "query-cpus" + }, + { + "name": "query-blockstats" + }, + { + "name": "query-block" + }, + { + "name": "query-chardev" + }, + { + "name": "query-events" + }, + { + "name": "query-commands" + }, + { + "name": "query-version" + }, + { + "name": "human-monitor-command" + }, + { + "name": "qmp_capabilities" + }, + { + "name": "add_client" + }, + { + "name": "expire_password" + }, + { + "name": "set_password" + }, + { + "name": "block_set_io_throttle" + }, + { + "name": "block_passwd" + }, + { + "name": "query-fdsets" + }, + { + "name": "remove-fd" + }, + { + "name": "add-fd" + }, + { + "name": "closefd" + }, + { + "name": "getfd" + }, + { + "name": "set_link" + }, + { + "name": "balloon" + }, + { + "name": "drive-mirror" + }, + { + "name": "blockdev-snapshot-delete-internal-sync" + }, + { + "name": "blockdev-snapshot-internal-sync" + }, + { + "name": "blockdev-snapshot-sync" + }, + { + "name": "transaction" + }, + { + "name": "block-job-complete" + }, + { + "name": "block-job-resume" + }, + { + "name": "block-job-pause" + }, + { + "name": "block-job-cancel" + }, + { + "name": "block-job-set-speed" + }, + { + "name": "drive-backup" + }, + { + "name": "block-commit" + }, + { + "name": "block-stream" + }, + { + "name": "block_resize" + }, + { + "name": "netdev_del" + }, + { + "name": "netdev_add" + }, + { + "name": "dump-guest-memory" + }, + { + "name": "client_migrate_info" + }, + { + "name": "migrate_set_downtime" + }, + { + "name": "migrate_set_speed" + }, + { + "name": "query-migrate-cache-size" + }, + { + "name": "migrate-set-cache-size" + }, + { + "name": "migrate_cancel" + }, + { + "name": "migrate" + }, + { + "name": "xen-set-global-dirty-log" + }, + { + "name": "xen-save-devices-state" + }, + { + "name": "ringbuf-read" + }, + { + "name": "ringbuf-write" + }, + { + "name": "inject-nmi" + }, + { + "name": "pmemsave" + }, + { + "name": "memsave" + }, + { + "name": "cpu-add" + }, + { + "name": "cpu" + }, + { + "name": "send-key" + }, + { + "name": "device_del" + }, + { + "name": "device_add" + }, + { + "name": "system_powerdown" + }, + { + "name": "system_reset" + }, + { + "name": "system_wakeup" + }, + { + "name": "cont" + }, + { + "name": "stop" + }, + { + "name": "screendump" + }, + { + "name": "change" + }, + { + "name": "eject" + }, + { + "name": "quit" + } + ], + "id": "libvirt-4" +} + +{ + "return": { + "fd": 11, + "fdset-id": 0 + }, + "id": "libvirt-5" +} + +{ + "id": "libvirt-6", + "error": { + "class": "GenericError", + "desc": "Parameter 'top' is missing" + } +} + +{ + "return": [ + { + "name": "BLOCK_IMAGE_CORRUPTED" + }, + { + "name": "GUEST_PANICKED" + }, + { + "name": "SPICE_MIGRATE_COMPLETED" + }, + { + "name": "BALLOON_CHANGE" + }, + { + "name": "WAKEUP" + }, + { + "name": "SUSPEND_DISK" + }, + { + "name": "SUSPEND" + }, + { + "name": "NIC_RX_FILTER_CHANGED" + }, + { + "name": "DEVICE_TRAY_MOVED" + }, + { + "name": "DEVICE_DELETED" + }, + { + "name": "BLOCK_JOB_READY" + }, + { + "name": "BLOCK_JOB_ERROR" + }, + { + "name": "BLOCK_JOB_CANCELLED" + }, + { + "name": "BLOCK_JOB_COMPLETED" + }, + { + "name": "SPICE_DISCONNECTED" + }, + { + "name": "SPICE_INITIALIZED" + }, + { + "name": "SPICE_CONNECTED" + }, + { + "name": "WATCHDOG" + }, + { + "name": "RTC_CHANGE" + }, + { + "name": "BLOCK_IO_ERROR" + }, + { + "name": "VNC_DISCONNECTED" + }, + { + "name": "VNC_INITIALIZED" + }, + { + "name": "VNC_CONNECTED" + }, + { + "name": "RESUME" + }, + { + "name": "STOP" + }, + { + "name": "POWERDOWN" + }, + { + "name": "RESET" + }, + { + "name": "SHUTDOWN" + } + ], + "id": "libvirt-7" +} + +{ + "return": [ + { + "name": "virtio-blk-device" + }, + { + "name": "ib700" + }, + { + "name": "ICH9 LPC" + }, + { + "name": "port92" + }, + { + "name": "i6300esb" + }, + { + "name": "kvm-pci-assign" + }, + { + "name": "virtio-scsi-device" + }, + { + "name": "apic" + }, + { + "name": "pc-testdev" + }, + { + "name": "fusbh200-ehci-usb" + }, + { + "name": "virtio-scsi-pci" + }, + { + "name": "usb-ehci" + }, + { + "name": "exynos4210-ehci-usb" + }, + { + "name": "xlnx,ps7-usb" + }, + { + "name": "virtio-balloon-pci" + }, + { + "name": "usb-host" + }, + { + "name": "ich9-usb-ehci2" + }, + { + "name": "ich9-ahci" + }, + { + "name": "ich9-usb-ehci1" + }, + { + "name": "isa-ide" + }, + { + "name": "ICH9 SMB" + }, + { + "name": "piix4-usb-uhci" + }, + { + "name": "vt82c686b-usb-uhci" + }, + { + "name": "i82558b" + }, + { + "name": "i82558a" + }, + { + "name": "isa-fdc" + }, + { + "name": "isabus-bridge" + }, + { + "name": "sb16" + }, + { + "name": "i2c-bus" + }, + { + "name": "piix3-ide" + }, + { + "name": "ioapic" + }, + { + "name": "pci-bridge" + }, + { + "name": "HDA" + }, + { + "name": "am53c974" + }, + { + "name": "hpet" + }, + { + "name": "vmmouse" + }, + { + "name": "i82801b11-bridge" + }, + { + "name": "nvme" + }, + { + "name": "lsi53c810" + }, + { + "name": "vmxnet3" + }, + { + "name": "isa-cirrus-vga" + }, + { + "name": "dc390" + }, + { + "name": "vmware-svga" + }, + { + "name": "smbus-eeprom" + }, + { + "name": "i82801" + }, + { + "name": "ccid-card-passthru" + }, + { + "name": "fw_cfg" + }, + { + "name": "x86_64-cpu" + }, + { + "name": "piix3-usb-uhci" + }, + { + "name": "usb-audio" + }, + { + "name": "virtio-9p-device" + }, + { + "name": "i82557c" + }, + { + "name": "i82557b" + }, + { + "name": "i82557a" + }, + { + "name": "IndustryPack" + }, + { + "name": "qxl" + }, + { + "name": "pvscsi" + }, + { + "name": "rtl8139" + }, + { + "name": "isa-applesmc" + }, + { + "name": "container" + }, + { + "name": "virtio-mmio" + }, + { + "name": "vfio-pci" + }, + { + "name": "cfi.pflash01" + }, + { + "name": "usb-kbd" + }, + { + "name": "ich9-usb-uhci5" + }, + { + "name": "isa-vga" + }, + { + "name": "pci-testdev" + }, + { + "name": "usb-tablet" + }, + { + "name": "vmport" + }, + { + "name": "virtio-rng-pci" + }, + { + "name": "kvmvapic" + }, + { + "name": "usb-bt-dongle" + }, + { + "name": "sysbus-fdc" + }, + { + "name": "piix4-ide" + }, + { + "name": "e1000" + }, + { + "name": "kvm-apic" + }, + { + "name": "AC97" + }, + { + "name": "ich9-usb-uhci6" + }, + { + "name": "ipoctal232" + }, + { + "name": "mch" + }, + { + "name": "mc146818rtc" + }, + { + "name": "ivshmem" + }, + { + "name": "usb-ccid" + }, + { + "name": "sysbus-ahci" + }, + { + "name": "kvmclock" + }, + { + "name": "i82562" + }, + { + "name": "hda-output" + }, + { + "name": "pci-serial-4x" + }, + { + "name": "ccid-bus" + }, + { + "name": "i82559er" + }, + { + "name": "virtio-balloon-device" + }, + { + "name": "megasas" + }, + { + "name": "i8042" + }, + { + "name": "intel-hda" + }, + { + "name": "hda-duplex" + }, + { + "name": "virtio-serial-pci" + }, + { + "name": "ne2k_pci" + }, + { + "name": "ich9-usb-uhci2" + }, + { + "name": "ich9-usb-uhci3" + }, + { + "name": "virtconsole" + }, + { + "name": "ich9-usb-uhci4" + }, + { + "name": "isa-parallel" + }, + { + "name": "pci-serial" + }, + { + "name": "ich9-usb-uhci1" + }, + { + "name": "PCI" + }, + { + "name": "adlib" + }, + { + "name": "SUNW,fdtwo" + }, + { + "name": "ide-cd" + }, + { + "name": "isa-debugcon" + }, + { + "name": "usb-bot" + }, + { + "name": "i82551" + }, + { + "name": "i82550" + }, + { + "name": "isa-serial" + }, + { + "name": "PCIE" + }, + { + "name": "kvm-ioapic" + }, + { + "name": "nec-usb-xhci" + }, + { + "name": "System" + }, + { + "name": "qemu-console" + }, + { + "name": "ich9-intel-hda" + }, + { + "name": "virtio-net-device" + }, + { + "name": "q35-pcihost" + }, + { + "name": "usb-wacom-tablet" + }, + { + "name": "PIIX4_PM" + }, + { + "name": "kvm-i8259" + }, + { + "name": "usb-redir" + }, + { + "name": "scsi-cd" + }, + { + "name": "pci-ohci" + }, + { + "name": "i440FX" + }, + { + "name": "usb-braille" + }, + { + "name": "virtserialport" + }, + { + "name": "pci-serial-2x" + }, + { + "name": "icc-bridge" + }, + { + "name": "xio3130-downstream" + }, + { + "name": "rng-random" + }, + { + "name": "hda-micro" + }, + { + "name": "scsi-disk" + }, + { + "name": "vhost-scsi" + }, + { + "name": "lsi53c895a" + }, + { + "name": "SCSI" + }, + { + "name": "pcnet" + }, + { + "name": "scsi-generic" + }, + { + "name": "pvpanic" + }, + { + "name": "virtio-serial-device" + }, + { + "name": "virtio-serial-bus" + }, + { + "name": "vhost-scsi-pci" + }, + { + "name": "usb-bus" + }, + { + "name": "ne2k_isa" + }, + { + "name": "IDE" + }, + { + "name": "ccid-card-emulated" + }, + { + "name": "tegra2-ehci-usb" + }, + { + "name": "usb-net" + }, + { + "name": "virtio-mmio-bus" + }, + { + "name": "usb-hub" + }, + { + "name": "i440FX-pcihost" + }, + { + "name": "usb-mouse" + }, + { + "name": "ISA" + }, + { + "name": "cs4231a" + }, + { + "name": "usb-serial" + }, + { + "name": "scsi-block" + }, + { + "name": "isa-i8259" + }, + { + "name": "sga" + }, + { + "name": "virtio-net-pci" + }, + { + "name": "isa-debug-exit" + }, + { + "name": "virtio-rng-device" + }, + { + "name": "ioh3420" + }, + { + "name": "ES1370" + }, + { + "name": "PIIX3" + }, + { + "name": "isa-pcspk" + }, + { + "name": "ide-hd" + }, + { + "name": "rng-egd" + }, + { + "name": "cirrus-vga" + }, + { + "name": "kvm-pit" + }, + { + "name": "virtio-9p-pci" + }, + { + "name": "icc-bus" + }, + { + "name": "ide-drive" + }, + { + "name": "x3130-upstream" + }, + { + "name": "virtio-pci-bus" + }, + { + "name": "qxl-vga" + }, + { + "name": "usb-uas" + }, + { + "name": "virtio-blk-pci" + }, + { + "name": "sysbus-ohci" + }, + { + "name": "esp" + }, + { + "name": "piix3-ide-xen" + }, + { + "name": "i82559c" + }, + { + "name": "i82559b" + }, + { + "name": "i82559a" + }, + { + "name": "scsi-hd" + }, + { + "name": "PIIX3-xen" + }, + { + "name": "usb-storage" + }, + { + "name": "isa-pit" + }, + { + "name": "tpci200" + }, + { + "name": "gus" + }, + { + "name": "VGA" + } + ], + "id": "libvirt-8" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "scsi", + "type": "on/off" + }, + { + "name": "config-wce", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "secs", + "type": "uint32" + }, + { + "name": "heads", + "type": "uint32" + }, + { + "name": "cyls", + "type": "uint32" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "x-data-plane", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + }, + { + "name": "class", + "type": "hex32" + } + ], + "id": "libvirt-9" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "tx", + "type": "string" + }, + { + "name": "x-txburst", + "type": "int32" + }, + { + "name": "x-txtimer", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "netdev", + "type": "netdev" + }, + { + "name": "vlan", + "type": "vlan" + }, + { + "name": "mac", + "type": "macaddr" + }, + { + "name": "mq", + "type": "on/off" + }, + { + "name": "ctrl_guest_offloads", + "type": "on/off" + }, + { + "name": "ctrl_mac_addr", + "type": "on/off" + }, + { + "name": "ctrl_rx_extra", + "type": "on/off" + }, + { + "name": "ctrl_vlan", + "type": "on/off" + }, + { + "name": "ctrl_rx", + "type": "on/off" + }, + { + "name": "ctrl_vq", + "type": "on/off" + }, + { + "name": "status", + "type": "on/off" + }, + { + "name": "mrg_rxbuf", + "type": "on/off" + }, + { + "name": "host_ufo", + "type": "on/off" + }, + { + "name": "host_ecn", + "type": "on/off" + }, + { + "name": "host_tso6", + "type": "on/off" + }, + { + "name": "host_tso4", + "type": "on/off" + }, + { + "name": "guest_ufo", + "type": "on/off" + }, + { + "name": "guest_ecn", + "type": "on/off" + }, + { + "name": "guest_tso6", + "type": "on/off" + }, + { + "name": "guest_tso4", + "type": "on/off" + }, + { + "name": "gso", + "type": "on/off" + }, + { + "name": "guest_csum", + "type": "on/off" + }, + { + "name": "csum", + "type": "on/off" + }, + { + "name": "any_layout", + "type": "on/off" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + } + ], + "id": "libvirt-10" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "cmd_per_lun", + "type": "uint32" + }, + { + "name": "max_sectors", + "type": "uint32" + }, + { + "name": "num_queues", + "type": "uint32" + }, + { + "name": "param_change", + "type": "on/off" + }, + { + "name": "hotplug", + "type": "on/off" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + } + ], + "id": "libvirt-11" +} + +{ + "id": "libvirt-12", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-ccw' not found" + } +} + +{ + "id": "libvirt-13", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-ccw' not found" + } +} + +{ + "id": "libvirt-14", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-scsi-ccw' not found" + } +} + +{ + "id": "libvirt-15", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-s390' not found" + } +} + +{ + "id": "libvirt-16", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-s390' not found" + } +} + +{ + "id": "libvirt-17", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'pci-assign' not found" + } +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "configfd", + "type": "string" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "share_intx", + "type": "on/off" + }, + { + "name": "prefer_msi", + "type": "on/off" + }, + { + "name": "host", + "type": "pci-host-devaddr" + } + ], + "id": "libvirt-18" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "x-vga", + "type": "on/off" + }, + { + "name": "x-intx-mmap-timeout-ms", + "type": "uint32" + }, + { + "name": "host", + "type": "pci-host-devaddr" + } + ], + "id": "libvirt-19" +} + +{ + "return": [ + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "wwn", + "type": "hex64" + }, + { + "name": "dpofua", + "type": "on/off" + }, + { + "name": "removable", + "type": "on/off" + }, + { + "name": "product", + "type": "string" + }, + { + "name": "vendor", + "type": "string" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "ver", + "type": "string" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-20" +} + +{ + "return": [ + { + "name": "unit", + "type": "uint32" + }, + { + "name": "model", + "type": "string" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "wwn", + "type": "hex64" + }, + { + "name": "ver", + "type": "string" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-21" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "s4_val", + "type": "uint8" + }, + { + "name": "disable_s4", + "type": "uint8" + }, + { + "name": "disable_s3", + "type": "uint8" + }, + { + "name": "smb_io_base", + "type": "uint32" + } + ], + "id": "libvirt-22" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "filter", + "type": "string" + }, + { + "name": "debug", + "type": "uint8" + }, + { + "name": "chardev", + "type": "chr" + } + ], + "id": "libvirt-23" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "pipeline", + "type": "on/off" + }, + { + "name": "loglevel", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "isobsize", + "type": "uint32" + }, + { + "name": "isobufs", + "type": "uint32" + }, + { + "name": "productid", + "type": "hex32" + }, + { + "name": "vendorid", + "type": "hex32" + }, + { + "name": "hostport", + "type": "string" + }, + { + "name": "hostaddr", + "type": "uint32" + }, + { + "name": "hostbus", + "type": "uint32" + } + ], + "id": "libvirt-24" +} + +{ + "return": [ + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-25" +} + +{ + "return": [ + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + }, + { + "name": "MCFG", + "type": "uint64" + } + ], + "id": "libvirt-27" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "removable", + "type": "on/off" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-28" +} + +{ + "return": [ + { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "mmio", + "type": "on/off" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-30" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-32" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-33" +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-gpu-pci' not found" + } +} + +{ + "id": "libvirt-35", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'ICH9-LPC' not found" + } +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "class", + "type": "hex32" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + } + ], + "id": "libvirt-36" +} + +{ + "id": "libvirt-37", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-balloon-ccw' not found" + } +} + +{ + "return": [ + ], + "id": "libvirt-38" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "p3", + "type": "uint32" + }, + { + "name": "p2", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "msi", + "type": "on/off" + } + ], + "id": "libvirt-39" +} + +{ + "return": [ + { + "name": "pc-q35-1.4", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.5", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.6", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.7", + "cpu-max": 255, + "alias": "q35" + }, + { + "name": "isapc", + "cpu-max": 1 + }, + { + "name": "pc-0.10", + "cpu-max": 255 + }, + { + "name": "pc-0.11", + "cpu-max": 255 + }, + { + "name": "pc-0.12", + "cpu-max": 255 + }, + { + "name": "pc-0.13", + "cpu-max": 255 + }, + { + "name": "pc-0.14", + "cpu-max": 255 + }, + { + "name": "pc-0.15", + "cpu-max": 255 + }, + { + "name": "pc-1.0", + "cpu-max": 255 + }, + { + "name": "pc-1.1", + "cpu-max": 255 + }, + { + "name": "pc-1.2", + "cpu-max": 255 + }, + { + "name": "pc-1.3", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.4", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.5", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.6", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.7", + "is-default": true, + "cpu-max": 255, + "alias": "pc" + }, + { + "name": "none", + "cpu-max": 1 + } + ], + "id": "libvirt-40" +} + +{ + "return": [ + { + "name": "Opteron_G5" + }, + { + "name": "Opteron_G4" + }, + { + "name": "Opteron_G3" + }, + { + "name": "Opteron_G2" + }, + { + "name": "Opteron_G1" + }, + { + "name": "Haswell" + }, + { + "name": "SandyBridge" + }, + { + "name": "Westmere" + }, + { + "name": "Nehalem" + }, + { + "name": "Penryn" + }, + { + "name": "Conroe" + }, + { + "name": "n270" + }, + { + "name": "athlon" + }, + { + "name": "pentium3" + }, + { + "name": "pentium2" + }, + { + "name": "pentium" + }, + { + "name": "486" + }, + { + "name": "coreduo" + }, + { + "name": "kvm32" + }, + { + "name": "qemu32" + }, + { + "name": "kvm64" + }, + { + "name": "core2duo" + }, + { + "name": "phenom" + }, + { + "name": "qemu64" + } + ], + "id": "libvirt-41" +} + +{ + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-42" +} + +{ + "return": [ + ], + "id": "libvirt-43" +} + +{ + "return": [ + ], + "id": "libvirt-44" +} + +{ + "return": [ + { + "parameters": [ + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, + { + "parameters": [ + ], + "option": "smbios" + }, + { + "parameters": [ + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } + ], + "option": "spice" + }, + { + "parameters": [ + ], + "option": "acpi" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "mount_tag", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "virtfs" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "fsdev" + }, + { + "parameters": [ + { + "name": "timestamp", + "type": "boolean" + } + ], + "option": "msg" + }, + { + "parameters": [ + { + "name": "mlock", + "type": "boolean" + } + ], + "option": "realtime" + }, + { + "parameters": [ + ], + "option": "tpmdev" + }, + { + "parameters": [ + ], + "option": "object" + }, + { + "parameters": [ + { + "name": "opaque", + "help": "free-form string used to describe fd", + "type": "string" + }, + { + "name": "set", + "help": "ID of the fd set to add fd to", + "type": "number" + }, + { + "name": "fd", + "help": "file descriptor of which a duplicate is added to fd set", + "type": "number" + } + ], + "option": "add-fd" + }, + { + "parameters": [ + { + "name": "enable", + "type": "boolean" + } + ], + "option": "sandbox" + }, + { + "parameters": [ + { + "name": "strict", + "type": "string" + }, + { + "name": "reboot-timeout", + "type": "string" + }, + { + "name": "splash-time", + "type": "string" + }, + { + "name": "splash", + "type": "string" + }, + { + "name": "menu", + "type": "boolean" + }, + { + "name": "once", + "type": "string" + }, + { + "name": "order", + "type": "string" + } + ], + "option": "boot-opts" + }, + { + "parameters": [ + { + "name": "maxcpus", + "type": "number" + }, + { + "name": "threads", + "type": "number" + }, + { + "name": "cores", + "type": "number" + }, + { + "name": "sockets", + "type": "number" + }, + { + "name": "cpus", + "type": "number" + } + ], + "option": "smp-opts" + }, + { + "parameters": [ + { + "name": "usb", + "help": "Set on/off to enable/disable usb", + "type": "boolean" + }, + { + "name": "mem-merge", + "help": "enable/disable memory merge support", + "type": "boolean" + }, + { + "name": "dump-guest-core", + "help": "Include guest memory in a core dump", + "type": "boolean" + }, + { + "name": "dt_compatible", + "help": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "phandle_start", + "help": "The first phandle ID we may generate dynamically", + "type": "number" + }, + { + "name": "dumpdtb", + "help": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "dtb", + "help": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "help": "Linux kernel command line", + "type": "string" + }, + { + "name": "initrd", + "help": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "kernel", + "help": "Linux kernel image file", + "type": "string" + }, + { + "name": "kvm_shadow_mem", + "help": "KVM shadow MMU size", + "type": "size" + }, + { + "name": "kernel_irqchip", + "help": "use KVM in-kernel irqchip", + "type": "boolean" + }, + { + "name": "accel", + "help": "accelerator list", + "type": "string" + }, + { + "name": "type", + "help": "emulated machine", + "type": "string" + } + ], + "option": "machine" + }, + { + "parameters": [ + { + "name": "romfile", + "type": "string" + }, + { + "name": "bootindex", + "type": "number" + } + ], + "option": "option-rom" + }, + { + "parameters": [ + { + "name": "file", + "type": "string" + }, + { + "name": "events", + "type": "string" + } + ], + "option": "trace" + }, + { + "parameters": [ + { + "name": "pretty", + "type": "boolean" + }, + { + "name": "default", + "type": "boolean" + }, + { + "name": "chardev", + "type": "string" + }, + { + "name": "mode", + "type": "string" + } + ], + "option": "mon" + }, + { + "parameters": [ + { + "name": "value", + "type": "string" + }, + { + "name": "property", + "type": "string" + }, + { + "name": "driver", + "type": "string" + } + ], + "option": "global" + }, + { + "parameters": [ + { + "name": "driftfix", + "type": "string" + }, + { + "name": "clock", + "type": "string" + }, + { + "name": "base", + "type": "string" + } + ], + "option": "rtc" + }, + { + "parameters": [ + ], + "option": "net" + }, + { + "parameters": [ + ], + "option": "netdev" + }, + { + "parameters": [ + ], + "option": "device" + }, + { + "parameters": [ + { + "name": "chardev", + "type": "string" + }, + { + "name": "size", + "type": "size" + }, + { + "name": "debug", + "type": "number" + }, + { + "name": "name", + "type": "string" + }, + { + "name": "signal", + "type": "boolean" + }, + { + "name": "mux", + "type": "boolean" + }, + { + "name": "rows", + "type": "number" + }, + { + "name": "cols", + "type": "number" + }, + { + "name": "height", + "type": "number" + }, + { + "name": "width", + "type": "number" + }, + { + "name": "telnet", + "type": "boolean" + }, + { + "name": "delay", + "type": "boolean" + }, + { + "name": "server", + "type": "boolean" + }, + { + "name": "wait", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "to", + "type": "number" + }, + { + "name": "localport", + "type": "string" + }, + { + "name": "localaddr", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "host", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "backend", + "type": "string" + } + ], + "option": "chardev" + }, + { + "parameters": [ + { + "name": "copy-on-read", + "help": "copy read data from backing file into image file", + "type": "boolean" + }, + { + "name": "read-only", + "help": "open drive file as read-only", + "type": "boolean" + }, + { + "name": "addr", + "help": "pci address (virtio only)", + "type": "string" + }, + { + "name": "boot", + "help": "(deprecated, ignored)", + "type": "boolean" + }, + { + "name": "trans", + "help": "chs translation (auto, lba, none)", + "type": "string" + }, + { + "name": "secs", + "help": "number of sectors (ide disk geometry)", + "type": "number" + }, + { + "name": "heads", + "help": "number of heads (ide disk geometry)", + "type": "number" + }, + { + "name": "cyls", + "help": "number of cylinders (ide disk geometry)", + "type": "number" + }, + { + "name": "if", + "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + "type": "string" + }, + { + "name": "media", + "help": "media type (disk, cdrom)", + "type": "string" + }, + { + "name": "index", + "help": "index number", + "type": "number" + }, + { + "name": "unit", + "help": "unit number (i.e. lun for scsi)", + "type": "number" + }, + { + "name": "bus", + "help": "bus number", + "type": "number" + }, + { + "name": "throttling.iops-size", + "help": "when limiting by iops max size of an I/O in bytes", + "type": "number" + }, + { + "name": "throttling.bps-write-max", + "help": "total bytes write burst", + "type": "number" + }, + { + "name": "throttling.bps-read-max", + "help": "total bytes read burst", + "type": "number" + }, + { + "name": "throttling.bps-total-max", + "help": "total bytes burst", + "type": "number" + }, + { + "name": "throttling.iops-write-max", + "help": "I/O operations write burst", + "type": "number" + }, + { + "name": "throttling.iops-read-max", + "help": "I/O operations read burst", + "type": "number" + }, + { + "name": "throttling.iops-total-max", + "help": "I/O operations burst", + "type": "number" + }, + { + "name": "throttling.bps-write", + "help": "limit write bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-read", + "help": "limit read bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-total", + "help": "limit total bytes per second", + "type": "number" + }, + { + "name": "throttling.iops-write", + "help": "limit write operations per second", + "type": "number" + }, + { + "name": "throttling.iops-read", + "help": "limit read operations per second", + "type": "number" + }, + { + "name": "throttling.iops-total", + "help": "limit total I/O operations per second", + "type": "number" + }, + { + "name": "werror", + "help": "write error action", + "type": "string" + }, + { + "name": "rerror", + "help": "read error action", + "type": "string" + }, + { + "name": "serial", + "help": "disk serial number", + "type": "string" + }, + { + "name": "format", + "help": "disk format (raw, qcow2, ...)", + "type": "string" + }, + { + "name": "aio", + "help": "host AIO implementation (threads, native)", + "type": "string" + }, + { + "name": "cache.no-flush", + "help": "ignore any flush requests for the device", + "type": "boolean" + }, + { + "name": "cache.direct", + "help": "enables use of O_DIRECT (bypass the host page cache)", + "type": "boolean" + }, + { + "name": "cache.writeback", + "help": "enables writeback mode for any caches", + "type": "boolean" + }, + { + "name": "discard", + "help": "discard operation (ignore/off, unmap/on)", + "type": "string" + }, + { + "name": "file", + "help": "disk image", + "type": "string" + }, + { + "name": "snapshot", + "help": "enable/disable snapshot mode", + "type": "boolean" + } + ], + "option": "drive" + } + ], + "id": "libvirt-45" +} + +{ + "return": [ + { + "state": false, + "capability": "xbzrle" + }, + { + "state": false, + "capability": "x-rdma-pin-all" + }, + { + "state": false, + "capability": "auto-converge" + }, + { + "state": false, + "capability": "zero-blocks" + } + ], + "id": "libvirt-46" +} diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml new file mode 100644 index 0000000..db0d000 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -0,0 +1,200 @@ +<qemuCaps> + <qemuctime>0</qemuctime> + <selfctime>0</selfctime> + <selfvers>0</selfvers> + <usedQMP/> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='chardev'/> + <flag name='enable-kvm'/> + <flag name='monitor-json'/> + <flag name='sdl'/> + <flag name='smp-topology'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='pci-configfd'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='smbios-type'/> + <flag name='vga-qxl'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='pci-multibus'/> + <flag name='pci-bootindex'/> + <flag name='ccid-emulated'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='device-qxl-vga'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='drive-copy-on-read'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='usb-audio'/> + <flag name='splash-timeout'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='qxl-vga.vgamem_mb'/> + <flag name='pci-serial'/> + <flag name='ioh3420'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + <flag name='qxl.vram64_size_mb'/> + <flag name='qxl-vga.vram64_size_mb'/> + <flag name='device-tray-moved-event'/> + <flag name='nec-usb-xhci-ports'/> + <version>1007000</version> + <kvmVersion>0</kvmVersion> + <package></package> + <arch>x86_64</arch> + <cpu name='Opteron_G5'/> + <cpu name='Opteron_G4'/> + <cpu name='Opteron_G3'/> + <cpu name='Opteron_G2'/> + <cpu name='Opteron_G1'/> + <cpu name='Haswell'/> + <cpu name='SandyBridge'/> + <cpu name='Westmere'/> + <cpu name='Nehalem'/> + <cpu name='Penryn'/> + <cpu name='Conroe'/> + <cpu name='n270'/> + <cpu name='athlon'/> + <cpu name='pentium3'/> + <cpu name='pentium2'/> + <cpu name='pentium'/> + <cpu name='486'/> + <cpu name='coreduo'/> + <cpu name='kvm32'/> + <cpu name='qemu32'/> + <cpu name='kvm64'/> + <cpu name='core2duo'/> + <cpu name='phenom'/> + <cpu name='qemu64'/> + <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/> + <machine name='pc-q35-1.4' maxCpus='255'/> + <machine name='pc-q35-1.5' maxCpus='255'/> + <machine name='pc-q35-1.6' maxCpus='255'/> + <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/> + <machine name='isapc' maxCpus='1'/> + <machine name='pc-0.10' maxCpus='255'/> + <machine name='pc-0.11' maxCpus='255'/> + <machine name='pc-0.12' maxCpus='255'/> + <machine name='pc-0.13' maxCpus='255'/> + <machine name='pc-0.14' maxCpus='255'/> + <machine name='pc-0.15' maxCpus='255'/> + <machine name='pc-1.0' maxCpus='255'/> + <machine name='pc-1.1' maxCpus='255'/> + <machine name='pc-1.2' maxCpus='255'/> + <machine name='pc-1.3' maxCpus='255'/> + <machine name='pc-i440fx-1.4' maxCpus='255'/> + <machine name='pc-i440fx-1.5' maxCpus='255'/> + <machine name='pc-i440fx-1.6' maxCpus='255'/> +</qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 058ad8c..3d55006 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -165,7 +165,7 @@ mymain(void) DO_TEST("x86_64", "caps_1.4.2"); DO_TEST("x86_64", "caps_1.5.3"); DO_TEST("x86_64", "caps_1.6.0"); - DO_TEST("x86_64", "caps_1.6.50"); + DO_TEST("x86_64", "caps_1.7.0"); DO_TEST("x86_64", "caps_2.1.1"); DO_TEST("x86_64", "caps_2.4.0"); DO_TEST("x86_64", "caps_2.5.0"); -- 2.8.3

2 1

[libvirt] [PATCH 00/11] qemu: Erradicate use of virDomainLiveConfigHelperMethod
by Peter Krempa 25 May '16

25 May '16

Don't use that terrible function in the qemu driver and a few relevant refactors. Peter Krempa (11): qemu: monitor: Remove 'supportMaxOptions' argument from qemuMonitorGetBlockIoThrottle qemu: Replace virDomainLiveConfigHelperMethod in qemuDomainGetBlockIoTune qemu: Refactor typed params assignment in qemuDomainGetBlockIoTune qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetMemoryParameters qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetBlkioParameters qemu: Refactor qemuDomainGetBlkioParameters qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetSchedulerParametersFlags conf: Change virDomainCputune member 'shares' to unsigned long long qemu: Refactor qemuDomainGetSchedulerParametersFlags qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetBlockIoTune qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetSchedulerParametersFlags src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_driver.c | 896 ++++++++++++------------------------------- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 24 +- src/qemu/qemu_monitor_json.h | 3 +- src/vmx/vmx.c | 6 +- tests/qemumonitorjsontest.c | 2 +- 10 files changed, 261 insertions(+), 688 deletions(-) -- 2.8.2

2 13

[libvirt] [PATCH] libxl: default to qemu driver for network disks
by Jim Fehlig 25 May '16

25 May '16

Xen only supports network-based disks with the qemu (aka qdisk) driver. Set the driverName to 'qemu' in libxlDomainDeviceDefPostParse() if not already set. When starting a domain with network-based disks, ensure the driverName is 'qemu'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 11 +++++++---- src/libxl/libxl_domain.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 13e56ac..78e9ee9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1058,13 +1058,18 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { - const char *driver; - int format; + const char *driver = virDomainDiskGetDriver(l_disk); + int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); libxl_device_disk_init(x_disk); if (actual_type == VIR_STORAGE_TYPE_NETWORK) { + if (driver && STRNEQ(driver, "qemu")) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("only the 'qemu' driver can be used with network disks")); + return -1; + } if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -1075,8 +1080,6 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) if (VIR_STRDUP(x_disk->vdev, l_disk->dst) < 0) return -1; - driver = virDomainDiskGetDriver(l_disk); - format = virDomainDiskGetFormat(l_disk); if (driver) { if (STREQ(driver, "tap") || STREQ(driver, "tap2")) { switch (format) { diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 113942b..8a3866f 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -364,6 +364,18 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, } } + /* for network-based disks, set 'qemu' as the default driver */ + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + virDomainDiskDefPtr disk = dev->data.disk; + int actual_type = virStorageSourceGetActualType(disk->src); + + if (actual_type == VIR_STORAGE_TYPE_NETWORK) { + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + return -1; + } + } + return 0; } -- 2.1.4

3 4

[libvirt] [PATCH v2] Call qemuDomainObjEndJob when qemuCaps is null during hotplug
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 249393a..cd53d3c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8237,7 +8237,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8366,7 +8366,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8490,7 +8490,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */

2 1

Re: [libvirt] [Qemu-devel] [Bug 1585533] [NEW] cache-miss-rate / Invalid JSON
by Eric Blake 25 May '16

25 May '16

On 05/25/2016 02:46 AM, Marc Brothier wrote: > Public bug reported: > > Hi, > > We have VMs which were started with an older version than qemu 2.1 which > added "cache-miss-rate" property for XBZRLECacheStats. While trying to > migrate the VM to a new host which is running a higher version (2.3) of > Qemu we got an exception: > > virJSONValueFromString:1642 : internal error: cannot parse json {"return": {"expected-downtime": 1, "xbzrle-cache": {"bytes": 0, "cache-size": 67108864, "cache-miss-rate": -nan, "pages": 0, "overflow": 0, "cache-miss": 8933}, "status": "active", "disk": {"total": 429496729600, "dirty-sync-count": 0, "remaining": 193896382464, "mbps": 0, "transferred": 235600347136, "duplicate": 0, "dirty-pages-rate": 0, "skipped": 0, "normal-bytes": 0, "normal": 0}, "setup-time": 13, "total-time": 1543124, "ram": {"total": 8599183360, "dirty-sync-count": 4, "remaining": 30695424, "mbps": 830.636997, "transferred": 3100448901, "duplicate": 1358341, "dirty-pages-rate": 7, "skipped": 0, "normal-bytes": 3082199040, "normal": 752490}}, "id": "libvirt-186200"}: lexical error: malformed number, a digit is required after the minus sign. > 67108864, "cache-miss-rate": -nan, "pages": 0, "overflow": 0 > (right here) ------^ > > virNetClientStreamRaiseError:191 : stream aborted at client request Wow - I've known we have a problem with qemu emitting non-compliant JSON, but this proves that it is fatal to libvirt. I guess my series on improving the JSON parser [1] should consider doing a fallback to s/NaN/0/ and s/Inf/DBL_MAX/ rather than completely erroring out when a client tries to request it. Meanwhile, it's an easy patch to qemu to avoid division by zero when generating cache-miss-rate. [1] https://lists.gnu.org/archive/html/qemu-devel/2016-05/msg03424.html > > > Would it be possible to improve the JSON parser to skip the key if the value is incorrect Libvirt uses libyajl to parse JSON, and libyajl has an outstanding bug request to support extensions to JSON such as parsing non-finite floats. Since there has been no upstream reaction to the bug request, I seriously doubt it will happen any time soon, so any change to tolerate NaN in libvirt would have to be a one-off patch. It sounds like the better fix is to make qemu emit valid JSON in the first place, rather than making libvirt deal with broken JSON from qemu. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH 0/3] qemu: Allow update of certain disk options during runtime
by Peter Krempa 25 May '16

25 May '16

Until this series it was possible to update floppies and cdroms only. With this you can update startup policy and snapshot behavior for regular disks too. Peter Krempa (3): qemu: driver: Move around code to avoid need to rollback qemu: driver: Remove unnecessary cleanup label from qemuDomainChangeDiskLive qemu: driver: Allow disk update of startupPolicy/snapshot for all disks src/qemu/qemu_driver.c | 74 ++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) -- 2.8.2

2 5

[libvirt] [PATCH/RFC] Add missing delta from Ubuntu to apparmor profiles
by Stefan Bader 25 May '16

25 May '16

This had been on the Debian package list before but its time to take this onwards. So the goal would be to have one set to rule them all (when using apparmor) and drop the seperate set of definitions which exist at least in the Ubuntu packaging. Right now the patch would be at a state which adds all missing files and rules to the current examples in libvirt and installs them when using --with-apparmor-profiles. One problem seems to be that some of the definitions might cause parse failures on certain versions of apparmor. I checked this morning and this looks a bit hairy. So some apparmor 2.8 versions potentially have issues, but not all apparmor 2.8 are the same (gah). I could imagine (but John, we really could use some guidance here ;)) that at least some changes could be related to version 2.8.95~2430: + debian/patches/mediate-signals.patch, debian/patches/change-signal-syntax.patch: Parse signal rules with apparmor_parser. See the apparmor.d(5) man page for syntax details. + debian/patches/change-ptrace-syntax.patch, debian/patches/mediate-ptrace.patch: Parse ptrace rules with apparmor_parser. See the apparmor.d(5) man page for syntax details. But, regardless of the when, the apparmor rules maybe need a way to handle versioned features of the parser. One proposal was to comment out problematic rules and allow the packager to re-enable things. Maybe going one step further and have some pre-processing that handles version based sections (like #if (APPARMOR_VERSION >= xxx)). So that is where we stand. Ideas are very welcome. -Stefan --- >From aec5cf8cc30c80492a37856626264c3d4c27a31f Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 18 Sep 2014 14:15:17 +0200 Subject: [PATCH] Add missing delta from Ubuntu to apparmor profiles This fixes up the upstream profiles and would allow to drop apparmor related delta from the Ubuntu package. Thanks to Serge Hallyn for the Makefile.am install hook that allows to rename the local file. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- examples/apparmor/Makefile.am | 10 ++++++++ examples/apparmor/libvirt-lxc | 15 +++++++++++- examples/apparmor/libvirt-qemu | 31 +++++++++++++++++++++++- examples/apparmor/local-usr.sbin.libvirtd | 2 ++ examples/apparmor/usr.lib.libvirt.virt-aa-helper | 25 ++++++++++++++++--- examples/apparmor/usr.sbin.libvirtd | 17 ++++++++++++- 6 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 examples/apparmor/local-usr.sbin.libvirtd diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index 7a20e16..aa46cb9 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST= \ libvirt-qemu \ libvirt-lxc \ usr.lib.libvirt.virt-aa-helper \ + local-usr.sbin.libvirtd \ usr.sbin.libvirtd if WITH_APPARMOR_PROFILES @@ -29,6 +30,15 @@ apparmor_DATA = \ usr.sbin.libvirtd \ $(NULL) +localdir = $(apparmordir)/local +local_DATA = \ + local-usr.sbin.libvirtd \ + $(NULL) + +install-data-hook: + mv $(DESTDIR)$(localdir)/local-usr.sbin.libvirtd \ + $(DESTDIR)$(localdir)/usr.sbin.libvirtd + abstractionsdir = $(apparmordir)/abstractions abstractions_DATA = \ libvirt-qemu \ diff --git a/examples/apparmor/libvirt-lxc b/examples/apparmor/libvirt-lxc index 4bfb503..4705e0a 100644 --- a/examples/apparmor/libvirt-lxc +++ b/examples/apparmor/libvirt-lxc @@ -1,12 +1,18 @@ -# Last Modified: Fri Feb 7 13:01:36 2014 +# Last Modified: Thu, 18 Sep 2014 13:56:49 +0200 #include <abstractions/base> umount, + dbus, + signal, + ptrace, # ignore DENIED message on / remount deny mount options=(ro, remount) -> /, + # support use of cgmanager proxy + mount options=(move) /sys/fs/cgroup/cgmanager/ -> /sys/fs/cgroup/cgmanager.lower/, + # allow tmpfs mounts everywhere mount fstype=tmpfs, @@ -33,8 +39,15 @@ mount fstype=fusectl -> /sys/fs/fuse/connections/, mount fstype=securityfs -> /sys/kernel/security/, mount fstype=debugfs -> /sys/kernel/debug/, + deny mount fstype=debugfs -> /var/lib/ureadahead/debugfs/, mount fstype=proc -> /proc/, mount fstype=sysfs -> /sys/, + + mount options=(rw nosuid nodev noexec remount) -> /sys/, + mount options=(rw remount) -> /sys/kernel/security/, + mount options=(rw remount) -> /sys/fs/pstore/, + mount options=(ro remount) -> /sys/fs/pstore/, + deny /sys/firmware/efi/efivars/** rwklx, deny /sys/kernel/security/** rwklx, diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index c6de6dd..b69e64c 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -1,4 +1,4 @@ -# Last Modified: Wed Sep 3 21:52:03 2014 +# Last Modified: Thu, 18 Sep 2014 16:41:21 +0200 #include <abstractions/base> #include <abstractions/consoles> @@ -13,15 +13,22 @@ capability setgid, capability setuid, + # this is needed with libcap-ng support, however it breaks a lot of things + # atm, so just silence the denial until libcap-ng works right. LP: #522845 + deny capability setpcap, + network inet stream, network inet6 stream, /dev/net/tun rw, + /dev/tap* rw, /dev/kvm rw, /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, @{PROC}/sys/kernel/cap_last_cap r, + owner @{PROC}/*/auxv r, + @{PROC}/sys/vm/overcommit_memory r, # For hostdev access. The actual devices will be added dynamically /sys/bus/usb/devices/ r, @@ -38,6 +45,9 @@ /dev/snd/* rw, capability ipc_lock, # spice + /usr/bin/qemu-system-i386-spice rmix, + /usr/bin/qemu-system-x86_64-spice rmix, + /{dev,run}/shm/ r, owner /{dev,run}/shm/spice.* rw, # 'kill' is not required for sound and is a security risk. Do not enable # unless you absolutely need it. @@ -73,6 +83,7 @@ # the various binaries /usr/bin/kvm rmix, /usr/bin/qemu rmix, + /usr/bin/qemu-system-aarch64 rmix, /usr/bin/qemu-system-arm rmix, /usr/bin/qemu-system-cris rmix, /usr/bin/qemu-system-i386 rmix, @@ -91,6 +102,7 @@ /usr/bin/qemu-system-sparc rmix, /usr/bin/qemu-system-sparc64 rmix, /usr/bin/qemu-system-x86_64 rmix, + /usr/bin/qemu-system-x86_64-spice rmix, /usr/bin/qemu-alpha rmix, /usr/bin/qemu-arm rmix, /usr/bin/qemu-armeb rmix, @@ -117,6 +129,16 @@ /bin/dash rmix, /bin/dd rmix, /bin/cat rmix, + /etc/pki/CA/ r, + /etc/pki/CA/* r, + /etc/pki/libvirt/ r, + /etc/pki/libvirt/** r, + + # for rbd + /etc/ceph/ceph.conf r, + + # for access to hugepages + owner "/run/hugepages/kvm/libvirt/qemu/**" rw, # for usb access /dev/bus/usb/ r, @@ -124,6 +146,13 @@ /sys/bus/ r, /sys/class/ r, + signal (receive) peer=/usr/sbin/libvirtd, + ptrace (tracedby) peer=/usr/sbin/libvirtd, + + # for ppc device-tree access + @{PROC}/device-tree/ r, + @{PROC}/device-tree/** r, + /usr/{lib,libexec}/qemu-bridge-helper Cx -> qemu_bridge_helper, # child profile for bridge helper process profile qemu_bridge_helper { diff --git a/examples/apparmor/local-usr.sbin.libvirtd b/examples/apparmor/local-usr.sbin.libvirtd new file mode 100644 index 0000000..6e19f20 --- /dev/null +++ b/examples/apparmor/local-usr.sbin.libvirtd @@ -0,0 +1,2 @@ +# Site-specific additions and overrides for usr.sbin.libvirtd. +# For more details, please see /etc/apparmor.d/local/README. diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper index bceaaff..4df86b0 100644 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -1,8 +1,9 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 +# Last Modified: Thu, 18 Sep 2014 14:05:36 +0200 #include <tunables/global> /usr/lib/libvirt/virt-aa-helper { #include <abstractions/base> + #include <abstractions/user-tmp> # needed for searching directories capability dac_override, @@ -19,6 +20,12 @@ # for hostdev /sys/devices/ r, /sys/devices/** r, + /sys/bus/usb/devices/ r, + /sys/bus/usb/devices/** r, + deny /dev/sd* r, + deny /dev/dm-* r, + deny /dev/mapper/ r, + deny /dev/mapper/* r, /usr/lib/libvirt/virt-aa-helper mr, /sbin/apparmor_parser Ux, @@ -26,8 +33,11 @@ /etc/apparmor.d/libvirt/* r, /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, - # for backingstore -- allow access to non-hidden files in @{HOME} as well - # as storage pools + # For backingstore, virt-aa-helper needs to peek inside the disk image, so + # allow access to non-hidden files in @{HOME} as well as storage pools, and + # removable media and filesystems, and certain file extentions. A + # virt-aa-helper failure when checking a disk for backinsgstore is non-fatal + # (but obviously the backingstore won't be added). audit deny @{HOME}/.* mrwkl, audit deny @{HOME}/.*/ rw, audit deny @{HOME}/.*/** mrwkl, @@ -35,8 +45,17 @@ audit deny @{HOME}/bin/** mrwkl, @{HOME}/ r, @{HOME}/** r, + @{HOME}/.Private/** mrwlk, + @{HOMEDIRS}/.ecryptfs/*/.Private/** mrwlk, + /var/lib/libvirt/images/ r, /var/lib/libvirt/images/** r, + /var/lib/nova/images/** r, + /var/lib/nova/instances/_base/** r, + /var/lib/nova/instances/snapshots/** r, + /var/lib/eucalyptus/instances/**/disk* r, + /var/lib/eucalyptus/instances/**/loader* r, + /var/lib/uvtool/libvirt/images/** r, /{media,mnt,opt,srv}/** r, /**.img r, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 3011eff..814b4d81 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -1,10 +1,12 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 +# Last Modified: Tue, 23 Sep 2014 09:28:07 +0200 #include <tunables/global> @{LIBVIRT}="libvirt" /usr/sbin/libvirtd { #include <abstractions/base> #include <abstractions/dbus> + # Site-specific additions and overrides. See local/README for details. + #include <local/usr.sbin.libvirtd> capability kill, capability net_admin, @@ -23,6 +25,7 @@ capability setpcap, capability mknod, capability fsetid, + capability ipc_lock, capability audit_write, # Needed for vfio @@ -33,6 +36,12 @@ network inet6 stream, network inet6 dgram, network packet dgram, + network netlink, + + dbus bus=system, + signal, + ptrace, + unix, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. @@ -45,6 +54,12 @@ /usr/sbin/* PUx, /lib/udev/scsi_id PUx, /usr/lib/xen-common/bin/xen-toolstack PUx, + /usr/lib/xen-*/bin/pygrub PUx, + /usr/lib/xen-*/bin/libxl-save-helper PUx, + + # Required by nwfilter_ebiptables_driver.c:ebiptablesWriteToTempFile() to + # write and run an ebtables script. + /var/lib/libvirt/virtd* ixr, # force the use of virt-aa-helper audit deny /sbin/apparmor_parser rwxl, -- 1.9.1

5 17

[libvirt] [PATCH] Call qemuDomainObjEndJob when qemuCaps is null during hotplug
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 249393a..3f26f1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8237,7 +8237,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8490,7 +8490,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */

3 2

[libvirt] [PATCH] xenconfig: xm: check for driver on disk format
by Joao Martins 25 May '16

25 May '16

When reviewing libxl vif typename series[0] I found out a bug on xen-xm formatter where this "virsh domxml-to-native xen-xm file.xml" can lead to a NULL dereference if the disk driver isn't specified. Fix this by checking for driver before writing/testing it down. [0] https://www.redhat.com/archives/libvir-list/2016-April/msg01434.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/xenconfig/xen_xm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 34d57de..3658c59 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -297,9 +297,12 @@ xenFormatXMDisk(virConfValuePtr list, type = "aio"; else type = virStorageFileFormatTypeToString(format); - virBufferAsprintf(&buf, "%s:", driver); - if (STREQ(driver, "tap")) - virBufferAsprintf(&buf, "%s:", type); + + if (driver) { + virBufferAsprintf(&buf, "%s:", driver); + if (STREQ(driver, "tap")) + virBufferAsprintf(&buf, "%s:", type); + } } else { switch (virDomainDiskGetType(disk)) { case VIR_STORAGE_TYPE_FILE: -- 2.1.4

2 2

[libvirt] [PATCH] Unref the cfg in qemuDomainAttachHostPCIDevice()
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 807aaf8..41a0e4f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1164,7 +1164,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, unsigned int flags = 0; if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - return -1; + goto cleanup; if (!cfg->relaxedACS) flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;

2 1

[libvirt] [PATCH v2 0/2] Don't crash in virNodeDeviceDefFormat()
by Andrea Bolognani 25 May '16

25 May '16

Changes from [v1]: * fix all callers of virPCIGetPhysicalFunction() * document virPCIGetPhysicalFunction() [v1] https://www.redhat.com/archives/libvir-list/2016-May/msg01681.html Andrea Bolognani (2): Document virPCIGetPhysicalFunction() and fix its callers conf: nodedev: Set PCI_PHYSICAL_FUNCTION flag more carefully src/conf/node_device_conf.c | 4 ++-- src/node_device/node_device_linux_sysfs.c | 10 ++++++++-- src/util/virpci.c | 18 ++++++++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH v2 0/3] Fix a couple of recently found coverity issues
by John Ferlan 25 May '16

25 May '16

v1: http://www.redhat.com/archives/libvir-list/2016-May/msg01611.html Although initially ACK'd by Erik, Jan pointed out something with one of the patches and well this just lagged on my todo list. Since then a change was made to lxc_driver.c (commit id '306b3a850') which caused a merge conflict. So rather than push without checking first, I figure I'll make a v2. Patch 1 was already ACK'd Patch 2 is new to remove persistentAddrs from qemu Patch 3 is altered... I think the return from virDomainObjListRemove will cause the 'vm' to be NULL anyway; however, since the next called API virDomainObjEndAPI checks for that - it seems that making that call won't hurt. I also moved the check to after endjob, so that some sort of "failure" and goto cleanup doesn't unexpectedly remove a transient domain. John Ferlan (3): qemu: Remove dead code qemu: Remove unused persistentAddrs lxc: Fix lxcDomainDestroyFlags endjob processing src/lxc/lxc_driver.c | 6 ++---- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 17 ++++------------- src/qemu/qemu_process.c | 18 ++++++++---------- 4 files changed, 14 insertions(+), 28 deletions(-) -- 2.5.5

3 7

[libvirt] [PATCH 0/7] qemu: Fix removable devices without a tray
by Peter Krempa 25 May '16

25 May '16

Peter Krempa (7): qemu: Move struct qemuDomainDiskInfo to qemu_domain.h qemu: Extract more information about qemu drives qemu: Move and rename qemuDomainCheckEjectableMedia to qemuProcessRefreshDisks qemu: process: Fix and improve disk data extraction qemu: hotplug: Extract code for waiting for tray eject qemu: hotplug: Fix error reported when cdrom tray is locked qemu: hotplug: wait for the tray to eject only for drives with a tray src/qemu/qemu_conf.h | 7 --- src/qemu/qemu_domain.h | 13 ++++ src/qemu/qemu_hotplug.c | 141 ++++++++++++++++--------------------------- src/qemu/qemu_hotplug.h | 3 - src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 18 ------ src/qemu/qemu_monitor.h | 3 - src/qemu/qemu_monitor_json.c | 12 ++-- src/qemu/qemu_process.c | 58 +++++++++++++++++- src/qemu/qemu_process.h | 5 ++ tests/qemumonitorjsontest.c | 25 +++++++- 11 files changed, 157 insertions(+), 130 deletions(-) -- 2.8.2

2 11

[libvirt] [PATCH] lxc: completely rework reference counting
by Katerina Koukiou 24 May '16

24 May '16

This patch follows the pattern used in qemu driver regarding reference counting. It changes lxcDomObjFromDomain() to ref the domain (using virDomainObjListFindByUUIDRef()) and adds virDomainObjEndAPI() which should be the only function in which the return value of virObjectUnref() is checked. This makes all reference counting deterministic and makes the code a bit clearer. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_domain.c | 16 +--- src/lxc/lxc_domain.h | 5 +- src/lxc/lxc_driver.c | 216 +++++++++++++++++++-------------------------------- 3 files changed, 85 insertions(+), 152 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index bca2bb2..6fd5423 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -80,7 +80,7 @@ virLXCDomainObjFreeJob(virLXCDomainObjPrivatePtr priv) * in any way * * Upon successful return, the object will have its ref count increased, - * successful calls must be followed by EndJob eventually + * Successful calls must be followed by EndJob eventually */ int virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, @@ -95,8 +95,6 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, return -1; then = now + LXC_JOB_WAIT_TIME; - virObjectRef(obj); - while (priv->job.active) { VIR_DEBUG("Wait normal job condition for starting job: %s", virLXCDomainJobTypeToString(job)); @@ -126,23 +124,17 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, else virReportSystemError(errno, "%s", _("cannot acquire job mutex")); - - virObjectUnref(obj); return -1; } /* - * obj must be locked before calling + * obj must be locked and have a reference before calling * * To be called after completing the work associated with the * earlier virLXCDomainBeginJob() call - * - * Returns true if the remaining reference count on obj is - * non-zero, false if the reference count has dropped to zero - * and obj is disposed. */ -bool +void virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr obj) { @@ -154,8 +146,6 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, virLXCDomainObjResetJob(priv); virCondSignal(&priv->job.cond); - - return virObjectUnref(obj); } diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index e82c719..5c4f31e 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -102,10 +102,9 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver, enum virLXCDomainJob job) ATTRIBUTE_RETURN_CHECK; -bool +void virLXCDomainObjEndJob(virLXCDriverPtr driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; + virDomainObjPtr obj); #endif /* __LXC_DOMAIN_H__ */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 143089d..4aef78d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -126,11 +126,11 @@ static virNWFilterCallbackDriver lxcCallbackDriver = { * lxcDomObjFromDomain: * @domain: Domain pointer that has to be looked up * - * This function looks up @domain and returns the appropriate - * virDomainObjPtr. + * This function looks up @domain and returns the appropriate virDomainObjPtr + * that has to be released by calling virDomainObjEndAPI. * - * Returns the domain object which is locked on success, NULL - * otherwise. + * Returns the domain object with incremented reference counter which is locked + * on success, NULL otherwise. */ static virDomainObjPtr lxcDomObjFromDomain(virDomainPtr domain) @@ -139,7 +139,7 @@ lxcDomObjFromDomain(virDomainPtr domain) virLXCDriverPtr driver = domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; - vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -283,7 +283,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom = NULL; - vm = virDomainObjListFindByUUID(driver->domains, uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, uuid); if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -301,8 +301,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, dom->id = vm->def->id; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } @@ -347,8 +346,7 @@ static int lxcDomainIsActive(virDomainPtr dom) ret = virDomainObjIsActive(obj); cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -367,8 +365,7 @@ static int lxcDomainIsPersistent(virDomainPtr dom) ret = obj->persistent; cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -386,8 +383,7 @@ static int lxcDomainIsUpdated(virDomainPtr dom) ret = obj->updated; cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -492,13 +488,14 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) driver->xmlopt, 0, &oldDef))) goto cleanup; + + virObjectRef(vm); def = NULL; vm->persistent = 1; if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef ? vm->newDef : vm->def) < 0) { virDomainObjListRemove(driver->domains, vm); - vm = NULL; goto cleanup; } @@ -515,8 +512,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) cleanup: virDomainDefFree(def); virDomainDefFree(oldDef); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -566,14 +562,12 @@ static int lxcDomainUndefineFlags(virDomainPtr dom, vm->persistent = 0; } else { virDomainObjListRemove(driver->domains, vm); - vm = NULL; } ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); @@ -628,8 +622,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -654,8 +647,7 @@ lxcDomainGetState(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -674,8 +666,7 @@ static char *lxcDomainGetOSType(virDomainPtr dom) goto cleanup; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -695,8 +686,7 @@ lxcDomainGetMaxMemory(virDomainPtr dom) ret = virDomainDefGetMemoryActual(vm->def); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -790,12 +780,10 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -940,12 +928,10 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -1042,8 +1028,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -1069,8 +1054,7 @@ static char *lxcDomainGetXMLDesc(virDomainPtr dom, virDomainDefFormatConvertXMLFlags(flags)); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1166,12 +1150,10 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); @@ -1301,13 +1283,11 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, dom->id = vm->def->id; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(def); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -1390,8 +1370,7 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1568,12 +1547,10 @@ lxcDomainDestroyFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -1907,8 +1884,7 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom, ignore_value(VIR_STRDUP(ret, "posix")); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2089,13 +2065,11 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(vmdef); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -2206,8 +2180,7 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -2461,12 +2434,10 @@ lxcDomainBlockStats(virDomainPtr dom, &stats->wr_req); endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2594,12 +2565,10 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, *nparams = tmp; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2809,12 +2778,10 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -3209,8 +3176,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -3258,12 +3224,10 @@ lxcDomainInterfaceStats(virDomainPtr dom, _("Invalid path, '%s' is not a known interface"), path); endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } #else @@ -3293,8 +3257,7 @@ static int lxcDomainGetAutostart(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3365,13 +3328,12 @@ static int lxcDomainSetAutostart(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3503,13 +3465,12 @@ static int lxcDomainSuspend(virDomainPtr dom) ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3559,13 +3520,12 @@ static int lxcDomainResume(virDomainPtr dom) ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3630,8 +3590,7 @@ lxcDomainOpenConsole(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3707,12 +3666,10 @@ lxcDomainSendProcessSignal(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3814,12 +3771,10 @@ lxcDomainShutdownFlags(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3899,12 +3854,10 @@ lxcDomainReboot(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5208,15 +5161,14 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5314,15 +5266,14 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, } } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5419,15 +5370,14 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5484,12 +5434,10 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, ret = nfds; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5586,11 +5534,10 @@ lxcDomainMemoryStats(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5738,12 +5685,10 @@ lxcDomainSetMetadata(virDomainPtr dom, driver->xmlopt, cfg->stateDir, cfg->configDir, flags); - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5773,7 +5718,7 @@ lxcDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(vm, type, uri, caps, driver->xmlopt, flags); cleanup: - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -5820,7 +5765,7 @@ lxcDomainGetCPUStats(virDomainPtr dom, ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams, start_cpu, ncpus, NULL); cleanup: - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5881,8 +5826,7 @@ lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } -- 2.7.4

2 1

[libvirt] [PATCH] lxc: use job functions in lxcDomainLxcOpenNamespace & lxcDomainSendProcessSignal
by Katerina Koukiou 24 May '16

24 May '16

Use the recently added job functions in lxcDomainLxcOpenNamespace, lxcDomainSendProcessSignal. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_driver.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7cdea2c..143089d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3642,6 +3642,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom, unsigned int signum, unsigned int flags) { + virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; virLXCDomainObjPrivatePtr priv; pid_t victim; @@ -3664,10 +3665,13 @@ lxcDomainSendProcessSignal(virDomainPtr dom, if (virDomainSendProcessSignalEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } /* @@ -3680,13 +3684,13 @@ lxcDomainSendProcessSignal(virDomainPtr dom, if (pid_value != 1) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Only the init process may be killed")); - goto cleanup; + goto endjob; } if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Init pid is not yet available")); - goto cleanup; + goto endjob; } victim = priv->initpid; @@ -3697,11 +3701,15 @@ lxcDomainSendProcessSignal(virDomainPtr dom, virReportSystemError(errno, _("Unable to send %d signal to process %d"), signum, victim); - goto cleanup; + goto endjob; } ret = 0; + endjob: + if (!virLXCDomainObjEndJob(driver, vm)) + vm = NULL; + cleanup: if (vm) virObjectUnlock(vm); @@ -5438,6 +5446,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, int **fdlist, unsigned int flags) { + virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; virLXCDomainObjPrivatePtr priv; int ret = -1; @@ -5454,22 +5463,30 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, if (virDomainLxcOpenNamespaceEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running")); - goto cleanup; + goto endjob; } if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Init pid is not yet available")); - goto cleanup; + goto endjob; } if (virProcessGetNamespaces(priv->initpid, &nfds, fdlist) < 0) - goto cleanup; + goto endjob; ret = nfds; + + endjob: + if (!virLXCDomainObjEndJob(driver, vm)) + vm = NULL; + cleanup: if (vm) virObjectUnlock(vm); -- 2.7.4

2 1

[libvirt] [PATCH v3 00/13] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 24 May '16

24 May '16

V2 was posted here. http://www.redhat.com/archives/libvir-list/2016-May/msg01384.html Changes from V2: -Squashed the original patch 1 with the patch which actually enables multifunction hotplug as suggested. -As suggested, introduced the virDomainDeviceDefParseMany for parsing. -Retained the patch which validates the function address before releasing. I feel this should be retained as originally checks used to happen for slots. -Changed the assign address logic to simply decrementally assign function numbers to the devices in the list. The CONNECT_TYPE flags are yet to be explored. -Split the original patch 8 into multiple simpler patches for easier reading. The original motivation was to help introduce test cases for multifunction hotplug which is not possible for functions static in qemu_driver.c. So, moved the functions to qemu_domain.c and qemu_hotplug.c. Hopefully, the movements helps adding good number of test cases. V1 was posted here. http://www.redhat.com/archives/libvir-list/2016-May/msg01178.html Changes from V1 Fixed couple of issues in address validation and assignment. Added Rollback of the hotplug if anything fails in between. Removed Patch 6 completely as it exposed way too many bugs. Changed the approach a bit by introducing 2 new patches which take care of hostdevice preparation and help reverting. Todo: 1) Hardening the hotplug checks to disallow multifunction cards hotplug as though they are single function cards. 2) Documentation update. 3) Test cases. This is easier now with the helper functions moved out of qemu_driver.c 4) Should the events be delayed till all the functions are hotplugged/unplugged? Something can fail and the revert may not be possible Or the guest may refuse to free the device. If we show events for those which got free, the rest of them may never be freed and also that may not be usable by guest if the function 0 is not part of it. Need to think more on this. Any suggestions ? --- Shivaprasad G Bhat (13): Release address in function granularity than slot Validate address in virDomainPCIAddressReleaseAddr Introduce PCI Multifunction device parser Introduce virDomainPCIMultifunctionDeviceAddressAssign Separate the hostdevice preparation and checks to a new funtion Move the qemu[*]DomainDeviceConfig to qemu_domain.c Move qemuDomain[*]Live functions to qemu_hotplug.c Introduce qemuDomain*DeviceLiveInternal Introduce qemuDomain*DeviceConfigInternal Move the virDomainDefCompatibleDevice checks a level down Move the detach of PCI device to the beginnging of live hotplug Pass virDomainDeviceDefListPtr to hotplug functions Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 153 ++++++- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 123 +++++- src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 5 src/qemu/qemu_domain.c | 460 +++++++++++++++++++++ src/qemu/qemu_domain.h | 17 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 882 ++++++---------------------------------- src/qemu/qemu_hotplug.c | 625 ++++++++++++++++++++++++---- src/qemu/qemu_hotplug.h | 24 + 11 files changed, 1421 insertions(+), 893 deletions(-) -- Signature

2 17

[libvirt] [PATCH 00/10] update caps data for our tests
by Pavel Hrdina 24 May '16

24 May '16

To get replies from qemu the tests/qemucapsprobe tool was used with following QEMUs: qemu-1.2.2 and qemu-1.3.1 on Fedora18 qemu-1.4.2 and qemu-1.5.3 on Fedora19 qemu-1.6.0 on Fedora20 qemu-2.1.1 on Fedora21 qemu-2.4.0 and qemu-2.5.0 on Fedora23 qemu-2.6.0 on Fedora24 To get as much as possible dependencies I've used "yum-builddeb qemu", uninstalled "xen" packages and if it was missing installed "spice" packages. Pavel Hrdina (10): qemucapstest: update caps for qemu-1.2.2 qemucapstest: update caps for qemu-1.3.1 qemucapstest: update caps for qemu-1.4.2 qemucapstest: update caps for qemu-1.5.3 qemucapstest: update caps for qemu-1.6.0 qemucapstest: update caps for qemu-2.1.1 qemucapstest: update caps for qemu-2.4.0 qemucapstest: update caps for qemu-2.5.0 qemucapstest: update caps for qemu-2.6.0 qemucapstest: remove data for qemu-1.6.50 tests/domaincapsschemadata/qemu_1.6.0.x86_64.xml | 78 + tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml | 78 - tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 2 +- tests/domaincapstest.c | 2 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 3483 ++++++------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 3943 ++++++++------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 5 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 4050 +++++++-------- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 5 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 5245 ++++++++++---------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 4 + .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 5244 +++++++++---------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 5 +- .../caps_1.6.50.x86_64.replies | 2848 ----------- tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 199 - .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 665 +-- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 411 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 1587 +++--- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 14 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 1877 ++++--- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 33 +- tests/qemucapabilitiestest.c | 1 - 25 files changed, 13934 insertions(+), 15850 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_1.6.0.x86_64.xml delete mode 100644 tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml -- 2.8.2

2 21

[libvirt] [PATCH] nwfilter: fix lock order deadlock
by Maxim Nestratov 24 May '16

24 May '16

Below is backtraces of two deadlocked threads: thread #1: virDomainConfVMNWFilterTeardown virNWFilterTeardownFilter lock updateMutex <------------ _virNWFilterTeardownFilter try to lock interface <---------- thread #2: learnIPAddressThread lock interface <------- virNWFilterInstantiateFilterLate try to lock updateMutex <---------- The problem is fixed by unlocking interface before calling virNWFilterInstantiateFilterLate to avoid updateMutex and interface ordering deadlocks. Otherwise we are going to instantiate the filter while holding interface lock, which will try to lock updateMutex, and if some other thread instantiating a filter in parallel is holding updateMutex and is trying to lock interface, both will deadlock. Also it is safe to unlock interface before virNWFilterInstantiateFilterLate because learnIPAddressThread stopped capturing packets and applied necessary rules on the interface, while instantiating a new filter doesn't require a locked interface. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/nwfilter/nwfilter_learnipaddr.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 1adbadb..cfd92d9 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -611,6 +611,16 @@ learnIPAddressThread(void *arg) sa.data.inet4.sin_addr.s_addr = vmaddr; char *inetaddr; + /* It is necessary to unlock interface here to avoid updateMutex and + * interface ordering deadlocks. Otherwise we are going to + * instantiate the filter, which will try to lock updateMutex, and + * some other thread instantiating a filter in parallel is holding + * updateMutex and is trying to lock interface, both will deadlock. + * Also it is safe to unlock interface here because we stopped + * capturing and applied necessary rules on the interface, while + * instantiating a new filter doesn't require a locked interface.*/ + virNWFilterUnlockIface(req->ifname); + if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) { if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) { VIR_ERROR(_("Failed to add IP address %s to IP address " @@ -636,11 +646,11 @@ learnIPAddressThread(void *arg) req->ifname, req->ifindex); techdriver->applyDropAllRules(req->ifname); + virNWFilterUnlockIface(req->ifname); } VIR_DEBUG("pcap thread terminating for interface %s", req->ifname); - virNWFilterUnlockIface(req->ifname); err_no_lock: virNWFilterDeregisterLearnReq(req->ifindex); -- 2.4.3

5 10

[libvirt] [PATCH] maint: fix syntax-check sc_prohibit_int_ijk exclude rule
by Pavel Hrdina 24 May '16

24 May '16

This fixes the "include/" path, we need to create a regex for the whole path because we are matching the whole line. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- I'm surprised that it even worked so far. I've noticed this after system update few days ago. cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index c19f615..f688cbb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1259,7 +1259,7 @@ exclude_file_name_regexp--sc_prohibit_include_public_headers_brackets = \ ^(tools/|examples/|include/libvirt/(virterror|libvirt(-(admin|qemu|lxc))?)\.h$$) exclude_file_name_regexp--sc_prohibit_int_ijk = \ - ^(src/remote_protocol-structs|src/remote/remote_protocol.x|cfg.mk|include/|src/admin_protocol-structs|src/admin/admin_protocol.x)$ + ^(src/remote_protocol-structs|src/remote/remote_protocol.x|cfg.mk|include/libvirt/libvirt.+|src/admin_protocol-structs|src/admin/admin_protocol.x)$$ exclude_file_name_regexp--sc_prohibit_getenv = \ ^tests/.*\.[ch]$$ -- 2.8.3

2 2

[libvirt] [PATCH 0/2] some build fixes
by Pavel Hrdina 24 May '16

24 May '16

Pavel Hrdina (2): qemuxml2argvtest: skip test that depends on gnutls_cipher_encrypt() makefile: fix build on systems where gnutls is not in /usr/include src/Makefile.am | 2 +- tests/qemuxml2argvtest.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.8.2

2 7

[libvirt] [PATCH 0/2] Set PCI_PHYSICAL_FUNCTION flag more carefully
by Andrea Bolognani 24 May '16

24 May '16

If you're running libvirt master on a remote host, and connect to it using virt-manager, the remote daemon will crash. The same will happen if you run 'virsh nodedev-dumpxml' for a PCI device that happens *not* to be a virtual function. The first patch fixes the crash. The second one fixes something that could potentially cause trouble down the line, and also makes the code a tiny bit nicer. Andrea Bolognani (2): nodedev: sysfs: Set PCI_PHYSICAL_FUNCTION flag more carefully conf: nodedev: Set PCI_PHYSICAL_FUNCTION flag more carefully src/conf/node_device_conf.c | 4 ++-- src/node_device/node_device_linux_sysfs.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.5.5

2 4

Re: [libvirt] [PATCH V2 2/4] libxl: support hotplug USB host device
by Jim Fehlig 24 May '16

24 May '16

On 05/23/2016 12:51 AM, Chun Yan Liu wrote: > > Yes, I think it's OK. And another place needs to be updated, since now it's > not only pci device, but also could be usb device, so the error message > should be updated. > if (virDomainHostdevFind(vmdef, hostdev, &found) >= 0) { > - pcisrc = &hostdev->source.subsys.u.pci; > virReportError(VIR_ERR_OPERATION_FAILED, > - _("target pci device %.4x:%.2x:%.2x.%.1x\ > - already exists"), > - pcisrc->addr.domain, pcisrc->addr.bus, > - pcisrc->addr.slot, pcisrc->addr.function); > + _("device already exists in domain configuration")); > return -1; > } Nice catch. I've squashed in the below diff, changing the error code and message to match the qemu driver. Regards, Jim diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5b6f87a..4d7124d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3293,7 +3293,6 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev; virDomainHostdevDefPtr found; - virDomainHostdevSubsysPCIPtr pcisrc; char mac[VIR_MAC_STRING_BUFLEN]; switch (dev->type) { @@ -3336,12 +3335,8 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) } if (virDomainHostdevFind(vmdef, hostdev, &found) >= 0) { - pcisrc = &hostdev->source.subsys.u.pci; - virReportError(VIR_ERR_OPERATION_FAILED, - _("target pci device %.4x:%.2x:%.2x.%.1x\ - already exists"), - pcisrc->addr.domain, pcisrc->addr.bus, - pcisrc->addr.slot, pcisrc->addr.function); + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device is already in the domain configuration")); return -1; }

2 1

[libvirt] [PATCH v2 0/8] Replace VIR_ERROR with standard vir*Error in state driver init
by Jovanka Gulicoska 23 May '16

23 May '16

Replace VIR_ERROR logging macros for error reporting in driver startup routines with vir*Error function. Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#Replace_VIR_ERROR_with_standard… Jovanka Gulicoska (8): uml: Replace VIR_ERROR with standard vir*Error in state driver init xen: Replace VIR_ERROR with standard vir*Error in state driver init bhyve: Replace VIR_ERROR with standard vir*Error in state driver init libxl: Replace VIR_ERROR with standard vir*Error in state driver init node_device: Replace VIR_ERROR with standard vir*Error in state driver init nwfilter: Replace VIR_ERROR with standard vir*Error in state driver init qemu: Replace VIR_ERROR with standard vir*Error in state driver init storage: Replace VIR_ERROR with standard vir*Error in state driver init src/bhyve/bhyve_driver.c | 4 +-- src/libxl/libxl_driver.c | 6 ++--- src/node_device/node_device_hal.c | 24 ++++++++++------- src/node_device/node_device_udev.c | 45 +++++++++++++++++++------------ src/nwfilter/nwfilter_driver.c | 5 ++-- src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++++-------------- src/storage/storage_driver.c | 32 +++++++++++++--------- src/uml/uml_driver.c | 20 +++++++------- src/xen/xen_driver.c | 5 ++-- 9 files changed, 119 insertions(+), 77 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH] vz: add error code for case if vm is already stopped
by Mikhail Feoktistov 23 May '16

23 May '16

If try to stop VM or container which is already stopped than Virtuozzo 7 returns code PRL_ERR_INVALID_ACTION_REQUESTED. Error code PRL_ERR_DISP_VM_IS_NOT_STARTED is used in Virtuozzo 6 --- src/vz/vz_sdk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a396d41..7eb78ca 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2050,6 +2050,7 @@ prlsdkDomainChangeStateLocked(vzDriverPtr driver, switch (pret) { case PRL_ERR_DISP_VM_IS_NOT_STARTED: case PRL_ERR_DISP_VM_IS_NOT_STOPPED: + case PRL_ERR_INVALID_ACTION_REQUESTED: virerr = VIR_ERR_OPERATION_INVALID; break; default: -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: don't refuse to undefine a guest with NVRAM file
by Daniel P. Berrange 23 May '16

23 May '16

The undefine operation should always be allowed to succeed regardless of whether any NVRAM file exists. ie we should not force the application to use the VIR_DOMAIN_UNDEFINE_NVRAM flag. It is valid for the app to decide it wants the NVRAM file left on disk, in the same way that disk images are left on disk at undefine. --- src/qemu/qemu_driver.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bec05d4..302bf48 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6985,19 +6985,13 @@ qemuDomainUndefineFlags(virDomainPtr dom, if (!virDomainObjIsActive(vm) && vm->def->os.loader && vm->def->os.loader->nvram && - virFileExists(vm->def->os.loader->nvram)) { - if (!(flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); - goto cleanup; - } - - if (unlink(vm->def->os.loader->nvram) < 0) { - virReportSystemError(errno, - _("failed to remove nvram: %s"), - vm->def->os.loader->nvram); - goto cleanup; - } + virFileExists(vm->def->os.loader->nvram) && + (flags & VIR_DOMAIN_UNDEFINE_NVRAM) && + (unlink(vm->def->os.loader->nvram) < 0)) { + virReportSystemError(errno, + _("failed to remove nvram: %s"), + vm->def->os.loader->nvram); + goto cleanup; } if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0) -- 2.1.0

6 17