- Devel - libvirt List Archives

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

23 May '16

John Ferlan (2): qemu: Remove dead code lxc: Fix lxcDomainDestroyFlags endjob processing src/lxc/lxc_driver.c | 8 ++++---- src/qemu/qemu_domain_address.c | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) -- 2.5.5

3 4

[libvirt] [PATCH v2 0/8] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 23 May '16

23 May '16

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. 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 (8): Revert "prevent hot unplugging multi function PCI device" 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 detach of PCI device to the beginnging of live hotplug Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 239 ++++++++++++++++++++++++++++-- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 236 +++++++++++++++++++++++++++++ src/conf/domain_conf.h | 22 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 321 ++++++++++++++++++++++++++++++++-------- src/qemu/qemu_hotplug.c | 161 ++++++++------------ src/qemu/qemu_hotplug.h | 5 + 9 files changed, 818 insertions(+), 177 deletions(-) -- Signature

4 24

[libvirt] [PATCH] storage: do not clear vols before volume upload
by Ján Tomko 23 May '16

23 May '16

Commit 5e54361c added virStoragePoolObjClearVols before refreshPool to prevent duplicate volume entries. However it is not needed here because we're not refreshing the pool yet, just checking for the existence of the refresh callback. The actual refresh is done via virStorageVolFDStreamCloseCb in virStorageVolPoolRefreshThread, which already calls virStoragePoolObjClearVols. --- src/storage/storage_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ce31e38..eb5f688 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2353,15 +2353,14 @@ storageVolUpload(virStorageVolPtr obj, /* If we have a refreshPool, use the callback routine in order to * refresh the pool after the volume upload stream closes. This way * we make sure the volume and pool data are refreshed without user * interaction and we can just lookup the backend in the callback * routine in order to call the refresh API. */ - virStoragePoolObjClearVols(pool); if (backend->refreshPool) { if (VIR_ALLOC(cbdata) < 0 || VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) goto cleanup; if (vol->target.type == VIR_STORAGE_VOL_PLOOP && VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0) goto cleanup; -- 2.7.3

2 2

[libvirt] [PATCH 0/9] Deprecate more unused QEMU_CAPS
by Ján Tomko 23 May '16

23 May '16

Cleaning up after QEMU_CAPS_DEVICE I noticed QEMU_CAPS_DRIVE_READONLY depends on it and QEMU_CAPS_PCIDEVICE did not really matter. Ján Tomko (9): qemu_command: assume QEMU_CAPS_DEVICE qemu: assume QEMU_CAPS_DEVICE almost everywhere tests: remove disk-drive-fat test tests: remove <readonly/> from IDE disks tests: always assume QEMU_CAPS_DRIVE_READONLY qemu: always assume QEMU_CAPS_DRIVE_READONLY Deprecate QEMU_CAPS_DRIVE_READONLY Deprecate QEMU_CAPS_DEVICE Deprecate QEMU_CAPS_PCIDEVICE src/qemu/qemu_capabilities.c | 46 +-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 425 ++++++--------------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_hostdev.c | 4 +- src/qemu/qemu_hotplug.c | 61 +-- src/qemu/qemu_process.c | 8 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 - .../caps_2.6.0-gicv2.aarch64.xml | 2 - .../caps_2.6.0-gicv3.aarch64.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 - tests/qemuhelptest.c | 45 +-- tests/qemuhotplugtest.c | 2 - .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 +- .../qemuxml2argv-boot-complex-bootindex.args | 3 +- .../qemuxml2argv-boot-complex.args | 3 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 3 +- .../qemuxml2argv-boot-menu-disable-drive.args | 3 +- .../qemuxml2argv-boot-menu-disable.args | 3 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 3 +- .../qemuxml2argv-boot-menu-enable.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 3 +- .../qemuxml2argv-controller-order.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 +- .../qemuxml2argv-disk-blockio.args | 3 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 2 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 2 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 2 +- .../qemuxml2argv-disk-drive-fat.args | 22 -- .../qemuxml2argv-disk-drive-fat.xml | 31 -- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 3 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 2 +- .../qemuxml2argv-disk-scsi-disk-split.args | 6 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 6 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 3 +- .../qemuxml2argv-disk-snapshot.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 5 +- .../qemuxml2argv-disk-source-pool.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 3 +- .../qemuxml2argv-pci-autoadd-idx.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 1 - tests/qemuxml2argvtest.c | 43 +-- .../qemuxml2xmlout-seclabel-dynamic-override.xml | 1 - tests/qemuxml2xmltest.c | 2 - 85 files changed, 246 insertions(+), 631 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml -- 2.7.3

2 12

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

23 May '16

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. Laine (cc'd) is generally regarded as the libvirt networking expert :-). Let's see if he has an opinion. Regards, Jim

3 2

[libvirt] [PATCH] util: compilation fix if build without GNUTLS library
by Mikhail Feoktistov 22 May '16

22 May '16

--- src/util/vircrypto.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 5183d49..4f288f0 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -24,6 +24,7 @@ #include "virlog.h" #include "virerror.h" #include "viralloc.h" +#include "virrandom.h" #include "md5.h" #include "sha256.h" @@ -220,14 +221,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, */ int virCryptoEncryptData(virCryptoCipher algorithm, - uint8_t *enckey, + uint8_t *enckey ATTRIBUTE_UNUSED, size_t enckeylen, - uint8_t *iv, + uint8_t *iv ATTRIBUTE_UNUSED, size_t ivlen, - uint8_t *data, - size_t datalen, - uint8_t **ciphertext, - size_t *ciphertextlen) + uint8_t *data ATTRIBUTE_UNUSED, + size_t datalen ATTRIBUTE_UNUSED, + uint8_t **ciphertext ATTRIBUTE_UNUSED, + size_t *ciphertextlen ATTRIBUTE_UNUSED) { switch (algorithm) { case VIR_CRYPTO_CIPHER_AES256CBC: -- 1.8.3.1

4 3

[libvirt] [PATCH 0/4] Couple of random and crypto adjustments
by John Ferlan 22 May '16

22 May '16

Patches 1&2 alter the virRandomBytes to accomodate the lone holdout code that was using /dev/urandom directly to add a range of bytes that are acceptible returns for the caller. Patches 3&4 modify the virCryptoEncryptData algorithm to "A" (hopefully) build right in a non gnutls environment and "B" make it so there future adjustments won't be doing cut, copy, & paste based on the key size and whether the iv is required. If AES192CBC were added the first two parameters to the DO_CRYPT macro would be 24, 16, while AES192CBC would have 16, 16. 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

1 4

[libvirt] [PATCH] tests: Allow multiple mock libraries
by Peter Krempa 20 May '16

20 May '16

Make virtTestMain take variable number of libraries to mock. --- tests/testutils.c | 11 ++++++++--- tests/testutils.h | 10 +++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 9180e86..f4fbad2 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> @@ -842,9 +843,11 @@ virTestSetEnvPath(void) int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)) + int (*func)(void), + ...) { + const char *lib; + va_list ap; int ret; char *testRange = NULL; #ifdef TEST_OOM @@ -854,8 +857,10 @@ int virtTestMain(int argc, if (getenv("VIR_TEST_FILE_ACCESS")) VIRT_TEST_PRELOAD(TEST_MOCK); - if (lib) + va_start(ap, func); + while ((lib = va_arg(ap, const char *))) VIRT_TEST_PRELOAD(lib); + va_end(ap); progname = last_component(argv[0]); if (STRPREFIX(progname, "lt-")) diff --git a/tests/testutils.h b/tests/testutils.h index d1caf20..c892902 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -102,13 +102,13 @@ const char *virtTestCounterNext(void); int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)); + int (*func)(void), + ...); /* Setup, then call func() */ # define VIRT_TEST_MAIN(func) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, NULL, func); \ + return virtTestMain(argc, argv, func, NULL); \ } # define VIRT_TEST_PRELOAD(lib) \ @@ -131,9 +131,9 @@ int virtTestMain(int argc, } \ } while (0) -# define VIRT_TEST_MAIN_PRELOAD(func, lib) \ +# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, lib, func); \ + return virtTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } virCapsPtr virTestGenericCapsInit(void); -- 2.8.2

3 2

[libvirt] [PATCH] Replace VIR_ERROR with standard vir*Error in state driver init
by Jovanka Gulicoska 20 May '16

20 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 (1): Replace VIR_ERROR with standard vir*Error in state driver init src/bhyve/bhyve_driver.c | 5 +++-- src/libxl/libxl_driver.c | 6 ++--- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_hal.c | 19 ++++++++-------- src/node_device/node_device_udev.c | 32 +++++++++++++------------- src/nwfilter/nwfilter_driver.c | 4 ++-- src/qemu/qemu_driver.c | 43 ++++++++++++++++++----------------- src/storage/storage_driver.c | 46 +++++++++++++++++++------------------- src/uml/uml_driver.c | 21 ++++++++--------- src/xen/xen_driver.c | 5 +++-- 10 files changed, 95 insertions(+), 88 deletions(-) -- 2.5.5

2 2

[libvirt] [PATCH 0/4] auto-assign controller indexes
by Laine Stump 20 May '16

20 May '16

The purpose of this series is just to eliminate the need to "count indexes" when adding controllers. Patch 4/4 is the meat of this series. 2/4 and 3/4 are code movement to enable 4/4, and 1/4 is a small code simplification that I noticed while testing the rest. Laine Stump (4): qemu: simplify addition of USB controller in qemuParseCommandLine conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/schemas/domaincommon.rng | 8 ++-- src/conf/domain_conf.c | 92 ++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_domain_address.c | 7 ---- src/qemu/qemu_parse_command.c | 8 +--- 5 files changed, 92 insertions(+), 30 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH v3 0/2] qemu: parse: Introduce qemuParseCommandLineMem
by Nishith Shah 20 May '16

20 May '16

This series moves the parsing of qemu -m memory into a separate function and adds suffix support for the -m option. The first patch introduces the function qemuParseCommandLineMem, and the second patch handles suffixes for the -m values and adds a test for the same. Nishith Shah (2): qemu: parse: Use qemuParseCommandLineMem for -m memory qemu: parse: Handle suffixes for -m memory src/qemu/qemu_parse_command.c | 35 ++++++++++++++++---- tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args | 22 +++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml | 37 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml -- 2.1.4

2 4

[libvirt] [PATCH v5 0/6] Add AES Secret Object support (for RBD only)
by John Ferlan 20 May '16

20 May '16

This is a combination of two series... The first 2 patches are a followon to (v1 from yesterday): http://www.redhat.com/archives/libvir-list/2016-May/msg01396.html But there really were a offshoot of the original AES/IV Secret changes (v4): http://www.redhat.com/archives/libvir-list/2016-May/msg01292.html Hopefully I haven't forgotten anything along the way. There's been numerous adjustments and changes along the way. Patch 1 is a combination with adjustments of patches 1&2 from v1. This should make virRandomBytes available in the virrandommock library which then is used in later patches. Patch 2 mostly adjust names, comments, adds #ifdef's for unavailable code This patch will make use of the virrandommock library instead of self-populating the enc_alg and iv_buf. Mainly because it's possible, but also since it's the basis for later patches to utilize the same virrandommock library. Patch 3 splits out the existing qemuDomainGenerateRandomKey into a vircrypto.c API. The vircrypto.c was chosen over virrandom.c because virrandom.c ends up being included in setuid_rpc_client and it wasn't overly clear that it was desired to drag in all of gnutls for just this one mock function. Patch 4 splits out the qemuDomainSecretSetup as was suggested in one review Patch 5 is new to handle the ability to have more than one mock library to preload from a VIRT_TEST_MAIN_PRELOAD macro. As it turns out the qemuxml2argvtest will need not only the qemuxml2argvmock, but also the virrandommock libraries. I went with comma separated, but a "space" separated list is fine with me too. Patch 6 is the remainder of the v4 of the original series. Splitting it up with ATTRIBUTE_UNUSED markers just no longer made sense. Lots of changes here to keep up with the previous patches, but also to adjust error messages, variable/API names, etc. Also changed were the secret alias (leading to adjustments in each of the .args file for the secret alias. Along the way I also had to adjust the expected encoded ciphertext and iv since the mock algorithm changed from all 0xff to an increasing sequence starting at 0x00 through the length of the buffer. John Ferlan (6): tests: Add mock for virRandomBytes util: Introduce encryption APIs util: Introduce virCryptoGenerateRandom qemu: Introduce qemuDomainSecretSetup tests: Allow comma separate list of libs to preload qemu: Utilize qemu secret objects for RBD auth/secret configure.ac | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 23 ++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 117 ++++++++++- src/qemu/qemu_domain.c | 200 +++++++++++++----- src/util/vircrypto.c | 233 ++++++++++++++++++++- src/util/vircrypto.h | 22 +- tests/Makefile.am | 12 ++ ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 31 +++ ...emuxml2argv-disk-drive-network-rbd-auth-AES.xml | 42 ++++ tests/qemuxml2argvmock.c | 16 ++ tests/qemuxml2argvtest.c | 5 +- tests/testutils.c | 12 +- tests/vircryptotest.c | 100 ++++++++- tests/virrandommock.c | 39 ++++ tests/virrandomtest.c | 86 ++++++++ 17 files changed, 879 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml create mode 100644 tests/virrandommock.c create mode 100644 tests/virrandomtest.c -- 2.5.5

2 16

[libvirt] VirtualBox 5 support
by Martin Pietsch 20 May '16

20 May '16

Dear libvirt-developer-team, I want to manage virtual machine of VirtualBox with libvirt. In a test I found out, that VirtualBox 5 is not support by the current version of libvirt. For this reason I have added this support in the source code. Now I want to commit these changes to the libvirt project, but I do not know, if there are any interests. Who can help me? Best Regards Martin -- Martin Pietsch Technische Univeristät Dresden Fakultät Mathematik und Naturwissenschaften / Fachrichtung Mathematik Besucheranschrift Willersbau, C-Flügel (Anbau), Raum C 232 Zellescher Weg 12-14 01069 Dresden Postanschrift Technische Universität Dresden Fachrichtung Mathematik 01062 Dresden Telefon +49-351-463 32646 Fax +49-351-463 37114 E-Mail martin.pietsch(a)tu-dresden.de

5 4

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

20 May '16

Behold! This is not a trivial patch set and you will need a lot of courage to review it. Sorry. I hadn't had a nice time writing the patches neither. Michal Privoznik (3): tests: Drop VIR_MOCK_CALL_STAT virtestmock: Mock stat() properly tests: Link virtestmock with probes cfg.mk | 3 ++ configure.ac | 1 + tests/Makefile.am | 1 + tests/vircgroupmock.c | 14 +++---- tests/virmock.h | 23 ----------- tests/virpcimock.c | 19 ++++----- tests/virtestmock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 124 insertions(+), 43 deletions(-) -- 2.8.1

2 6

[libvirt] [PATCH 0/2] qemu: reject invalid video accel* settings
by Cole Robinson 20 May '16

20 May '16

This series adds a couple checks for invalid video accel* settings, incase users screw up their XML when trying to enable spice GL Cole Robinson (2): qemu: command: Error if accel3d isn't supported for non-virtio qemu: command: Explicitly error if accel2d specified src/qemu/qemu_command.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) -- 2.7.4

2 4

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

20 May '16

The first 8 patches are cleanups and refactors of the graphics code. 9th patch introduces listen type socket and updates VNC graphics to use that new listen type. Patches 10 and 11 implements listen type socket for SPICE graphics and patch 12 adds spice_auto_unix_socket config option into qemu.conf. The last two patches introduces and implements new listen type none for VNC and SPICE graphics. The listen type none and socket are required to enable OpenGL support for SPICE graphics. Changes in v4: - removed the port patch that will be posted later as separate patch series - reordered some patches and added some more cleanups Changes in v3: - add listen type none support for vnc - fix issues pointed out in v2 Changes in v2: - don't remove vnc_auto_unix_socket from qemu.conf - add spice_auto_unix_socket Pavel Hrdina (14): qemu_domain: add a empty listen type address if we remove socket for VNC tests: cleanup vnc auto socket test graphics: rename gListen to glisten domain_conf: introduce virDomainGraphicsAddListenAddr qemu_command: move sasl parameter after port and addr definition graphics: resolve address for listen type network in qemu_process qemu_process: separate graphics socket and address generation qemu_command: refactor spice channel code 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 | 314 ++++++++++++++++----- src/conf/domain_conf.h | 8 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 16 +- 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 | 276 ++++++++---------- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 34 ++- src/qemu/qemu_hotplug.c | 9 + src/qemu/qemu_migration.c | 49 +++- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 130 +++++++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/virt-aa-helper.c | 15 +- src/vbox/vbox_common.c | 10 +- src/vmx/vmx.c | 8 +- src/vz/vz_sdk.c | 8 +- src/xenconfig/xen_common.c | 14 +- src/xenconfig/xen_sxpr.c | 16 +- src/xenconfig/xen_xl.c | 8 +- ...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 +- ...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-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-socket.args | 20 ++ .../qemuxml2argv-graphics-spice-socket.xml | 30 ++ .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args | 22 ++ .../qemuxml2argv-graphics-vnc-auto-socket-cfg.xml | 34 +++ .../qemuxml2argv-graphics-vnc-auto-socket.args | 20 ++ .../qemuxml2argv-graphics-vnc-auto-socket.xml | 30 ++ .../qemuxml2argv-graphics-vnc-autosocket.args | 22 -- .../qemuxml2argv-graphics-vnc-autosocket.xml | 34 --- .../qemuxml2argv-graphics-vnc-none.args | 20 ++ .../qemuxml2argv-graphics-vnc-none.xml | 30 ++ ...2argv-graphics-vnc-remove-generated-socket.args | 22 ++ ...l2argv-graphics-vnc-remove-generated-socket.xml | 34 +++ .../qemuxml2argv-graphics-vnc-socket.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 10 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 18 ++ ...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-cfg.xml | 41 +++ .../qemuxml2xmlout-graphics-vnc-auto-socket.xml | 35 +++ .../qemuxml2xmlout-graphics-vnc-autosocket.xml | 39 --- ...graphics-vnc-remove-generated-socket-active.xml | 41 +++ ...aphics-vnc-remove-generated-socket-inactive.xml | 41 +++ .../qemuxml2xmlout-graphics-vnc-socket.xml | 35 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 4 +- tests/qemuxml2xmltest.c | 20 +- 67 files changed, 1530 insertions(+), 439 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-cfg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml -- 2.8.2

3 27

[libvirt] [PATCH] cpu: Add support for clflushopt and tsc_adjust Intel features
by Alexander Burluka 20 May '16

20 May '16

Corresponding QEMU commits: clflushopt f7fda280948a5e74aeb076ef346b991ecb173c56 tsc_adjust 7b458bfd12a71b3da6b531daedc417492c9334e0 Signed-off-by: Alexander Burluka <aburluka(a)virtuozzo.com> --- src/cpu/cpu_map.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..08aded2 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -293,6 +293,9 @@ <feature name='fsgsbase'> <cpuid function='0x00000007' ebx='0x00000001'/> </feature> + <feature name='tsc_adjust'> + <cpuid function='0x00000007' ebx='0x00000002'/> + </feature> <feature name='bmi1'> <cpuid function='0x00000007' ebx='0x00000008'/> </feature> @@ -332,6 +335,9 @@ <feature name='smap'> <cpuid function='0x00000007' ebx='0x00100000'/> </feature> + <feature name='clflushopt'> + <cpuid function='0x00000007' ebx='0x00800000'/> + </feature> <feature name='avx512pf'>  <cpuid function='0x00000007' ebx='0x04000000'/> </feature> -- 1.8.3.1

2 4

[libvirt] Process to upstream new driver for proprietary hypervisor?
by Scott Bissett 20 May '16

20 May '16

Hello, I am currently implementing a libvirt driver for my company's proprietary custom hypervisor. I have used the VMware driver as a design template, since it is interfacing a closed-source hypervisor as well. Ultimately, as we approach a minimally-usable implementation, we would like to upstream our driver mods to libvirt source. What is the process to do so? This is all new to me and my organization. For some brief background info, I am maintaining a git repo of our new code, plus ed scripts to modify libvirt source files. I am using quilt to create patches which are given to dpkg-buildpackage to create our own .deb packages. (I am working on Ubuntu at the moment; soon I will try to address repackaging rpms for CentOS). I appreciate any tips, pointers, suggestions, etc.

3 2

[libvirt] RFC: what are the requirements to domain id
by Nikolay Shirokovskiy 20 May '16

20 May '16

Hi, all. Domain id is somewhat required feature for hypervisors: virsh list prints them by default and active/inactive distinction is based on this id value analysys. But other than -1 is reserved for inactive domains there is no further requirements for it, one can happily keep them 0 for active domains. Looks like some drivers use process pids for this purpose. Qemu driver use its own incrementing counter and domain ids endure libvirtd restart. Vz do not provide a suitable value so the question arises can some simple id implementation be good enough? By simple I mean to keep counter as long as daemon lives and do not introduce any additional persistent state. As I said before there is basically no option to not to support it. A more profound question is what is this id for? How it is supposed to be used? Nikolay

4 5

[libvirt] [PATCH 0/3] RFC: qemu: drop vioserialaddr cache
by Cole Robinson 20 May '16

20 May '16

qemuDomainObjPrivate caches three lists of device addresses: virDomainPCIAddressSetPtr pciaddrs; virDomainCCWAddressSetPtr ccwaddrs; virDomainVirtioSerialAddrSetPtr vioserialaddrs; Yet I can't quite tell what issue they fix... they are only used at hotplug time for checking for address collisions, however it appears that we can generate those lists on demand from the runtime XML, which contains all the info we need. In truth I only looked deeply at the vioserialaddrs list... perhaps PCI has more to it. But at least for virtio serial it looks like this caching can be dropped. CCing jtomko who originally added it If this is acceptable, dropping all the caching will be a step towards unifying all uses of qemuDomainAssignAddresses, rather than sprinkling around a dozen call sites throughout the code. Also (again if this is acceptable), there's more cleanup to do here, dropping some now unused code in domain_addr Cole Robinson (3): domain: Add virDomainVirtioSerialAddrSetCreateFromDomain qemu: hotplug: generate vioserial address list on demand qemu: remove vioserialaddr cache src/conf/domain_addr.c | 35 ++++++++++++++++++++++++++++++++--- src/conf/domain_addr.h | 7 ++----- src/libvirt_private.syms | 3 +-- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 28 +++------------------------- src/qemu/qemu_hotplug.c | 37 +++++++++++++++++++++++++------------ src/qemu/qemu_process.c | 2 -- 8 files changed, 63 insertions(+), 51 deletions(-) -- 2.7.4

3 6

[libvirt] [PATCH] Add Skylake Cpu Model
by Eli Qiao 20 May '16

20 May '16

Add Skylake Cpu model to cpu maps to let libvirt discover host Skylake cpu model correctly. Currently, libvirt still think a Skylake cpu as Broadwell-noTSX Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- src/cpu/cpu_map.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..228851d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -347,6 +347,21 @@ <cpuid function='0x80000007' edx='0x00000100'/> </feature> +  + <feature name='xsaveopt'> + <cpuid function='0xd' eax='0x00000001'/> + </feature> + <feature name='xsavec'> + <cpuid function='0xd' eax='0x00000002'/> + </feature> + <feature name='xgetbv1'> + <cpuid function='0xd' eax='0x00000004'/> + </feature> + <feature name='xsaves' migratable='no'> + <cpuid function='0xd' eax='0x00000008'/> + </feature> + +  <model name='486'> <feature name='fpu'/> @@ -1137,6 +1152,67 @@ <feature name='xsave'/> </model> + <model name='Skylake'> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> + +  <model name='athlon'> <vendor name='AMD'/> -- 1.9.1

3 3

[libvirt] [PATCH v2 0/7] cpuGetModels: Create a NULL-terminated list
by Jiri Denemark 20 May '16

20 May '16

The list of CPU models is freed using virStringFreeList, which expects the list to by NULL-terminated. Jiri Denemark (7): cpu_x86: Use array of models in CPU map cpu_x86: Use array of vendors in CPU map cpu_x86: Use array of features in CPU map cpu_ppc64: Use array of vendors in CPU map cpu_ppc64: Use array of models in CPU map cpu: Rework CPU map loading cpu: Fix documentation of cpuGetModels src/cpu/cpu.c | 2 +- src/cpu/cpu_map.c | 21 +- src/cpu/cpu_map.h | 2 + src/cpu/cpu_ppc64.c | 216 +++++------ src/cpu/cpu_x86.c | 395 +++++++++++---------- tests/cputestdata/x86-baseline-3-expanded.xml | 62 ++-- tests/cputestdata/x86-baseline-4-expanded.xml | 80 ++--- tests/cputestdata/x86-baseline-4-result.xml | 18 +- tests/cputestdata/x86-baseline-5-expanded.xml | 80 ++--- tests/cputestdata/x86-baseline-5-result.xml | 8 +- tests/cputestdata/x86-baseline-6-migratable.xml | 8 +- tests/cputestdata/x86-baseline-6-result.xml | 10 +- .../cputestdata/x86-host+guest,model486-result.xml | 62 ++-- .../x86-host+guest,models,Penryn-result.xml | 14 +- .../x86-host+guest,models,qemu64-result.xml | 14 +- tests/cputestdata/x86-host+guest,models-result.xml | 14 +- tests/cputestdata/x86-host+guest-result.xml | 10 +- ...6-host+host+host-model,models,Penryn-result.xml | 28 +- tests/cputestdata/x86-host+min.xml | 26 +- tests/cputestdata/x86-host+pentium3.xml | 46 +-- .../x86-host+strict-force-extra-result.xml | 28 +- ...aswell-noTSX+Haswell,haswell,Haswell-result.xml | 2 +- ...+Haswell-noTSX,haswell,Haswell-noTSX-result.xml | 2 +- .../x86-host-better+pentium3,core2duo-result.xml | 32 +- .../x86-host-better+pentium3,pentium3-result.xml | 50 +-- .../x86-host-better+pentium3-result.xml | 26 +- tests/cputestdata/x86-host-worse+guest-result.xml | 6 +- .../qemuxml2argv-cpu-Haswell2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 4 +- .../qemuxml2argv-cpu-host-model-vendor.args | 4 +- .../qemuxml2argv-cpu-host-model.args | 4 +- .../qemuxml2argv-cpu-minimum1.args | 4 +- .../qemuxml2argv-cpu-minimum2.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 4 +- 38 files changed, 658 insertions(+), 638 deletions(-) -- 2.8.2

2 9

[libvirt] [PATCH] docs: fix <spice><gl enable> since version
by Ján Tomko 20 May '16

20 May '16

The support was added by commit 937ebba which was released in 1.3.3. --- Pushed as trivial. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1336c82..1333796 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5267,7 +5267,7 @@ qemu-kvm -net nic,model=? /dev/null Spice may provide accelerated server-side rendering with OpenGL. You can enable or disable OpenGL support explicitly with the <code>gl</code> element, by setting the <code>enable</code> - property. (QEMU only, <span class="since">since 1.3.2</span>). + property. (QEMU only, <span class="since">since 1.3.3</span>). </p> </dd> <dt><code>rdp</code></dt> -- 2.7.3

1 0

[libvirt] [PATCH 0/7] More QEMU_CAPS_DEVICE cleanups
by Ján Tomko 20 May '16

20 May '16

While looking at Laine's patches I found uses of ADDRESS_TYPE_PCI in functions that are only called on !QEMU_CAPS_DEVICE (i.e. never). Then I cleaned up some more code until I remembered Cole already started doing that. So I included the only patch I could apply easily. Cole Robinson (1): qemu: process: Drop !QEMU_CAPS_DEVICE code Ján Tomko (6): Remove qemuProcessInitPCIAddresses with dependencies qemu: always add -nodefaults Remove DISK_BUS_XEN support from qemuBuildDiskDriveCommandLine Assume QEMU_CAPS_DEVICE in qemuBuildDiskDriveCommandLine Introduce qemuDiskBusNeedsDeviceArg Do not mask QEMU_CAPS_DEVICE in qemuBuildDriveStr src/qemu/qemu_command.c | 90 ++-- src/qemu/qemu_monitor.c | 15 - src/qemu/qemu_monitor.h | 10 - src/qemu/qemu_monitor_json.c | 9 - src/qemu/qemu_monitor_json.h | 3 - src/qemu/qemu_monitor_text.c | 126 ------ src/qemu/qemu_monitor_text.h | 3 - src/qemu/qemu_process.c | 463 ++------------------- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 -- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 51 --- tests/qemuargv2xmltest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 -- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 47 --- tests/qemuxml2argvtest.c | 1 - .../qemuxml2xmlout-disk-xenvbd.xml | 51 --- tests/qemuxml2xmltest.c | 1 - 16 files changed, 48 insertions(+), 874 deletions(-) delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.7.3

2 11

[libvirt] [PATCH v3 1/1] perf: add support to perf event for MBM
by Qiaowei Ren 20 May '16

20 May '16

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some RDT (Resource Director Technology) features to monitor or control shared resource. Among these features, MBM (Memory Bandwidth Monitoring), which is build on the CMT (Cache Monitoring Technology) infrastructure, provides OS/VMM a way to monitor bandwidth from one level of cache to another. With current perf framework, this patch adds support to perf event for MBM. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- include/libvirt/libvirt-domain.h | 26 ++++++++++++++++- src/libvirt-domain.c | 12 ++++++++ src/qemu/qemu_driver.c | 41 +++++++++++++++++++------- src/util/virperf.c | 63 ++++++++++++++++++++++++---------------- src/util/virperf.h | 2 ++ 5 files changed, 108 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 160f20f..27ed29a 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1900,10 +1900,34 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); /** * VIR_PERF_PARAM_CMT: * - * Macro for typed parameter name that represents CMT perf event. + * Macro for typed parameter name that represents CMT perf event + * which can be used to measure the usage of cache (bytes) by + * applications running on the platform. It corresponds to the + * "perf.cmt" field in the *Stats APIs. */ # define VIR_PERF_PARAM_CMT "cmt" +/** + * VIR_PERF_PARAM_MBMT: + * + * Macro for typed parameter name that represents MBMT perf event + * which can be used to monitor total system bandwidth (bytes/s) + * from one level of cache to another. It corresponds to the + * "perf.mbmt" field in the *Stats APIs. + + */ +# define VIR_PERF_PARAM_MBMT "mbmt" + +/** + * VIR_PERF_PARAM_MBML: + * + * Macro for typed parameter name that represents MBML perf event + * which can be used to monitor the amount of data (bytes/s) sent + * through the memory controller on the socket. It corresponds to + * the "perf.mbml" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_MBML "mbml" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4f473c9..73ae369 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11441,6 +11441,18 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "block.<num>.physical" - physical size in bytes of the container of the * backing image as unsigned long long. * + * VIR_DOMAIN_STATS_PERF: Return perf event statistics. + * The typed parameter keys are in this format: + * "perf.cmt" - the usage of l3 cache (bytes) by applications running on the + * platform as unsigned long long. It is produced by cmt perf + * event. + * "perf.mbmt" - the total system bandwidth (bytes/s) from one level of cache + * to another as unsigned long long. It is produced by mbmt perf + * event. + * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller + * on the socket as unsigned long long. It is produced by mbml + * perf event. + * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not * applicable for the current state of the guest domain, or their retrieval diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c4c4968..670f620 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10051,6 +10051,8 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (virTypedParamsValidate(params, nparams, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19494,24 +19496,38 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM +#define QEMU_ADD_PERF_PARAM_ULL(record, maxparams, name, value) \ +do { \ + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \ + "perf.%s", name); \ + if (virTypedParamsAddULLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + param_name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + static int -qemuDomainGetStatsPerfCmt(virPerfPtr perf, +qemuDomainGetStatsPerfRdt(virPerfPtr perf, + virPerfEventType type, virDomainStatsRecordPtr record, int *maxparams) { - uint64_t cache = 0; + uint64_t value = 0; - if (virPerfReadEvent(perf, VIR_PERF_EVENT_CMT, &cache) < 0) + if (virPerfReadEvent(perf, type, &value) < 0) return -1; - if (virTypedParamsAddULLong(&record->params, - &record->nparams, - maxparams, - "perf.cache", - cache) < 0) - return -1; + QEMU_ADD_PERF_PARAM_ULL(record, maxparams, + virPerfEventTypeToString(type), + value); return 0; + + cleanup: + return -1; } static int @@ -19531,7 +19547,10 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, switch (i) { case VIR_PERF_EVENT_CMT: - if (qemuDomainGetStatsPerfCmt(priv->perf, record, maxparams) < 0) + case VIR_PERF_EVENT_MBMT: + case VIR_PERF_EVENT_MBML: + if (qemuDomainGetStatsPerfRdt(priv->perf, i, + record, maxparams) < 0) goto cleanup; break; } @@ -19543,6 +19562,8 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, return ret; } +#undef QEMU_ADD_PERF_PARAM_ULL + typedef int (*qemuDomainGetStatsFunc)(virQEMUDriverPtr driver, virDomainObjPtr dom, diff --git a/src/util/virperf.c b/src/util/virperf.c index bd65587..450b3ba 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt"); + "cmt", "mbmt", "mbml"); struct virPerfEvent { int type; @@ -110,10 +110,10 @@ virPerfGetEvent(virPerfPtr perf, } static int -virPerfCmtEnable(virPerfEventPtr event, +virPerfRdtEnable(virPerfEventPtr event, pid_t pid) { - struct perf_event_attr cmt_attr; + struct perf_event_attr rdt_attr; char *buf = NULL; char *tmp = NULL; unsigned int event_type, scale; @@ -127,32 +127,42 @@ virPerfCmtEnable(virPerfEventPtr event, if (virStrToLong_ui(buf, NULL, 10, &event_type) < 0) { virReportSystemError(errno, "%s", - _("failed to get cmt event type")); + _("failed to get rdt event type")); goto error; } VIR_FREE(buf); - if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", - 10, &buf) < 0) - goto error; + memset(&rdt_attr, 0, sizeof(rdt_attr)); + rdt_attr.size = sizeof(rdt_attr); + rdt_attr.type = event_type; + rdt_attr.inherit = 1; + rdt_attr.disabled = 1; + rdt_attr.enable_on_exec = 0; - if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { - virReportSystemError(errno, "%s", - _("failed to get cmt scaling factor")); - goto error; + switch (event->type) { + case VIR_PERF_EVENT_CMT: + if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", + 10, &buf) < 0) + goto error; + + if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { + virReportSystemError(errno, "%s", + _("failed to get cmt scaling factor")); + goto error; + } + event->efields.cmt.scale = scale; + + rdt_attr.config = 1; + break; + case VIR_PERF_EVENT_MBMT: + rdt_attr.config = 2; + break; + case VIR_PERF_EVENT_MBML: + rdt_attr.config = 3; + break; } - event->efields.cmt.scale = scale; - - memset(&cmt_attr, 0, sizeof(cmt_attr)); - cmt_attr.size = sizeof(cmt_attr); - cmt_attr.type = event_type; - cmt_attr.config = 1; - cmt_attr.inherit = 1; - cmt_attr.disabled = 1; - cmt_attr.enable_on_exec = 0; - - event->fd = syscall(__NR_perf_event_open, &cmt_attr, pid, -1, -1, 0); + event->fd = syscall(__NR_perf_event_open, &rdt_attr, pid, -1, -1, 0); if (event->fd < 0) { virReportSystemError(errno, _("Unable to open perf type=%d for pid=%d"), @@ -161,8 +171,9 @@ virPerfCmtEnable(virPerfEventPtr event, } if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { - virReportSystemError(errno, "%s", - _("Unable to enable perf event for CMT")); + virReportSystemError(errno, + _("Unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); goto error; } @@ -186,7 +197,9 @@ virPerfEventEnable(virPerfPtr perf, switch (type) { case VIR_PERF_EVENT_CMT: - if (virPerfCmtEnable(event, pid) < 0) + case VIR_PERF_EVENT_MBMT: + case VIR_PERF_EVENT_MBML: + if (virPerfRdtEnable(event, pid) < 0) return -1; break; case VIR_PERF_EVENT_LAST: diff --git a/src/util/virperf.h b/src/util/virperf.h index 8ec8753..769e85a 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -26,6 +26,8 @@ typedef enum { VIR_PERF_EVENT_CMT, + VIR_PERF_EVENT_MBMT, + VIR_PERF_EVENT_MBML, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

3 2

[libvirt] [PATCH] tests: nodeinfotest: Remove virSaveLastError() usage
by Cole Robinson 19 May '16

19 May '16

It's overkill here, we can use virGetLast* instead --- tests/nodeinfotest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index d8eace5..03500fb 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -44,10 +44,8 @@ linuxTestCompareFiles(char *sysfs_prefix, memset(&nodeinfo, 0, sizeof(nodeinfo)); if (linuxNodeInfoCPUPopulate(sysfs_prefix, cpuinfo, arch, &nodeinfo) < 0) { if (virTestGetDebug()) { - virErrorPtr error = virSaveLastError(); - if (error && error->code != VIR_ERR_OK) - VIR_TEST_DEBUG("\n%s\n", error->message); - virFreeError(error); + if (virGetLastError()) + VIR_TEST_DEBUG("\n%s\n", virGetLastErrorMessage()); } VIR_FORCE_FCLOSE(cpuinfo); goto fail; -- 2.7.4

2 1

[libvirt] [PATCH v3 0/3] More usage of virGetLastErrorMessage()
by Jovanka Gulicoska 19 May '16

19 May '16

Use virGetLastErrorMessage() instead of virGetLastError() Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#More_usage_of_virGetLastErrorMe… Jovanka Gulicoska (3): tests: nodeinfotest: Convert to virGetLastErrorMessage() tests: More usage of virGetLastErrorMessage() More usage of virGetLastErrorMessage daemon/libvirtd.c | 8 +--- examples/object-events/event-test.c | 9 ++--- src/bhyve/bhyve_driver.c | 3 +- src/conf/virsecretobj.c | 5 +-- src/libvirt.c | 3 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 4 +- src/locking/lock_daemon.c | 8 +--- src/logging/log_daemon.c | 8 +--- src/lxc/lxc_container.c | 9 ++--- src/lxc/lxc_controller.c | 9 ++--- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_process.c | 6 +-- src/rpc/virnettlscontext.c | 3 +- src/storage/storage_driver.c | 16 ++------ src/uml/uml_driver.c | 3 +- src/util/iohelper.c | 10 +---- src/util/virhook.c | 3 +- src/util/virhostdev.c | 20 ++++----- tests/commandtest.c | 81 +++++++++++++------------------------ tests/libvirtdconftest.c | 26 ++++++------ tests/nodeinfotest.c | 8 ++-- tests/openvzutilstest.c | 7 +--- tests/qemucapsprobe.c | 6 +-- tests/securityselinuxtest.c | 6 +-- 25 files changed, 91 insertions(+), 177 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH 0/6] conf: qemu: Introduce relaxed config validation
by Peter Krempa 19 May '16

19 May '16

Recently I NACKed quite a few patches attempting to add checks to the post parse callback infrastructure that would inhbit configs from being loaded after daemon restart. To solve this introduce a new infrastructure that will get called only on codepaths that define and start the config leaving the code paths that load configs untouched. Peter Krempa (6): conf: disk: Rename virDomainDiskDefValidate to virDomainDiskDefParseValidate qemu: driver: Fix function header alignment of some functions conf: Introduce infrastructure to add config validation to define time qemu: Move check that validates 'min_guarantee' to qemuDomainDefValidate conf: Move check that validates disk info to virDomainDefValidate conf: Add validation infrastructure for device hot/cold plug src/conf/domain_conf.c | 128 +++++++++++++++++++++++++++++++++++++++-------- src/conf/domain_conf.h | 11 ++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 38 ++++++++++++++ src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 26 ++++++++-- src/qemu/qemu_process.c | 19 ++++--- 8 files changed, 190 insertions(+), 40 deletions(-) -- 2.8.2

5 15

[libvirt] [PATCH 0/3] More usage of virGetLastErrorMessage()
by Jovanka Gulicoska 19 May '16

19 May '16

v2 of patches Use virGetLastErrorMessage() insted of virGetLastError() Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#More_usage_of_virGetLastErrorMe… Jovanka Gulicoska (3): virGetLastErrorMessage() in tests More usage of virGetLastErrorMessage() virGetLastErrorMessage in nodeinfotest daemon/libvirtd.c | 8 +--- examples/object-events/event-test.c | 9 ++--- src/bhyve/bhyve_driver.c | 3 +- src/conf/virsecretobj.c | 5 +-- src/libvirt.c | 3 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 4 +- src/locking/lock_daemon.c | 8 +--- src/logging/log_daemon.c | 8 +--- src/lxc/lxc_container.c | 9 ++--- src/lxc/lxc_controller.c | 9 ++--- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_process.c | 6 +-- src/rpc/virnettlscontext.c | 3 +- src/storage/storage_driver.c | 16 ++------ src/uml/uml_driver.c | 3 +- src/util/iohelper.c | 10 +---- src/util/virhook.c | 3 +- src/util/virhostdev.c | 20 ++++----- tests/commandtest.c | 81 +++++++++++++------------------------ tests/libvirtdconftest.c | 26 ++++++------ tests/nodeinfotest.c | 8 ++-- tests/openvzutilstest.c | 7 +--- tests/qemucapsprobe.c | 6 +-- tests/securityselinuxtest.c | 6 +-- 25 files changed, 91 insertions(+), 177 deletions(-) -- 2.5.5

2 7

[libvirt] [PATCH] tests: Add forgotten backslash
by Michal Privoznik 19 May '16

19 May '16

While introducing virtestmock.la, I've forgotten to add '\' at the end of one line leaving our Makefile.am mangled. Fortunately, the only thing that comes after is '$(NULL)' so nothing is terribly broken. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 238f6da..c7c9a03 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -447,7 +447,7 @@ endif WITH_DBUS if WITH_LINUX test_libraries += virusbmock.la \ virnetdevbandwidthmock.la \ - virtestmock.la + virtestmock.la \ $(NULL) endif WITH_LINUX -- 2.8.1

1 0

[libvirt] [PATCH 0/4] Remove need for STATIC_ANALYSIS in viralloc.h
by John Ferlan 19 May '16

19 May '16

Not sure which release exactly, but the coverity analysis bug I filed that was the reason for commit id 'c9a85af31' has been fixed, so it's time to remove that... In doing so uncovered another issue - it seems the fix for Coverity addressed the primary problem we've seen, but when there's functions returning allocated strings by reference that can also VIR_FREE(*string), whatever was added to address the main issue doesn't seem to recognize this other usage, resulinting in a false positive resource_leak. Luckily there's only two instances in our code for that. One is addressed by patch 3 and the other in virPCIDeviceGetDriverPathAndName which would require quite a few more changes to address (essentially split up the function - it'll be on my "to do" list). Patch 1: Addresses an issue seen once patches 2-4 were applied - that there's a real problem with the error path. It's a simple fix. Patches 2 & 3: Address a false positive resource leak even with patch 4 applied. Patch 4: Remove the rather ugly !STATIC_ANALYSIS within the VIR_FREE and VIR_DISPOSE* macros. As I found with a build after the fact, VIR_DISPOSE_STRING was missing an argument anyway (it should have been ": 0, 1, NULL" instead of ": 1, NULL"). NB: Patch 4 has been run through the private coverity server... John Ferlan (4): util: Fix error path for virPCIGetVirtualFunctions util: Remove need for ret in virPCIGetPhysicalFunction util: Adjust return for virPCIGetDeviceAddressFromSysfsLink util: Remove need for STATIC_ANALYSIS check src/util/viralloc.h | 34 ++++++---------------------------- src/util/virpci.c | 39 +++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 48 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH 0/3] Patches to set up the secret encryption
by John Ferlan 19 May '16

19 May '16

Based on v4 of the AES secret object series: http://www.redhat.com/archives/libvir-list/2016-May/msg01292.html Could have been an RFC too... Precursor for the AES secret object patches - figured I'd make sure this was the "right path" and hopefully to get some help with the mock environment since the virRandomBytes would move out of qemuxml2argvtest. Patch 3 is new and will work independent of 1 & 2, although it would be nice to alther the vircryptotest to use a mocked virRandomBytes rather than seeing the encalg and iv with what the mocked code would return. John Ferlan (3): tests: Add mock for virRandomBytes tests: Need help... Trying to add virRandomBytes mock util: Introduce encryption APIs configure.ac | 1 + src/libvirt_private.syms | 2 + src/util/vircrypto.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++- src/util/vircrypto.h | 20 ++++- tests/Makefile.am | 16 ++++ tests/commandhelper.c | 1 + tests/vircryptotest.c | 86 +++++++++++++++++++++ tests/virrandommock.c | 56 ++++++++++++++ tests/virrandomtest.c | 86 +++++++++++++++++++++ 9 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 tests/virrandommock.c create mode 100644 tests/virrandomtest.c -- 2.5.5

2 9

[libvirt] hotplug support for "filesystem" devices?
by Snyder, Emile 19 May '16

19 May '16

Hello all, I'm a newbie to libvirt, coming to it because I'm trying to understand how to provide the ability to attach/detach network filesystem shares to openstack guest instances in something analogous to the way block devices can be now. While playing with the existing virtfs/9p support for qemu, I found that I can't use virsh to attach a "filesystem" device while the VM is running. For example, I create a snippet of XML like <filesystem type='mount' accessmode='mapped'> <source dir='/tmp/share'/> <target dir='share_tag'/> </filesystem> and then try: stack@devstack-8366:~/devstack$ virsh list Id Name State ---------------------------------------------------- 3 instance-00000002 running 5 instance-00000004 running 8 instance-00000007 running stack@devstack-8366:~/devstack$ virsh attach-device 8 share.xml error: Failed to attach device from share.xml error: Operation not supported: live attach of device 'filesystem' is not supported I see that error coming from src/qemu/qemu_driver.c in the qemuDomainAttachDeviceLive function. Can anyone tell me if this is something that is going to be hard or easy to make possible? Pointers to where I should look in the source, or in qemu? Is anyone working it already? Any advice at all welcome, Thanks -Emile Snyder

2 1

[libvirt] [PATCH 0/3] qemu: Don't get stuck in bulk-stats API on broken NFS
by Peter Krempa 19 May '16

19 May '16

Accessing VM disk files while we weren't able to get the stats from qemu directly as it was most probably stuck on missing storage will make libvrtd's thread handling the stats get stuck. Avoid touching files in such case. Peter Krempa (3): qemu: driver: Remove unnecessary flag in qemuDomainGetStatsBlock qemu: driver: Separate bulk stats worker for block devices qemu: bulk stats: Don't access possibly blocked storage src/qemu/qemu_driver.c | 78 +++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 29 deletions(-) -- 2.8.2

2 6

[libvirt] [PATCH v2 0/2] qemu: parse: Introduce qemuParseCommandLineMem
by Nishith Shah 19 May '16

19 May '16

This series moves the parsing of qemu -m memory into a separate function and adds suffix support for the -m option. The first patch introduces the function qemuParseCommandLineMem, and the second patch handles suffixes for the -m values and adds a test for the same. Nishith Shah (2): qemu: parse: Use qemuParseCommandLineMem for -m memory qemu: parse: Handle suffixes for -m memory src/qemu/qemu_parse_command.c | 38 ++++++++++++++++++---- tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args | 22 +++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml | 33 +++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml -- 2.1.4

3 7

[libvirt] [PATCH] Introduce gnutls_priority config option
by Ján Tomko 19 May '16

19 May '16

The defaults provided by gnutls_set_default_priority are not configurable at runtime. Introduce a new config option to libvirt.conf that will be passed to gnutls_priority_set. One of the possible options is "@SYSTEM", where gnutls will get the settings from /etc/gnutls/default-priorities. Note that the /etc/libvirt/libvirt.conf file is only used by libvirt processes running as root, for regular users the file in $XDG_CONFIG_HOME or ~/.config is used. https://bugzilla.redhat.com/show_bug.cgi?id=1333404 --- src/libvirt.conf | 6 +++++ src/rpc/virnettlscontext.c | 59 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/src/libvirt.conf b/src/libvirt.conf index da4dfbe..688c572 100644 --- a/src/libvirt.conf +++ b/src/libvirt.conf @@ -16,3 +16,9 @@ # (@uri_default also prevents probing of the hypervisor driver). # #uri_default = "qemu:///system" + +# +# Override the priority of exchange methods, ciphers etc. used by gnutls. +# See gnutls_priority_set_direct(3). +# +#gnutls_priority = "@SYSTEM" diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 947038d..e93887c 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "viralloc.h" +#include "virconf.h" #include "virerror.h" #include "virfile.h" #include "virutil.h" @@ -86,10 +87,17 @@ static virClassPtr virNetTLSContextClass; static virClassPtr virNetTLSSessionClass; static void virNetTLSContextDispose(void *obj); static void virNetTLSSessionDispose(void *obj); +static gnutls_priority_t *virNetTLSPriorityCache; static int virNetTLSContextOnceInit(void) { + virConfPtr conf = NULL; + virConfValuePtr value = NULL; + const char *err_pos; + int ret = -1; + int rc; + if (!(virNetTLSContextClass = virClassNew(virClassForObjectLockable(), "virNetTLSContext", sizeof(virNetTLSContext), @@ -102,7 +110,32 @@ static int virNetTLSContextOnceInit(void) virNetTLSSessionDispose))) return -1; - return 0; + if (virConfLoadConfig(&conf, NULL) < 0) + return -1; + + if ((value = virConfGetValue(conf, "gnutls_priority"))) { + if (value->type != VIR_CONF_STRING) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'gnutls_priority' config parameter")); + goto cleanup; + } + VIR_DEBUG("Using gnutls priority '%s'", value->str); + if (VIR_ALLOC(virNetTLSPriorityCache) < 0) + goto cleanup; + if ((rc = gnutls_priority_init(virNetTLSPriorityCache, value->str, + &err_pos)) != 0) { + VIR_FREE(virNetTLSPriorityCache); + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to initialize TLS session priority \"%s\": %s"), + err_pos, gnutls_strerror(rc)); + goto cleanup; + } + } + + ret = 0; + cleanup: + virConfFree(conf); + return ret; } VIR_ONCE_GLOBAL_INIT(virNetTLSContext) @@ -1224,14 +1257,22 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, goto error; } - /* avoid calling all the priority functions, since the defaults - * are adequate. - */ - if ((err = gnutls_set_default_priority(sess->session)) != 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to set TLS session priority %s"), - gnutls_strerror(err)); - goto error; + /* Use the defaults unless a priority string was specified in the + * config file */ + if (virNetTLSPriorityCache) { + if ((err = gnutls_priority_set(sess->session, *virNetTLSPriorityCache)) != 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set TLS session priority %s"), + gnutls_strerror(err)); + goto error; + } + } else { + if ((err = gnutls_set_default_priority(sess->session)) != 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set TLS session priority %s"), + gnutls_strerror(err)); + goto error; + } } if ((err = gnutls_credentials_set(sess->session, -- 2.7.3

2 3

[libvirt] [PATCH v7 0/5] vz: add migration support
by Nikolay Shirokovskiy 19 May '16

19 May '16

Difference from v6 ================== Minor fixes suggested by reviewer. Nikolay Shirokovskiy (5): vz: save session uuid on login vz: fix const correctness case vz: implement managed migration vz: implement p2p migration vz: cleanup: define vz format of uuids src/vz/vz_driver.c | 559 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 90 +++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.c | 2 +- src/vz/vz_utils.h | 7 +- 5 files changed, 648 insertions(+), 16 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH v2 0/5] admin: Introduce APIs to get/set client-related limits
by Erik Skultety 19 May '16

19 May '16

since v1: - symbols added to libvirt_remote.syms - APIs renamed - dropped some unwanted client-side flags checks - dropped unnecessary ifs before calling virAdmServerFree (because it handles NULL gracefully) - a man page entry virt-admin's commands created Erik Skultety (5): virnetserver: Introduce server's client-related limits getters admin: Introduce some public constants related to server's client limits admin: Introduce virAdmServerGetClientLimits admin: Introduce virAdmServerSetClientLimits virt-admin: Introduce commands srv-clients-info and srv-clients-set daemon/admin.c | 82 +++++++++++++++++++ daemon/admin_server.c | 76 ++++++++++++++++++ daemon/admin_server.h | 10 +++ include/libvirt/libvirt-admin.h | 52 ++++++++++++ src/admin/admin_protocol.x | 30 ++++++- src/admin/admin_remote.c | 74 +++++++++++++++++ src/admin_protocol-structs | 20 +++++ src/libvirt-admin.c | 85 ++++++++++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/libvirt_remote.syms | 4 + src/rpc/virnetserver.c | 83 +++++++++++++++++++ src/rpc/virnetserver.h | 9 +++ tools/virt-admin.c | 174 ++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.pod | 38 +++++++++ 15 files changed, 741 insertions(+), 1 deletion(-) -- 2.5.5

2 7

[libvirt] [PATCH] qemu: Don't lose VM runtime state on libvirt downgrade
by Cole Robinson 19 May '16

19 May '16

Run libvirtd from git with latest qemu, start a VM, stop libvirtd. Run an older libvirtd version an you may see an error like: qemuDomainObjPrivateXMLParse:857 : internal error: Unknown qemu capabilities flag device-tray-moved-event Libvirt finds a cached capabilities flag it doesn't understand, and fails to parse the VM runtime state. It now thinks the VM isn't running, when it is. This is potentially serious since it could lead to disk corruption if the VM is re-run. For the common case of unknown qemu capabilities flags, treat an unknown flag as non-fatal and continue on --- src/qemu/qemu_domain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b0eb3b6..dbf8124 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1411,18 +1411,18 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, goto error; for (i = 0; i < n; i++) { + int flag; char *str = virXMLPropString(nodes[i], "name"); - if (str) { - int flag = virQEMUCapsTypeFromString(str); - if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"), str); - VIR_FREE(str); - goto error; - } - VIR_FREE(str); + if (!str) + continue; + + flag = virQEMUCapsTypeFromString(str); + if (flag < 0) { + VIR_WARN("Unknown qemu capabilities flag %s", str); + } else { virQEMUCapsSet(qemuCaps, flag); } + VIR_FREE(str); } priv->qemuCaps = qemuCaps; -- 2.7.4

3 4

[libvirt] [PATCH] qemu_cgroup: allow access to /dev/dri for virtio-vga
by Ján Tomko 19 May '16

19 May '16

QEMU needs access to the /dev/dri/render* device for virgl to work. Allow access to all /dev/dri/* devices for domains with <video> <model type='virtio' heads='1' primary='yes'> <acceleration accel3d='yes'/> </model> </video> https://bugzilla.redhat.com/show_bug.cgi?id=1337290 --- src/qemu/qemu_cgroup.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1e04a68..d676d66 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -51,6 +51,7 @@ static const char *const defaultDeviceACL[] = { }; #define DEVICE_PTY_MAJOR 136 #define DEVICE_SND_MAJOR 116 +#define DEVICE_DRI_MAJOR 226 static int @@ -626,6 +627,19 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + if (vm->def->nvideos) { + virDomainVideoDefPtr vid = vm->def->videos[0]; + if (vid->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO && + vid->accel && vid->accel->accel3d) { + rv = virCgroupAllowDevice(priv->cgroup, 'c', DEVICE_DRI_MAJOR, -1, + VIR_CGROUP_DEVICE_RW); + virDomainAuditCgroupMajor(vm, priv->cgroup, "allow", DEVICE_DRI_MAJOR, + "sound", "rw", rv == 0); + if (rv < 0) + goto cleanup; + } + } + for (i = 0; deviceACL[i] != NULL; i++) { if (!virFileExists(deviceACL[i])) { VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]); -- 2.7.3

3 3

[libvirt] [PATCH v4 0/3] Add AES Secret Object support (for RBD only)
by John Ferlan 19 May '16

19 May '16

v3: http://www.redhat.com/archives/libvir-list/2016-May/msg00444.html Changes since v3 (by patch)... 1. Separate out the mock for virRandomBytes. I realize this is not the desired state, but figured to at least be prepared for what would be coming as a followup to: http://www.redhat.com/archives/libvir-list/2016-May/msg00735.html that I'd at least adjust the code to follow using a different random number generator (use increasing i instead of just 0xff for all) 2. Changes from code review... Change name from IV to AES, plus others qemuDomainSecretAESSetup is variable based on HAVE_GNUTLS_CIPHER_ENCRYPT Changes to utilize virStringEncodeBase64 Moved qemuDomainSecretSetup into this version (and made i 3. Split out mock (into patch 1) Comment cleanup Still unresolved from code review is a review comment in qemuBuildDriveStr regarding where the desire movement was. There's a very specific order to where the "password-secret=%s," can be placed. It just wasn't clear from the review comment where exactly it was expected to "move" those lines John Ferlan (3): tests: Add mock for virRandomBytes [NOT TO BE PUSHED] qemu: Introduce new Secret AES API's qemu: Utilize qemu secret objects for RBD auth/secret configure.ac | 1 + src/qemu/qemu_alias.c | 23 +++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 122 +++++++++++- src/qemu/qemu_domain.c | 206 ++++++++++++++++++++- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 31 ++++ ...emuxml2argv-disk-drive-network-rbd-auth-AES.xml | 42 +++++ tests/qemuxml2argvmock.c | 31 +++- tests/qemuxml2argvtest.c | 3 + 9 files changed, 451 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml -- 2.5.5

2 11

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

18 May '16

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

1 0

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

18 May '16

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

3 21

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

18 May '16

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

2 5

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

18 May '16

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

2 1

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

18 May '16

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

4 10

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

18 May '16

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

2 11

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

18 May '16

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

2 13

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

18 May '16

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

2 14

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

17 May '16

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

3 8

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

17 May '16

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

2 3

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

17 May '16

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

2 1

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

17 May '16

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

2 2

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

17 May '16

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

2 1

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

17 May '16

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

2 1

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

17 May '16

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

3 8

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

17 May '16

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

3 14

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

17 May '16

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

1 8

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

17 May '16

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

1 0

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

17 May '16

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

3 24

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

17 May '16

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

2 1

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

17 May '16

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

4 17

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

17 May '16

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

2 2

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

17 May '16

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

4 3

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

17 May '16

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

2 5

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

17 May '16

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

2 1

[libvirt] Need to re-work final "peer address" patches and re-push them
by Laine Stump 16 May '16

16 May '16

I reverted these three patches that introduced and enabled a "peer" attribute for type='ethernet' interface <ip> elements prior to the release of 1.3.4 with the intent of fixing/re-posting them after release, but forgot until today: https://www.redhat.com/archives/libvir-list/2016-April/msg01995.html I have patches for most of the bugs, but the one problem that still doesn't have resolution is the naming of the "peer" attribute. In my opinion, having the two address attributes named "address" and "peer" makes it ambiguous which address is for the guest side and which for the host side (especially since the attribute that has been named "peer" would be set to the "address" in the netlink command, and the attribute named "address" would be set to "peer" in the netlink command :-O). Since "address" is an existing attribute, and already used for the guest side IP address in lxc type='bridge' interfaces, it must remain as-is. In order to make it obvious that the new address is for the host side of the tap (or veth pair in the case of lxc), I propose calling it either "host", or "hostAddress", e.g: <ip address='192.168.123.43' host='192.168.123.1' prefix='25'/> or <ip address='192.168.123.4' hostAddress='192.168.123.1' prefix='25'/> (Vasiliy had suggested "hostPeer", but I dislike that, since it sounds like "the peer of the host", which is even more misleading). Can some of you normally-opinionated people weigh in on this? I don't like the feeling of making a unilateral decision :-) Also, I'm realizing that, although there was a patch to support setting the host-side address (hmm - "hostSide"? nah) for lxc type='bridge' interface, this is not at all useful, because anything plugged into a bridge should not have any IP on the side plugged into the bridge. The place where it would be useful for lxc would be (just as it is for qemu) with a type='ethernet' interface - the guest-side veth would have "address" and the host-side veth would have "hostAddress", and it would then properly work without needing a bridge (which I think is the entire point). Since lxc doesn't currently support type='ethernet', I think that initial support should be made for qemu only, and when type='ethernet is added to lxc, it can be made to support an IP address on both sides of the veth pair from the start. Lacking any useful responses, I'm thinking to update Vasiliy's patches to use "hostAddress" (and fix the other bugs I had found) and re-post them.

5 10

[libvirt] [PATCH 0/7] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 16 May '16

16 May '16

The series implements the PCI multifunction hotplug functionality. The first two patch reverts the old commits which forbade the multifunction addresses. Patch2 is added because the two reverts necessiates additional checks added in Patch3. Actual implementation starts patch 4 onwards. The semantics is to encapsulate all the functions in <devices/> tag as was previously explained. (http://www.spinics.net/linux/fedora/libvir/msg127921.html The series aims to support virtio devices also the hostdevices in the <devices>. The auto addess assignment is implemented here works well for ppc64 and pc-i440fx machines. Couldn't get it working on q35 machines. May be follow up patches for that. Todo: 1) Rollback the Hotplug of already hoplugged functions if any of the function hotplug fails. 2) Hardening the hotplug checks to disallow multifunction cards hotplug as though they are single function cards. 3) Documentation update. 4) Patch 6 may need some work across drivers to add similar checks as added in qemu_driver.c 5) Test cases. --- Shivaprasad G Bhat (7): Revert "prevent hot unplugging multi function PCI device" Release address in function granularity than slot Validate address in virDomainPCIAddressReleaseAddr Introduce PCI Multifunction device parser Introduce virDomainPCIMultifunctionDeviceAddressAssign Allow calling virHostdevPreparePCIDevices twice for same device Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 244 ++++++++++++++++++++++++++++- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 227 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 22 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 331 ++++++++++++++++++++++++++++++++-------- src/qemu/qemu_hotplug.c | 74 ++------- src/util/virhostdev.c | 16 ++ 9 files changed, 781 insertions(+), 144 deletions(-) -- Signature

1 7

[libvirt] [PATCH 0/7] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 16 May '16

16 May '16

The series implements the PCI multifunction hotplug functionality. The first two patch reverts the old commits which forbade the multifunction addresses. Patch2 is added because the two reverts necessiates additional checks added in Patch3. Actual implementation starts patch 4 onwards. The semantics is to encapsulate all the functions in <devices/> tag as was previously explained. (http://www.spinics.net/linux/fedora/libvir/msg127921.html) The series aims to support virtio devices and also the hostdevices in the <devices>. Auto-address assignment is implemented here works well for ppc64 and pc-i440fx machines. Couldn't get it working on q35 machines. May be follow up patches for that. TODO: 1) Rollback the Hotplug of already hoplugged functions if any of the function hotplug fails. 2) Hardening the hotplug checks to disallow multifunction cards hotplug as though they are single function cards. 3) Documentation update. 4) Patch 6 may need some work across drivers to add similar checks as added in qemu_driver.c 5) Test cases. --- Shivaprasad G Bhat (7): Revert "prevent hot unplugging multi function PCI device" Release address in function granularity than slot Validate address in virDomainPCIAddressReleaseAddr Introduce PCI Multifunction device parser Introduce virDomainPCIMultifunctionDeviceAddressAssign Allow calling virHostdevPreparePCIDevices twice for same device Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 244 ++++++++++++++++++++++++++++- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 227 +++++++++++++++++++++++++++ src/conf/domain_conf.h | 22 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 331 ++++++++++++++++++++++++++++++++-------- src/qemu/qemu_hotplug.c | 74 ++------- src/util/virhostdev.c | 16 ++ 9 files changed, 781 insertions(+), 144 deletions(-) -- Signature

1 7

[libvirt] [PATCH] bhyve: implement virConnectIsAlive
by Fabian Freyer 16 May '16

16 May '16

bhyve connections are local, and a "connection will be classed as alive if it is [...] local". --- src/bhyve/bhyve_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index c3c572e..8b41f7a 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1517,6 +1517,11 @@ bhyveConnectGetType(virConnectPtr conn) return "BHYVE"; } +static int bhyveConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return 1; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1567,6 +1572,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ .connectGetType = bhyveConnectGetType, /* 1.3.5 */ + .connectIsAlive = bhyveConnectIsAlive, /* 1.3.5 */ }; -- 2.1.4

2 1

[libvirt] [PATCH] qemuxml2argvtest: uncoditionally mock NUMA routines
by Roman Bogorodskiy 16 May '16

16 May '16

Currently, qemuxml2argvmock.c only mocks virNumaNodeIsAvailable(), and only if libvirt was built with NUMA support. This causes some test failures where NUMA is involved. For example, memory-hotplug-dimm fails because it goes all they way down to qemuBuildMemoryBackendStr() that calls virNumaNodesetIsAvailable() for a user specified nodeset and fails, hence the test (unexpectedly) fails. To make qemuxml2argtest successfully run on non-NUMA platforms, do the following: - mock virNumaNodeIsAvailable() unconditionally - add a mock for virNumaNodesetIsAvailable() --- tests/qemuxml2argvmock.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 1616eed..57e56ab 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -56,17 +56,28 @@ virNumaGetMaxNode(void) return maxnodesNum; } -#if WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET -/* - * In case libvirt is compiled with full NUMA support, we need to mock - * this function in order to fake what numa nodes are available. - */ bool virNumaNodeIsAvailable(int node) { return node >= 0 && node <= virNumaGetMaxNode(); } -#endif /* WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET */ + +bool +virNumaNodesetIsAvailable(virBitmapPtr nodeset ATTRIBUTE_UNUSED) +{ + ssize_t bit = -1; + + if (!nodeset) + return true; + + while ((bit = virBitmapNextSetBit(nodeset, bit)) >= 0) { + if (virNumaNodeIsAvailable(bit)) + continue; + + return false; + } + return true; +} char * virTPMCreateCancelPath(const char *devpath) -- 2.7.4

3 5

[libvirt] [PATCH 0/2] Address some recent coverity
by John Ferlan 16 May '16

16 May '16

The first patch is a noise cleaner, while the second one fixes a real leak. Also anyone with desire to 'debug' a build environment - seems when the STATIC_ANALYSIS is true, the building of the docs (apibuild.py[.stamp]) fails in a rather spectacular mess. I can avoid building docs, but it's not clear to me what the failure is... John Ferlan (2): qemu: More qemu_monitor_json cleanups libxl: Resolve Coverity RESOURCE_LEAK src/libxl/libxl_migration.c | 5 ++++- src/qemu/qemu_monitor_json.c | 46 ++++++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 22 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH v2 0/4] domain: Support <address type='pci'/> allocation
by Cole Robinson 16 May '16

16 May '16

This patch series allows the user to specify bare device <address type='pci'/> to explicitly request PCI address allocation. It's only wired up for qemu, and explicitly errors for all other drivers. This has several uses, but the motivating one is providing an easy way to request PCI address allocation where it normally isn't the default address type, like for aarch64 VMs. v1 posting was here: http://www.redhat.com/archives/libvir-list/2016-March/msg00268.html This series depends on calling qemuDomainAssignAddresses from PostParse: http://www.redhat.com/archives/libvir-list/2016-May/msg01075.html Changes since v1: - Rebased to master - Dropped patches that were merged - Split out AssignAddress bits to their own series - Add formatdomain docs Cole Robinson (4): util: xml: add virXMLPropertyCount domain: Make <address type='pci'/> request address allocation qemu: Wire up address type=pci auto_allocate tests: qemu: test <address type='pci'/> with aarch64 docs/formatdomain.html.in | 5 ++- docs/schemas/domaincommon.rng | 5 ++- src/conf/domain_conf.c | 30 +++++++++++++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 47 ++++++++++++++++++++++ src/util/virxml.c | 17 ++++++++ src/util/virxml.h | 1 + .../generic-pci-autofill-addr.xml | 27 +++++++++++++ tests/genericxml2xmltest.c | 3 ++ ...l2argv-aarch64-virtio-pci-manual-addresses.args | 4 +- ...ml2argv-aarch64-virtio-pci-manual-addresses.xml | 5 +++ .../qemuxml2argv-pci-autofill-addr.args | 25 ++++++++++++ .../qemuxml2argv-pci-autofill-addr.xml | 35 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 5 +++ .../qemuxml2xmlout-pci-autofill-addr.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 18 files changed, 250 insertions(+), 4 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-pci-autofill-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml -- 2.7.4

2 6

[libvirt] [PATCH v3 0/6] qemu: handle ',' and '=' in VM name
by Cole Robinson 16 May '16

16 May '16

This series adds qemu cli comma escaping to several places that are dependent on the VM name, to enable names with embedded commas. Patch 6 makes use of qemu -name guest=X value to allow names with '=' in them. https://bugzilla.redhat.com/show_bug.cgi?id=639926 https://bugzilla.redhat.com/show_bug.cgi?id=1276485 Note: There's likely other places that are VM name dependent that need comma escaping too, but this hits the mandatory ones. I've listed some more on the BiteSizedTasks page: http://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_mo… v3: Patch 1 and patch 4 are new Cole Robinson (6): qemu: command: Add qemuBufferEscapeComma qemu: command: escape commas in VM name qemu: command: escape commas in secret master path qemu: command: escape commas in VNC socket path qemu: command: escape commas in chardev socket path qemu: command: Use -name guest= if available src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 50 ++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml | 1 + tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 + tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 25 +++++++++++ .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 19 ++++++++ tests/qemuxml2argvtest.c | 3 ++ 15 files changed, 96 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml -- 2.7.4

2 8

[libvirt] [PATCH 0/3] Fix default vram setting for libxl
by Ján Tomko 16 May '16

16 May '16

An alternative to https://www.redhat.com/archives/libvir-list/2016-May/msg00700.html 1462942877-31516-1-git-send-email-jfehlig(a)suse.com This series adds a call to DeviceDefPostParse for the implicit video which is being in the DomainDefPostParse phase, after DeviceDefPostParse has been done on all the existing devices. Ján Tomko (3): Move virDomainDefPostParseInternal after virDomainDeviceDefPostParse Call per-device post-parse callback even on implicit video Fill out default vram in DeviceDefPostParse src/conf/domain_conf.c | 105 ++++++++++++++++++++++-------------------- src/qemu/qemu_parse_command.c | 2 - 2 files changed, 56 insertions(+), 51 deletions(-) -- 2.7.3

5 9

[libvirt] [PATCH] admin: Fix passing an incorrect readonly attribute to virNetServerServiceNew
by Erik Skultety 16 May '16

16 May '16

When registering admin UNIX socket, a new service is created for it. This service is incorrectly initialized to be readonly, which is later inherited by all clients connected to the socket. In libvirt-admin's case there currently isn't any use for the attribute anyway, but since the socket has root-only access permissions, but the least we can do is to make every admin client connected to it report readonly as false. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- daemon/libvirtd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index cc5190f..f24fb22 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -543,7 +543,7 @@ daemonSetupNetworking(virNetServerPtr srv, #if WITH_GNUTLS NULL, #endif - true, + false, config->admin_max_queued_clients, config->admin_max_client_requests))) goto cleanup; -- 2.5.5

2 2

[libvirt] [PATCH] qemu: alias: Remove QEMU_CAPS_DEVICE
by Cole Robinson 16 May '16

16 May '16

QEMU_CAPS_DEVICE is always set nowadays, so drop code that depends on not-DEVICE --- src/qemu/qemu_alias.c | 82 +++------------------------------------------------ 1 file changed, 4 insertions(+), 78 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ade2033..cb102ec 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -171,70 +171,11 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, } -/* Names used before -drive supported the id= option */ -static int -qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) -{ - int busid, devid; - int ret; - char *dev_name; - - if (virDiskNameToBusDeviceIndex(disk, &busid, &devid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot convert disk '%s' to bus/device index"), - disk->dst); - return -1; - } - - switch (disk->bus) { - case VIR_DOMAIN_DISK_BUS_IDE: - if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) - ret = virAsprintf(&dev_name, "ide%d-hd%d", busid, devid); - else - ret = virAsprintf(&dev_name, "ide%d-cd%d", busid, devid); - break; - case VIR_DOMAIN_DISK_BUS_SCSI: - if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) - ret = virAsprintf(&dev_name, "scsi%d-hd%d", busid, devid); - else - ret = virAsprintf(&dev_name, "scsi%d-cd%d", busid, devid); - break; - case VIR_DOMAIN_DISK_BUS_FDC: - ret = virAsprintf(&dev_name, "floppy%d", devid); - break; - case VIR_DOMAIN_DISK_BUS_VIRTIO: - ret = virAsprintf(&dev_name, "virtio%d", devid); - break; - case VIR_DOMAIN_DISK_BUS_XEN: - ret = virAsprintf(&dev_name, "xenblk%d", devid); - break; - case VIR_DOMAIN_DISK_BUS_SD: - ret = virAsprintf(&dev_name, "sd%d", devid); - break; - case VIR_DOMAIN_DISK_BUS_USB: - ret = virAsprintf(&dev_name, "usb%d", devid); - break; - default: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk name mapping for bus '%s'"), - virDomainDiskBusTypeToString(disk->bus)); - return -1; - } - - if (ret == -1) - return -1; - - disk->info.alias = dev_name; - - return 0; -} - - /* Our custom -drive naming scheme used with id= */ -static int -qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def, - virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps) +int +qemuAssignDeviceDiskAlias(virDomainDefPtr def, + virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps) { const char *prefix = virDomainDiskBusTypeToString(disk->bus); int controllerModel = -1; @@ -276,18 +217,6 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def, int -qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, - virDomainDiskDefPtr def, - virQEMUCapsPtr qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) - return qemuAssignDeviceDiskAliasCustom(vmdef, def, qemuCaps); - else - return qemuAssignDeviceDiskAliasFixed(def); -} - - -int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, char **alias, int idx) @@ -435,9 +364,6 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) - return 0; - for (i = 0; i < def->nfss; i++) { if (virAsprintf(&def->fss[i]->info.alias, "fs%zu", i) < 0) return -1; -- 2.7.4

2 1

[libvirt] [PATCH] qemu-agent: remove redundant comments
by Chen Hanxiao 16 May '16

16 May '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_agent.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c55f304..20597b4 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -287,17 +287,6 @@ qemuAgentIOProcessEvent(qemuAgentPtr mon, return -1; } -/* - for (i = 0; i < ARRAY_CARDINALITY(eventHandlers); i++) { - if (STREQ(eventHandlers[i].type, type)) { - virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); - VIR_DEBUG("handle %s handler=%p data=%p", type, - eventHandlers[i].handler, data); - (eventHandlers[i].handler)(mon, data); - break; - } - } -*/ return 0; } -- 1.8.3.1

3 5

[libvirt] [PATCH 00/17] Cleanup CPU driver code a bit
by Jiri Denemark 16 May '16

16 May '16

Jiri Denemark (17): cpu_x86: Rename struct x86_vendor cpu_x86: Rename struct x86_feature cpu_x86: Rename struct x86_kvm_feature cpu_x86: Rename struct x86_model cpu_x86: Rename struct x86_map cpu_x86: Rename enum compare_result cpu_x86: Rename struct virCPUx86DataIterator cpu_x86: Compare CPU candidates in a separate function cpu_x86: Rename cleanup labels cpu_x86: Use for loop in x86Decode cpu_x86: Remove comparisons to NULL cpu_x86: Simplify insertions into a linked list cpu_x86: Don't ignore parsing errors in x86VendorLoad cpu_x86: Don't ignore parsing errors in x86FeatureLoad cpu_x86: Don't ignore parsing errors in x86ModelLoad cpu_x86: Check vendor early cpu: Properly report errors when parsing CPU map XML src/cpu/cpu_map.c | 11 +- src/cpu/cpu_x86.c | 564 +++++++++++++++++++++++++++--------------------------- 2 files changed, 287 insertions(+), 288 deletions(-) -- 2.8.2

2 19

[libvirt] [PATCH 0/6] Don't disable auto_login for non libvirt managed iSCSI targets
by John Ferlan 16 May '16

16 May '16

https://bugzilla.redhat.com/show_bug.cgi?id=1331552 This is based on : http://www.redhat.com/archives/libvir-list/2016-May/msg00002.html which I had to first "hand massage" to get to apply and then had to make a couple of adjustments in order to compile. Since the review, Fritz responded directly to me and I've exchanged some thoughts back to him as I dug deeper into the issue. Patches 1 & 2 are related to the problem insomuch as the iscsi code will first try to "see" if a client connection already exists and if so, it won't try to recreate one. If one doesn't exist, then it will try to create one. So in a way it actually expects an error for a couple of paths. That error would be splatted out (in my case in the window I was running libvirtd in debug mode). So the patches make it so one can get an exitstatus and error buffer if they so choose when running the virCommandRunRegex Patches 3-6 are essentially a step by step rework of Fritz's patch with one change. In Fritz's patch the model was to remove the big hammer approach taken to set the "node.startup" to "manual" for every target found for the portal (e.g. the <ipaddr:port>). My approach alters that by only setting "node.startup" to "manual" for any target which libvirt manages via an iSCSI storage pool. I think that keeps the spirit of the original change (commit id '3c12b654') in tact while also making sure to not set "manual" mode on targets libvirt doesn't manage. Fritz Elfert (1): util: Add "--op nonpersistent" to iSCSI sendtargets John Ferlan (5): util: Add exitstatus parameter to virCommandRunRegex iscsi: Add exit status checking for virISCSIGetSession iscsi: Export virISCSITargetAutologin iscsi: Inhibit autologin for only libvirt managed targets iscsi: Remove initiatoriqn from virISCSIScanTargets src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 19 +++++++++----- src/storage/storage_backend_logical.c | 10 ++++--- src/util/vircommand.c | 9 ++++--- src/util/vircommand.h | 3 ++- src/util/viriscsi.c | 49 ++++++++++++++++++++--------------- src/util/viriscsi.h | 8 +++++- tests/viriscsitest.c | 7 ++--- 9 files changed, 68 insertions(+), 40 deletions(-) -- 2.5.5

2 11

[libvirt] Typo in libvirt python documentation
by Sebastiaan Glazenborg 16 May '16

16 May '16

There is a tiny typo in the livirt documentation at: http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/libvirt_appl… In 'Example 4.2. Fetching a domain object from a name' domainName = 'someguest' dom = conn.lookupByName(domainname) domainname or domainName

2 1

[libvirt] [PATCH] qemu: command: Ignore QEMU_CAPS_DEVICE when building drive alias
by Cole Robinson 16 May '16

16 May '16

QEMU_CAPS_DEVICE is always set nowadays, so we can drop the non-DEVICE code paths --- src/qemu/qemu_command.c | 12 ++++-------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0d6d5f8..4286999 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -377,17 +377,13 @@ qemuBuildObjectCommandlineFromJSON(const char *type, } -char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps) +char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk) { char *ret; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - ignore_value(virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, - disk->info.alias)); - } else { - ignore_value(VIR_STRDUP(ret, disk->info.alias)); - } + if (virAsprintf(&ret, "%s%s", + QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) + return NULL; return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index d5ad1b2..c777701 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -96,8 +96,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def, size_t vhostfdSize, virQEMUCapsPtr qemuCaps); -char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps); +char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk); /* Both legacy & current support */ char *qemuBuildDriveStr(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f40b34d..f8ab095 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -192,7 +192,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, if (qemuDomainPrepareDisk(driver, vm, disk, newsrc, false) < 0) goto cleanup; - if (!(driveAlias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps))) + if (!(driveAlias = qemuDeviceDriveHostAlias(disk))) goto error; do { @@ -376,7 +376,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!(drivestr = qemuBuildDriveStr(disk, false, priv->qemuCaps))) goto error; - if (!(drivealias = qemuDeviceDriveHostAlias(disk, priv->qemuCaps))) + if (!(drivealias = qemuDeviceDriveHostAlias(disk))) goto error; if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) -- 2.7.4

2 2

[libvirt] [PATCH 0/3] Fix a few issues in cpuGetModels
by Jiri Denemark 16 May '16

16 May '16

Jiri Denemark (3): cpuGetModels: Switch to virArch cpuGetModels: Fix memory leak on error cpuGetModels: Create a NULL-terminated list src/cpu/cpu.c | 19 +++++-------------- src/cpu/cpu.h | 3 +-- src/cpu/cpu_ppc64.c | 11 ++++++++++- src/cpu/cpu_x86.c | 11 ++++++++++- src/driver-hypervisor.h | 2 +- src/qemu/qemu_driver.c | 11 ++++++++++- src/test/test_driver.c | 12 +++++++++++- 7 files changed, 48 insertions(+), 21 deletions(-) -- 2.8.2

2 7

[libvirt] [PATCH] qemu_hotplug: correctly parse device XML provided by user
by Pavel Hrdina 16 May '16

16 May '16

Commit 1ccc7fbf fixed port checking for live device update, which revealed another bug. If we updating live domain we need to parse the device also as live. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1336134 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_driver.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 37d970e..9602f4d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8325,7 +8325,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; - virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; + virDomainDeviceDefPtr devConfig = NULL; + virDomainDeviceDefPtr devLive = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; virQEMUCapsPtr qemuCaps = NULL; @@ -8355,26 +8356,24 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, - caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); - if (dev == NULL) - goto endjob; - - if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) - goto endjob; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + devConfig = virDomainDeviceDefParse(xml, vm->def, + caps, driver->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE); + if (!devConfig) + goto endjob; + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) + if (flags & VIR_DOMAIN_AFFECT_LIVE) { + devLive = virDomainDeviceDefParse(xml, vm->def, + caps, driver->xmlopt, 0); + if (!devLive) goto endjob; } + if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) + goto endjob; + if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) @@ -8386,20 +8385,21 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (!vmdef) goto endjob; - if (virDomainDefCompatibleDevice(vmdef, dev, + if (virDomainDefCompatibleDevice(vmdef, devConfig, VIR_DOMAIN_DEVICE_ACTION_UPDATE) < 0) goto endjob; - if ((ret = qemuDomainUpdateDeviceConfig(qemuCaps, vmdef, dev)) < 0) + if ((ret = qemuDomainUpdateDeviceConfig(qemuCaps, vmdef, devConfig)) < 0) goto endjob; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (virDomainDefCompatibleDevice(vm->def, dev_copy, + if (virDomainDefCompatibleDevice(vm->def, devLive, VIR_DOMAIN_DEVICE_ACTION_UPDATE) < 0) goto endjob; - if ((ret = qemuDomainUpdateDeviceLive(dom->conn, vm, dev_copy, dom, force)) < 0) + if ((ret = qemuDomainUpdateDeviceLive(dom->conn, vm, devLive, + dom, force)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be @@ -8427,9 +8427,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, cleanup: virObjectUnref(qemuCaps); virDomainDefFree(vmdef); - if (dev != dev_copy) - virDomainDeviceDefFree(dev_copy); - virDomainDeviceDefFree(dev); + virDomainDeviceDefFree(devConfig); + virDomainDeviceDefFree(devLive); virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); -- 2.8.2

1 1

[libvirt] [PATCH 0/2] libxl: support pvusb
by Chunyan Liu 16 May '16

16 May '16

This patch series is to support pvusb in libxl driver. Chunyan Liu (2): libxl: support creating guest with USB hostdev libxl: support hotplug USB host device src/libxl/libxl_conf.c | 71 +++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_domain.c | 4 +- src/libxl/libxl_driver.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 206 insertions(+), 4 deletions(-) -- 2.1.4

4 10

[libvirt] [PATCH 0/3] caps tests: Give better names to test data files
by Jiri Denemark 16 May '16

16 May '16

Jiri Denemark (3): domaincapstest: Use arch strings domaincapstest: Give better names to test data files qemuaincapstest: Give better names to test data files .../{domaincaps-basic.xml => basic.xml} | 0 .../{domaincaps-full.xml => full.xml} | 0 ...ps-qemu_1.6.50-1.xml => qemu_1.6.50.x86_64.xml} | 0 ...6.0-3.xml => qemu_2.6.0-gicv2-virt.aarch64.xml} | 0 ...6.0-4.xml => qemu_2.6.0-gicv3-virt.aarch64.xml} | 0 ...aps-qemu_2.6.0-2.xml => qemu_2.6.0.aarch64.xml} | 0 ...aps-qemu_2.6.0-5.xml => qemu_2.6.0.ppc64le.xml} | 0 ...caps-qemu_2.6.0-1.xml => qemu_2.6.0.x86_64.xml} | 0 tests/domaincapstest.c | 52 +++++++++++++--------- ...-1.x86_64.replies => caps_1.2.2.x86_64.replies} | 0 ...ps_1.2.2-1.x86_64.xml => caps_1.2.2.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.3.1.x86_64.replies} | 0 ...ps_1.3.1-1.x86_64.xml => caps_1.3.1.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.4.2.x86_64.replies} | 0 ...ps_1.4.2-1.x86_64.xml => caps_1.4.2.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.5.3.x86_64.replies} | 0 ...ps_1.5.3-1.x86_64.xml => caps_1.5.3.x86_64.xml} | 0 ...-1.x86_64.replies => caps_1.6.0.x86_64.replies} | 0 ...ps_1.6.0-1.x86_64.xml => caps_1.6.0.x86_64.xml} | 0 ...1.x86_64.replies => caps_1.6.50.x86_64.replies} | 0 ..._1.6.50-1.x86_64.xml => caps_1.6.50.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.1.1.x86_64.replies} | 0 ...ps_2.1.1-1.x86_64.xml => caps_2.1.1.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.4.0.x86_64.replies} | 0 ...ps_2.4.0-1.x86_64.xml => caps_2.4.0.x86_64.xml} | 0 ...-1.x86_64.replies => caps_2.5.0.x86_64.replies} | 0 ...ps_2.5.0-1.x86_64.xml => caps_2.5.0.x86_64.xml} | 0 ...64.replies => caps_2.6.0-gicv2.aarch64.replies} | 0 ...-1.aarch64.xml => caps_2.6.0-gicv2.aarch64.xml} | 0 ...64.replies => caps_2.6.0-gicv3.aarch64.replies} | 0 ...-2.aarch64.xml => caps_2.6.0-gicv3.aarch64.xml} | 0 ....ppc64le.replies => caps_2.6.0.ppc64le.replies} | 0 ..._2.6.0-1.ppc64le.xml => caps_2.6.0.ppc64le.xml} | 0 ...-1.x86_64.replies => caps_2.6.0.x86_64.replies} | 0 ...ps_2.6.0-1.x86_64.xml => caps_2.6.0.x86_64.xml} | 0 tests/qemucapabilitiestest.c | 26 +++++------ 36 files changed, 44 insertions(+), 34 deletions(-) rename tests/domaincapsschemadata/{domaincaps-basic.xml => basic.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-full.xml => full.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_1.6.50-1.xml => qemu_1.6.50.x86_64.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_2.6.0-3.xml => qemu_2.6.0-gicv2-virt.aarch64.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_2.6.0-4.xml => qemu_2.6.0-gicv3-virt.aarch64.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_2.6.0-2.xml => qemu_2.6.0.aarch64.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_2.6.0-5.xml => qemu_2.6.0.ppc64le.xml} (100%) rename tests/domaincapsschemadata/{domaincaps-qemu_2.6.0-1.xml => qemu_2.6.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.2.2-1.x86_64.replies => caps_1.2.2.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.2.2-1.x86_64.xml => caps_1.2.2.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.3.1-1.x86_64.replies => caps_1.3.1.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.3.1-1.x86_64.xml => caps_1.3.1.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.4.2-1.x86_64.replies => caps_1.4.2.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.4.2-1.x86_64.xml => caps_1.4.2.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.5.3-1.x86_64.replies => caps_1.5.3.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.5.3-1.x86_64.xml => caps_1.5.3.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.0-1.x86_64.replies => caps_1.6.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.0-1.x86_64.xml => caps_1.6.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.50-1.x86_64.replies => caps_1.6.50.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_1.6.50-1.x86_64.xml => caps_1.6.50.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.1.1-1.x86_64.replies => caps_2.1.1.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.1.1-1.x86_64.xml => caps_2.1.1.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.4.0-1.x86_64.replies => caps_2.4.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.4.0-1.x86_64.xml => caps_2.4.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.5.0-1.x86_64.replies => caps_2.5.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.5.0-1.x86_64.xml => caps_2.5.0.x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.aarch64.replies => caps_2.6.0-gicv2.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.aarch64.xml => caps_2.6.0-gicv2.aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-2.aarch64.replies => caps_2.6.0-gicv3.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-2.aarch64.xml => caps_2.6.0-gicv3.aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.ppc64le.replies => caps_2.6.0.ppc64le.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.ppc64le.xml => caps_2.6.0.ppc64le.xml} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.x86_64.replies => caps_2.6.0.x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-1.x86_64.xml => caps_2.6.0.x86_64.xml} (100%) -- 2.8.2

3 6

Re: [libvirt] [PATCH] qemu: Add necessary for drive-backup block job constant
by Dmitry Mishin 16 May '16

16 May '16

ping On 25/04/16 14:16, "Dmitry Mishin" <dim(a)virtuozzo.com> wrote: >If one wants to monitor 'drive-backup' command progress and completion, >he needs a constant to recognize that. Right now, libvirt reports such >block jobs as 'unknown'. > >Signed-off-by: Dmitry Mishin <dim(a)virtuozzo.com> >--- > examples/object-events/event-test.c | 3 +++ > include/libvirt/libvirt-domain.h | 3 +++ > src/conf/domain_conf.c | 2 +- > src/qemu/qemu_monitor_json.c | 2 ++ > tools/virsh-domain.c | 3 ++- > 5 files changed, 11 insertions(+), 2 deletions(-) > >diff --git a/examples/object-events/event-test.c >b/examples/object-events/event-test.c >index 2063536..57d3610 100644 >--- a/examples/object-events/event-test.c >+++ b/examples/object-events/event-test.c >@@ -745,6 +745,9 @@ blockJobTypeToStr(int type) > > case VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT: > return "active layer block commit"; >+ >+ case VIR_DOMAIN_BLOCK_JOB_TYPE_BACKUP: >+ return "block backup"; > } > > return "unknown"; >diff --git a/include/libvirt/libvirt-domain.h >b/include/libvirt/libvirt-domain.h >index 160f20f..17ea991 100644 >--- a/include/libvirt/libvirt-domain.h >+++ b/include/libvirt/libvirt-domain.h >@@ -1941,6 +1941,9 @@ typedef enum { > /* Active Block Commit (virDomainBlockCommit with flags), job > * exists as long as sync is active */ > >+ VIR_DOMAIN_BLOCK_JOB_TYPE_BACKUP = 5, >+ /* Block Backup job */ >+ > # ifdef VIR_ENUM_SENTINELS > VIR_DOMAIN_BLOCK_JOB_TYPE_LAST > # endif >diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c >index 28248c8..30c97e3 100644 >--- a/src/conf/domain_conf.c >+++ b/src/conf/domain_conf.c >@@ -820,7 +820,7 @@ VIR_ENUM_IMPL(virDomainLoader, > * <mirror> XML (remaining types are not two-phase). */ > VIR_ENUM_DECL(virDomainBlockJob) > VIR_ENUM_IMPL(virDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, >- "", "", "copy", "", "active-commit") >+ "", "", "copy", "", "active-commit", "") > > VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST, > "", "dimm") >diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c >index 7bb9976..61fbdd9 100644 >--- a/src/qemu/qemu_monitor_json.c >+++ b/src/qemu/qemu_monitor_json.c >@@ -831,6 +831,8 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, > type = VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT; > else if (STREQ(type_str, "mirror")) > type = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY; >+ else if (STREQ(type_str, "backup")) >+ type = VIR_DOMAIN_BLOCK_JOB_TYPE_BACKUP; > > switch ((virConnectDomainEventBlockJobStatus) event) { > case VIR_DOMAIN_BLOCK_JOB_COMPLETED: >diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c >index a9f70dc..1b8c9b9 100644 >--- a/tools/virsh-domain.c >+++ b/tools/virsh-domain.c >@@ -2527,7 +2527,8 @@ VIR_ENUM_IMPL(virshDomainBlockJob, > N_("Block Pull"), > N_("Block Copy"), > N_("Block Commit"), >- N_("Active Block Commit")) >+ N_("Active Block Commit"), >+ N_("Block Backup")) > > static const char * > virshDomainBlockJobToString(int type) >-- >1.8.3.1 >

2 2

[libvirt] [PATCH] capabilities: Advertise cpuselection if -cpu host is usable
by Jiri Denemark 16 May '16

16 May '16

When -cpu host is supported by a QEMU binary, a user can use <cpu mode='host-passthrough'/> in domain XML even when libvirtd failed to find a matching model for the host CPU. Let's make it obvious by advertising <cpuselection/> guest capability whenever -cpu host is supported. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 7 ++++--- tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1bddf43..fcfd1cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -928,9 +928,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines = NULL; nmachines = 0; - if (caps->host.cpu && - caps->host.cpu->model && - virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && + if ((virQEMUCapsGet(qemubinCaps, QEMU_CAPS_CPU_HOST) || + (caps->host.cpu && + caps->host.cpu->model && + virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0)) && !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) goto cleanup; diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.xml b/tests/qemucaps2xmldata/all_1.6.0-1.xml index 2489f49..84d6000 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/all_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> <acpi default='on' toggle='yes'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml index 281fab0..28762c2 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='off' toggle='no'/> <acpi default='on' toggle='yes'/> -- 2.8.2

2 2

[libvirt] [PATCH 0/6] Cleanup of handling of secrets for disks
by Peter Krempa 16 May '16

16 May '16

I also wanted to get rid of yet another copy of virSecretGetSecretString in the RBD driver code but I didn't figure out the linking yet, so I'll send the patch separately. John Ferlan (2): util: string: Introduce helper to determine whether a byte buffer is printable secret: Alter virSecretGetSecretString Peter Krempa (4): util: alloc: Introduce freeing helpers that clear the memory before freeing secret: util: Refactor virSecretGetSecretString util: string: Introduce virStringEncodeBase64 qemu: domain: Fix names for functions that clear security info po/POTFILES.in | 1 - src/conf/virsecretobj.c | 7 +--- src/libvirt_private.syms | 3 ++ src/libxl/libxl_conf.c | 23 +++++++----- src/qemu/qemu_agent.c | 6 +-- src/qemu/qemu_command.c | 18 +++++++-- src/qemu/qemu_domain.c | 27 +++++-------- src/qemu/qemu_domain.h | 3 +- src/secret/secret_util.c | 79 +++++++++++---------------------------- src/secret/secret_util.h | 12 +++--- src/storage/storage_backend_rbd.c | 17 ++------- src/util/viralloc.c | 36 ++++++++++++++++++ src/util/viralloc.h | 56 +++++++++++++++++++++++++++ src/util/virstring.c | 43 +++++++++++++++++++++ src/util/virstring.h | 3 ++ tests/viralloctest.c | 37 ++++++++++++++++++ tools/virsh-secret.c | 6 +-- 17 files changed, 256 insertions(+), 121 deletions(-) -- 2.8.2

2 12

[libvirt] [PATCH 0/2] Enable QEMU_CAPS_PCI_ROMBAR unconditionally
by Andrea Bolognani 16 May '16

16 May '16

This capability was not handled correctly, causing aarch64 guests having <interface type='network'> ... <rom bar='off'/> </interface> to fail at startup with error: unsupported configuration: rombar and romfile not supported in this QEMU binary I'm not sure whether we should drop the QEMU_CAPS_PCI_ROMBAR capability entirely now that it's enabled unconditionally and there is no code checking for it; as I understand it, we don't ever drop capabilities, hence the current implementation. Andrea Bolognani (2): qemu: Enable QEMU_CAPS_PCI_ROMBAR unconditionally qemu: Stop checking for QEMU_CAPS_PCI_ROMBAR src/qemu/qemu_capabilities.c | 46 ++++++++++++---------- src/qemu/qemu_command.c | 12 ++---- tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml | 1 + 6 files changed, 33 insertions(+), 29 deletions(-) -- 2.5.5

4 7

[libvirt] Patch to enable transient disks in libvirt for qemu
by Richard Harman 16 May '16

16 May '16

I'm not a C coder, but hey I managed to get transient disks working. I think there was some discussion years ago on the list about having libvirt/qemu dump the transient disk image into a default random temp directory wasn't the Right Way To Do Things, and I think interest evaporated. Anyway, have a patch.

2 1

[libvirt] [PATCH 0/8] domain: Support <address type='pci'/> allocation
by Cole Robinson 15 May '16

15 May '16

This patch series allows the user to specify bare device <address type='pci'/> to explicitly request PCI address allocation. This has several uses, but the motivating one is providing an easy way to request PCI address allocation where it normally isn't the default address type, like for aarch64 VMs. Cole Robinson (8): domain: Add virDomainDefAddImplicitDevices domain: conf: Export virDomainDefPostParseDevices qemu: Assign device addresses in PostParse util: xml: add virXMLPropertyCount tests: Add failure flags to CompareDomainXML2XML domain: Make <address type='pci'/> request address allocation qemu: Wire up address type=pci auto_allocate tests: qemu: test <address type='pci'/> with aarch64 docs/schemas/domaincommon.rng | 5 +- src/conf/domain_conf.c | 81 +++++++++++++++++----- src/conf/domain_conf.h | 8 ++- src/libvirt_private.syms | 3 +- src/qemu/qemu_domain.c | 13 +++- src/qemu/qemu_domain_address.c | 47 +++++++++++++ src/qemu/qemu_driver.c | 6 +- src/util/virxml.c | 17 +++++ src/util/virxml.h | 1 + src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- .../generic-pci-autofill-addr.xml | 27 ++++++++ tests/genericxml2xmltest.c | 17 +++-- tests/lxcxml2xmltest.c | 2 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 4 +- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 4 +- ...ml2argv-aarch64-virtio-pci-manual-addresses.xml | 5 ++ .../qemuxml2argv-pci-autofill-addr.args | 24 +++++++ .../qemuxml2argv-pci-autofill-addr.xml | 44 ++++++++++++ tests/qemuxml2argvtest.c | 21 +++--- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 5 ++ .../qemuxml2xmlout-pci-autofill-addr.xml | 46 ++++++++++++ tests/qemuxml2xmltest.c | 18 +++-- tests/testutils.c | 10 ++- tests/testutils.h | 4 ++ 26 files changed, 359 insertions(+), 59 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-pci-autofill-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml -- 2.5.0

3 21

[libvirt] [PATCH v4 0/8] tests: Introduce global mock library
by Michal Privoznik 14 May '16

14 May '16

diff to v3: - Well, I've found out that we have virmock.h that can be used just for what Peter suggested earlier: have LOAD_SYM shared. To my surprise, we already have a macro just for that = VIR_MOCK_REAL_INIT. - As agreed in v3, this feature is yet not enabled by default, but only if a env var is set. In order to do that, I have to write (hackish?) patch 5/8. Michal Privoznik (8): virpcimock: Adapt to virmock.h vircgroupmock: Adapt to virmock.h nssmock: Adapt to virmock.h securityselinuxhelper: Adapt to virmock.h virmock.h: Introduce VIR_MOCK_CALL_STAT tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 10 ++ Makefile.am | 3 + cfg.mk | 2 +- docs/hacking.html.in | 13 +++ tests/Makefile.am | 28 ++++- tests/check-file-access.pl | 104 ++++++++++++++++++ tests/file_access_whitelist.txt | 23 ++++ tests/nssmock.c | 27 ++--- tests/securityselinuxhelper.c | 80 ++++++-------- tests/testutils.c | 30 ++++-- tests/testutils.h | 10 +- tests/vircgroupmock.c | 83 ++++++--------- tests/virmock.h | 33 ++++++ tests/virpcimock.c | 96 +++++++---------- tests/virtestmock.c | 226 ++++++++++++++++++++++++++++++++++++++++ 16 files changed, 583 insertions(+), 186 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.8.1

3 19

[libvirt] [PATCH v2 0/3] qemu: Fix hotplug of guest agent
by Martin Kletzander 14 May '16

14 May '16

v2: - mostly a rebase, it was almost ACKed but not completely, just to make sure let's see it again with everything done. - use /tmp for paths in tests (automatically fixed by rebasing on top of commit 1893b6df117b) v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg01454.html Martin Kletzander (3): qemuhotplugtest: Allow testing of live data qemu: Move channel path generation out of command creation qemu: Generate channel target paths on hotplug as well src/qemu/qemu_command.c | 25 ++-------- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 20 ++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_process.c | 12 +++-- tests/qemuhotplugtest.c | 37 ++++++++++---- .../qemuhotplug-hotplug-base+qemu-agent-detach.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-hotplug-base+qemu-agent.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-qemu-agent-detach.xml | 5 ++ .../qemuhotplugtestdata/qemuhotplug-qemu-agent.xml | 5 ++ 11 files changed, 193 insertions(+), 39 deletions(-) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml -- 2.8.1

2 8

[libvirt] [PATCH] qemu.conf: spaces correction
by poma 14 May '16

14 May '16

libvirt/qemu.conf: spaces correction --- src/qemu/qemu.conf | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 4fa5e8a..5cf4599 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -38,7 +38,7 @@ # # ca-cert.pem - the CA master certificate # server-cert.pem - the server certificate signed with ca-cert.pem -# server-key.pem - the server private key +# server-key.pem - the server private key # # This option allows the certificate directory to be changed # @@ -123,7 +123,7 @@ # # ca-cert.pem - the CA master certificate # server-cert.pem - the server certificate signed with ca-cert.pem -# server-key.pem - the server private key +# server-key.pem - the server private key # # This option allows the certificate directory to be changed. # @@ -179,7 +179,7 @@ #remote_display_port_max = 65535 # VNC WebSocket port policies, same rules apply as with remote display -# ports. VNC WebSockets use similar display <-> port mappings, with +# ports. VNC WebSockets use similar display <-> port mappings, with # the exception being that ports start from 5700 instead of 5900. # #remote_websocket_port_min = 5700 @@ -196,7 +196,7 @@ # security_driver = [ "selinux", "apparmor" ] # # Notes: The DAC security driver is always enabled; as a result, the -# value of security_driver cannot contain "dac". The value "none" is +# value of security_driver cannot contain "dac". The value "none" is # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. # @@ -272,7 +272,7 @@ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", # "/dev/ptmx", "/dev/kvm", "/dev/kqemu", -# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio" +# "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio" #] # # RDMA migration requires the following extra files to be added to the list: @@ -285,11 +285,11 @@ # The default format for Qemu/KVM guest save images is raw; that is, the -# memory from the domain is dumped out directly to a file. If you have +# memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite -# a bit of space. If you would like to compress the images while they +# a bit of space. If you would like to compress the images while they # are being saved to disk, you can also set "lzop", "gzip", "bzip2", or "xz" -# for save_image_format. Note that this means you slow down the process of +# for save_image_format. Note that this means you slow down the process of # saving a domain in order to save disk space; the list above is in descending # order by performance and ascending order by compression ratio. # @@ -319,7 +319,7 @@ # When a domain is configured to be auto-dumped, enabling this flag # has the same effect as using the VIR_DUMP_BYPASS_CACHE flag with the -# virDomainCoreDump API. That is, the system will avoid using the +# virDomainCoreDump API. That is, the system will avoid using the # file system cache while writing the dump file, but may cause # slower operation. # @@ -327,17 +327,17 @@ # When a domain is configured to be auto-started, enabling this flag # has the same effect as using the VIR_DOMAIN_START_BYPASS_CACHE flag -# with the virDomainCreateWithFlags API. That is, the system will +# with the virDomainCreateWithFlags API. That is, the system will # avoid using the file system cache when restoring any managed state # file, but may cause slower operation. # #auto_start_bypass_cache = 0 # If provided by the host and a hugetlbfs mount point is configured, -# a guest may request huge page backing. When this mount point is +# a guest may request huge page backing. When this mount point is # unspecified here, determination of a host mount point in /proc/mounts -# will be attempted. Specifying an explicit mount overrides detection -# of the same in /proc/mounts. Setting the mount point to "" will +# will be attempted. Specifying an explicit mount overrides detection +# of the same in /proc/mounts. Setting the mount point to "" will # disable guest hugepage backing. If desired, multiple mount points can # be specified at once, separated by comma and enclosed in square # brackets, for example: @@ -353,9 +353,9 @@ #hugetlbfs_mount = "/dev/hugepages" -# Path to the setuid helper for creating tap devices. This executable +# Path to the setuid helper for creating tap devices. This executable # is used to create <source type='bridge'> interfaces when libvirtd is -# running unprivileged. libvirt invokes the helper directly, instead +# running unprivileged. libvirt invokes the helper directly, instead # of using "-netdev bridge", for security reasons. #bridge_helper = "/usr/libexec/qemu-bridge-helper" @@ -411,7 +411,7 @@ # # WARNING: Enabling probing is a security hole in almost all # deployments. It is strongly recommended that users update their -# guest XML <disk> elements to include <driver type='XXXX'/> +# guest XML <disk> elements to include <driver type='XXXX'/> # elements instead of enabling this option. # #allow_disk_format_probing = 1 @@ -437,18 +437,18 @@ ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote -# libvirtd during peer-to-peer migration. A keepalive message is +# libvirtd during peer-to-peer migration. A keepalive message is # sent to the daemon after keepalive_interval seconds of inactivity # to check if the daemon is still responding; keepalive_count is a # maximum number of keepalive messages that are allowed to be sent # to the daemon without getting any response before the connection -# is considered broken. In other words, the connection is +# is considered broken. In other words, the connection is # automatically closed approximately after # keepalive_interval * (keepalive_count + 1) seconds since the last # message received from the daemon. If keepalive_interval is set to # -1, qemu driver will not send keepalive requests during # peer-to-peer migration; however, the remote libvirtd can still -# send them and source libvirtd will send responses. When +# send them and source libvirtd will send responses. When # keepalive_count is set to 0, connections will be automatically # closed after keepalive_interval seconds of inactivity without # sending any keepalive messages. @@ -471,9 +471,9 @@ # The default hostname or IP address which will be used by a migration -# source for transferring migration data to this host. The migration +# source for transferring migration data to this host. The migration # source has to be able to resolve this hostname and connect to it so -# setting "localhost" will not work. By default, the host's configured +# setting "localhost" will not work. By default, the host's configured # hostname is used. #migration_host = "host.example.com" -- 2.4.11

7 10

[libvirt] error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

Hi, I am getting the following error when I try to migrate VM on my network using virsh migrate: error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS ; but, other vm's running on the server successfully migrated to remote server; Libvirt Version: libvirt-0.10.2-46.el6.x86_64; Qemu-kvm Version: qemu-kvm-0.12.1.2-2.448.el6.3.x86_64; OS Version: Red Hat Enterprise Linux Server release 6.6; Thanks~ Work Hard, Have Fun, Make History! Mail: raojunming113(a)pingan.com -----邮件原件----- 发件人: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] 代表 libvir-list-request(a)redhat.com 发送时间: 2016年5月14日 7:47 收件人: libvir-list(a)redhat.com 主题: libvir-list Digest, Vol 126, Issue 182 Send libvir-list mailing list submissions to libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> To subscribe or unsubscribe via the World Wide Web, visit https://www.redhat.com/mailman/listinfo/libvir-list or, via email, send a message with subject or body 'help' to libvir-list-request(a)redhat.com<mailto:libvir-list-request@redhat.com> You can reach the person managing the list at libvir-list-owner(a)redhat.com<mailto:libvir-list-owner@redhat.com> When replying, please edit your Subject line so it is more specific than "Re: Contents of libvir-list digest..." Today's Topics: 1. [PATCH 3/6] iscsi: Export virISCSITargetAutologin (John Ferlan) 2. [PATCH 4/6] util: Add "--op nonpersistent" to iSCSI sendtargets (John Ferlan) 3. [PATCH 5/6] iscsi: Inhibit autologin for only libvirt managed targets (John Ferlan) 4. [PATCH 6/6] iscsi: Remove initiatoriqn from virISCSIScanTargets (John Ferlan) 5. [PATCH] capabilities: Advertise cpuselection if -cpu host is usable (Jiri Denemark) 6. Re: [PATCH 0/2] libxl: support pvusb (Jim Fehlig) 7. Re: [PATCH] libxl: add .domainInterfaceAddresses (Jim Fehlig) ---------------------------------------------------------------------- Message: 1 Date: Fri, 13 May 2016 17:29:23 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 3/6] iscsi: Export virISCSITargetAutologin Message-ID: <1463174966-3185-4-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-4-git-send-email-jferlan@redhat.com>> Make it accessible for future patches Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/libvirt_private.syms | 1 + src/util/viriscsi.c | 2 +- src/util/viriscsi.h | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb24808..719d753 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1675,6 +1675,7 @@ virISCSIGetSession; virISCSINodeUpdate; virISCSIRescanLUNs; virISCSIScanTargets; +virISCSITargetAutologin; # util/virjson.h diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index be296d7..ea01b3d 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -404,7 +404,7 @@ virISCSIGetTargets(char **const groups, } -static int +int virISCSITargetAutologin(const char *portal, const char *initiatoriqn, const char *target, diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index f4093f7..3e7ea68 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -48,6 +48,13 @@ virISCSIRescanLUNs(const char *session) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int +virISCSITargetAutologin(const char *portal, + const char *initiatoriqn, + const char *target, + bool enable) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + +int virISCSIScanTargets(const char *portal, const char *initiatoriqn, size_t *ntargetsret, -- 2.5.5 ------------------------------ Message: 2 Date: Fri, 13 May 2016 17:29:24 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 4/6] util: Add "--op nonpersistent" to iSCSI sendtargets Message-ID: <1463174966-3185-5-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-5-git-send-email-jferlan@redhat.com>> From: Fritz Elfert <fritz(a)fritz-elfert.de<mailto:fritz@fritz-elfert.de>> The root cause of commit id '3c12b654' was to ensure that an iSCSI sendtargets command to discover all the available targets on the host didn't reset the "node.startup" value for a future restarts on any target that libvirt is managing. However, by adding the "--op nonpersistent" inhibits the iSCSI initiator from recording/modifying in the bowels /var/lib/iscsi of any target. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/util/viriscsi.c | 1 + tests/viriscsitest.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index ea01b3d..36612c5 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -446,6 +446,7 @@ virISCSIScanTargets(const char *portal, "--mode", "discovery", "--type", "sendtargets", "--portal", portal, + "--op", "nonpersistent", NULL); memset(&list, 0, sizeof(list)); diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index c697a4a..b5b0e20 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -90,7 +90,9 @@ static void testIscsiadmCb(const char *const*args, args[4] && STREQ(args[4], "sendtargets") && args[5] && STREQ(args[5], "--portal") && args[6] && STREQ(args[6], "10.20.30.40:3260,1") && - args[7] == NULL) { + args[7] && STREQ(args[7], "--op") && + args[8] && STREQ(args[8], "nonpersistent") && + args[9] == NULL) { ignore_value(VIR_STRDUP(*output, iscsiadmSendtargetsOutput)); } else { *status = -1; -- 2.5.5 ------------------------------ Message: 3 Date: Fri, 13 May 2016 17:29:25 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 5/6] iscsi: Inhibit autologin for only libvirt managed targets Message-ID: <1463174966-3185-6-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-6-git-send-email-jferlan@redhat.com>> https://bugzilla.redhat.com/show_bug.cgi?id=1331552 Based on code originally posted by Fritz Elfert <fritz(a)fritz-elfert.de<mailto:fritz@fritz-elfert.de>> to remove the Autologin code entirely from libvirt, but reworked to only set Autologin for libvirt managed targets. Commit id '3c12b654' took a "large hammer" approach to inhibiting logins which causes issues if there are iSCSI targets not being managed by libvirt. Now that the previous commit ensures that the iscsi initiator doesn't update the /var/lib/iscsi tree with the results for a 'sendtargets' by using the "--op nonpersistent" option, let's remove the code from virISCSIScanTargets that disables autologin for every target, but add that same setting into the start pool code for each managed/started target to ensure that nothing else goes and tries to autologin. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/storage/storage_backend_iscsi.c | 11 +++++++++++ src/util/viriscsi.c | 15 ++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 9e2d01e..5fbf390 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -404,6 +404,17 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, NULL, NULL) < 0) goto cleanup; + /* Inhibit our autologin for our managed source device */ + if (virISCSITargetAutologin(portal, + pool->def->source.initiator.iqn, + pool->def->source.devices[0].path, + false) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to inhibit autologin for target '%s'"), + pool->def->source.devices[0].path); + goto cleanup; + } + if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0) goto cleanup; diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 36612c5..3133d88 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -415,13 +415,14 @@ virISCSITargetAutologin(const char *portal, "--value", enable ? "automatic" : "manual", NULL }; + VIR_DEBUG("set autologin for '%s' to '%d'", target, enable); return virISCSIConnection(portal, initiatoriqn, target, extraargv); } int virISCSIScanTargets(const char *portal, - const char *initiatoriqn, + const char *initiatoriqn ATTRIBUTE_UNUSED, size_t *ntargetsret, char ***targetsret) { @@ -459,18 +460,6 @@ virISCSIScanTargets(const char *portal, &list, NULL, NULL) < 0) goto cleanup; - for (i = 0; i < list.ntargets; i++) { - /* We have to ignore failure, because we can't undo - * the results of 'sendtargets', unless we go scrubbing - * around in the dirt in /var/lib/iscsi. - */ - if (virISCSITargetAutologin(portal, - initiatoriqn, - list.targets[i], false) < 0) - VIR_WARN("Unable to disable auto-login on iSCSI target %s: %s", - portal, list.targets[i]); - } - if (ntargetsret && targetsret) { *ntargetsret = list.ntargets; *targetsret = list.targets; -- 2.5.5 ------------------------------ Message: 4 Date: Fri, 13 May 2016 17:29:26 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 6/6] iscsi: Remove initiatoriqn from virISCSIScanTargets Message-ID: <1463174966-3185-7-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-7-git-send-email-jferlan@redhat.com>> No longer necessary to have it, so remove it. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/storage/storage_backend_iscsi.c | 8 ++------ src/util/viriscsi.c | 3 +-- src/util/viriscsi.h | 1 - tests/viriscsitest.c | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 5fbf390..b6b23d3 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, if (!(portal = virStorageBackendISCSIPortal(source))) goto cleanup; - if (virISCSIScanTargets(portal, - source->initiator.iqn, - &ntargets, &targets) < 0) + if (virISCSIScanTargets(portal, &ntargets, &targets) < 0) goto cleanup; if (VIR_ALLOC_N(list.sources, ntargets) < 0) @@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, * iscsiadm doesn't let you login to a target, unless you've * first issued a 'sendtargets' command to the portal :-( */ - if (virISCSIScanTargets(portal, - pool->def->source.initiator.iqn, - NULL, NULL) < 0) + if (virISCSIScanTargets(portal, NULL, NULL) < 0) goto cleanup; /* Inhibit our autologin for our managed source device */ diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 3133d88..a2acb67 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -321,7 +321,7 @@ virISCSIConnection(const char *portal, * portal. Without the sendtargets all that is received is a * "iscsiadm: No records found" */ - if (virISCSIScanTargets(portal, initiatoriqn, NULL, NULL) < 0) + if (virISCSIScanTargets(portal, NULL, NULL) < 0) goto cleanup; break; @@ -422,7 +422,6 @@ virISCSITargetAutologin(const char *portal, int virISCSIScanTargets(const char *portal, - const char *initiatoriqn ATTRIBUTE_UNUSED, size_t *ntargetsret, char ***targetsret) { diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index 3e7ea68..44fb1f4 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -56,7 +56,6 @@ virISCSITargetAutologin(const char *portal, int virISCSIScanTargets(const char *portal, - const char *initiatoriqn, size_t *ntargetsret, char ***targetsret) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index b5b0e20..40e4d10 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data) virCommandSetDryRun(NULL, testIscsiadmCb, NULL); - if (virISCSIScanTargets(info->portal, NULL, - &ntargets, &targets) < 0) + if (virISCSIScanTargets(info->portal, &ntargets, &targets) < 0) goto cleanup; if (info->nexpected != ntargets) { -- 2.5.5 ------------------------------ Message: 5 Date: Fri, 13 May 2016 23:36:17 +0200 From: Jiri Denemark <jdenemar(a)redhat.com<mailto:jdenemar@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH] capabilities: Advertise cpuselection if -cpu host is usable Message-ID: <a3394e6b8d0f28591147dd981909e9a1ae39f64d.1463175377.git.jdenemar(a)redhat.com<mailto:a3394e6b8d0f28591147dd981909e9a1ae39f64d.1463175377.git.jdenemar@redhat.com>> When -cpu host is supported by a QEMU binary, a user can use <cpu mode='host-passthrough'/> in domain XML even when libvirtd failed to find a matching model for the host CPU. Let's make it obvious by advertising <cpuselection/> guest capability whenever -cpu host is supported. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com<mailto:jdenemar@redhat.com>> --- src/qemu/qemu_capabilities.c | 7 ++++--- tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1bddf43..fcfd1cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -928,9 +928,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines = NULL; nmachines = 0; - if (caps->host.cpu && - caps->host.cpu->model && - virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && + if ((virQEMUCapsGet(qemubinCaps, QEMU_CAPS_CPU_HOST) || + (caps->host.cpu && + caps->host.cpu->model && + virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0)) && !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) goto cleanup; diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.xml b/tests/qemucaps2xmldata/all_1.6.0-1.xml index 2489f49..84d6000 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/all_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> <acpi default='on' toggle='yes'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml index 281fab0..28762c2 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='off' toggle='no'/> <acpi default='on' toggle='yes'/> -- 2.8.2 ------------------------------ Message: 6 Date: Fri, 13 May 2016 16:57:30 -0600 From: Jim Fehlig <jfehlig(a)suse.com<mailto:jfehlig@suse.com>> To: Joao Martins <joao.m.martins(a)oracle.com<mailto:joao.m.martins@oracle.com>> Cc: libvirt-list(a)redhat.com<mailto:libvirt-list@redhat.com> Subject: Re: [libvirt] [PATCH 0/2] libxl: support pvusb Message-ID: <57365BDA.7090005(a)suse.com<mailto:57365BDA.7090005@suse.com>> Content-Type: text/plain; charset=windows-1252 On 05/13/2016 07:14 AM, Joao Martins wrote: > On 05/12/2016 11:43 PM, Jim Fehlig wrote: >> Chunyan Liu wrote: >>> This patch series is to support pvusb in libxl driver. >>> >>> Chunyan Liu (2): >>> libxl: support creating guest with USB hostdev >>> libxl: support hotplug USB host device >> This series should also include support for converting domXML USB config to/from >> xl.cfg(5) in src/xenconfig/xen_xl.c, along with a test. >> >> FYI, the series fails to build with Xen < 4.7, where LIBXL_HAVE_PVUSB is not >> defined :-). > Probably a nice follow-up after this series is in, would be to add the USB > subsys type to domain capabilities (that you address in the OVMF series) Yes, good point. I'll add it to that series if this one makes it in first. Speaking of the OVMF series, I've fixed a few things after more testing and will rebase and resend a V2. Thanks in advance if either of you have time to look at it. Regards, Jim ------------------------------ Message: 7 Date: Fri, 13 May 2016 17:47:09 -0600 From: Jim Fehlig <jfehlig(a)suse.com<mailto:jfehlig@suse.com>> To: Chunyan Liu <cyliu(a)suse.com<mailto:cyliu@suse.com>>, libvirt-list(a)redhat.com<mailto:libvirt-list@redhat.com> Subject: Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses Message-ID: <5736677D.8030209(a)suse.com<mailto:5736677D.8030209@suse.com>> Content-Type: text/plain; charset=windows-1252 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<mailto:cyliu@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? Regards, Jim ------------------------------ -- libvir-list mailing list libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> https://www.redhat.com/mailman/listinfo/libvir-list End of libvir-list Digest, Vol 126, Issue 182 ********************************************* ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] 撤回: error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

饶俊明(云平台事业部) 将撤回邮件“error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS”。 ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

Hi, I am getting the following error when I try to migrate VM on my network using virsh migrate; error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS but, other vm's running on the server successfully migrated to remote server; Libvirt Version: libvirt-0.10.2-46.el6.x86_64 Qemu-kvm Version: qemu-kvm-0.12.1.2-2.448.el6.3.x86_64 OS Version: Red Hat Enterprise Linux Server release 6.6 Thanks~ ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

Re: [libvirt] [libvirt-users] libvirt + openvswitch, <parameters interfaceid='x'/> seems less-than-useful?
by Laine Stump 14 May '16

14 May '16

On 05/13/2016 08:24 PM, Richard Harman wrote: > On 05/13/16 20:04, Laine Stump wrote: >> On 05/13/2016 09:57 AM, Richard Harman wrote: >>> I've debugged this, and I think the interfaceid stuff in network XML >>> isn't doing much besides setting a custom interfaceid in an OpenVSwitch >>> table that really has no effect on the operation of OpenVSwitch. I >>> think the -- set Interface vnet0 "external-ids:iface-id="{uuid here}" >>> command run by libvirt doesn't actually set the _uuid of a new >>> interface. :( >> I don't use Open vSwitch, but I was around when the support was added, >> and reviewed the patches (which were authored by Kyle Mestery, whose >> email has changed since then, so I'm not sure how to Cc him). My >> understanding at the time was that the interfaceid was intended for >> exactly the purpose that you say doesn't work (i.e. so that OVS itself >> could recognize that interface as it appeared and disappeared at >> different locations on the network). I would classify that as a bug, >> but that's just my understanding as an OVS outsider. >> > Further evidence, now that I figured out how to dump the external-ids > stuff in OVS: > > Here's the relevant ports of the domain XML: > > <domain type='kvm' id='5'> > <name>cuckoo</name> > <uuid>cb4903aa-eaf4-432d-aa57-e9f74f1c8b79</uuid> > .... > <interface type='bridge'> > <mac address='52:54:00:f5:29:72'/> > <source network='malware' bridge='malware0'/> > <virtualport type='openvswitch'> > <parameters interfaceid='23e982f3-f344-48a2-8bed-b584acb95616'/> > </virtualport> > <target dev='monitor0'/> > <model type='virtio'/> > <alias name='net2'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x08' > function='0x0'/> > </interface> > .... > > cuckoo vm up: monitor0 _uuid is 969ef76c... > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > name : "monitor0" > _uuid : 969ef76c-c802-4e9f-97e0-9a06ce133252 > external_ids : {attached-mac="52:54:00:f5:29:72", > iface-id="23e982f3-f344-48a2-8bed-b584acb95616", iface-status=active, > vm-id="cb4903aa-eaf4-432d-aa57-e9f74f1c8b79"} > # > > cuckoo vm down: (no output, the interface has been deleted by libvirt) > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > # > > I found this in my log, showing libvirt deleted the interface: > ovs-vsctl[4590]: ovs|00001|vsctl|INFO|Called as ovs-vsctl --timeout=5 -- > --if-exists del-port monitor0 > > cuckoo vm up again: uuid is now fb025df0... > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > name : "monitor0" > _uuid : fb025df0-d934-46d6-b9ed-314bc1de5ef3 > external_ids : {attached-mac="52:54:00:f5:29:72", > iface-id="23e982f3-f344-48a2-8bed-b584acb95616", iface-status=active, > vm-id="cb4903aa-eaf4-432d-aa57-e9f74f1c8b79"} > # > > Anyway, thanks for reading! Hopefully we'll get to the bottom of this, > where I can keep my span port. :) In the mean time I'm going to go > digging through the OVS source, specifically the ovs-vsctl command to > see if an argument can be used to forcibly set the internal _uuid in OVS. Right. Either the ovs-vsctl command used by libvirt needs to change, or (if it's actually a bug in OVS) ovs-ctl's use of external-ids:iface-id needs to change. I'm Cc'ing libvir-list, just in case there's an OVS person who monitors that list but not this one.

1 0

[libvirt] [PATCH] bhyve: implement virConnectGetType
by Fabian Freyer 13 May '16

13 May '16

This implements virConnectGetType for the bhyve driver. --- src/bhyve/bhyve_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4fc504e..a853e94 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1508,6 +1508,15 @@ bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) return ret; } +static const char * +bhyveConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + if (virConnectGetTypeEnsureACL(conn) < 0) + return NULL; + + return "BHYVE"; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1557,6 +1566,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectDomainEventRegisterAny = bhyveConnectDomainEventRegisterAny, /* 1.2.5 */ .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ + .connectGetType = bhyveConnectGetType, /* 1.3.5 */ }; -- 2.1.4

3 5