- Devel - libvirt List Archives

[libvirt] [PATCH] libxl: unref objects in error paths
by Jim Fehlig 25 Feb '16

25 Feb '16

libxlMakeNic opens a virConnect object and takes a reference on a virNetwork object, but doesn't drop the references on all error paths. Rework the function to follow the standard libvirt pattern of using a local 'ret' variable to hold the function return value, performing all cleanup and returning 'ret' at a 'cleanup' label. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I noticed these leaks while trying to rework the code to use a common virConnect object. That task has turned into quite an effort [1], but in the meantime the leaks in the current code should be plugged. [1] https://www.redhat.com/archives/libvir-list/2016-February/msg01188.html src/libxl/libxl_conf.c | 57 ++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b20df29..763f4c5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1286,7 +1286,11 @@ libxlMakeNic(virDomainDefPtr def, { bool ioemu_nic = def->os.type == VIR_DOMAIN_OSTYPE_HVM; virDomainNetType actual_type = virDomainNetGetActualType(l_nic); + char *brname = NULL; + virNetworkPtr network = NULL; + virConnectPtr conn = NULL; virNetDevBandwidthPtr actual_bw; + int ret = -1; /* TODO: Where is mtu stored? * @@ -1312,64 +1316,50 @@ libxlMakeNic(virDomainDefPtr def, if (l_nic->model) { if (VIR_STRDUP(x_nic->model, l_nic->model) < 0) - return -1; + goto cleanup; if (STREQ(l_nic->model, "netfront")) x_nic->nictype = LIBXL_NIC_TYPE_VIF; } if (VIR_STRDUP(x_nic->ifname, l_nic->ifname) < 0) - return -1; + goto cleanup; switch (actual_type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: if (VIR_STRDUP(x_nic->bridge, virDomainNetGetActualBridgeName(l_nic)) < 0) - return -1; + goto cleanup; /* fallthrough */ case VIR_DOMAIN_NET_TYPE_ETHERNET: if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) - return -1; + goto cleanup; if (l_nic->nips > 0) { x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address); if (!x_nic->ip) - return -1; + goto cleanup; } break; case VIR_DOMAIN_NET_TYPE_NETWORK: { - bool fail = false; - char *brname = NULL; - virNetworkPtr network; - virConnectPtr conn; - if (!(conn = virConnectOpen("xen:///system"))) - return -1; + goto cleanup; if (!(network = virNetworkLookupByName(conn, l_nic->data.network.name))) { - virObjectUnref(conn); - return -1; + goto cleanup; } if (l_nic->nips > 0) { x_nic->ip = virSocketAddrFormat(&l_nic->ips[0]->address); if (!x_nic->ip) - return -1; + goto cleanup; } - if ((brname = virNetworkGetBridgeName(network))) { - if (VIR_STRDUP(x_nic->bridge, brname) < 0) - fail = true; - } else { - fail = true; - } - - VIR_FREE(brname); + if (!(brname = virNetworkGetBridgeName(network))) + goto cleanup; - virObjectUnref(network); - virObjectUnref(conn); - if (fail) - return -1; + if (VIR_STRDUP(x_nic->bridge, brname) < 0) + goto cleanup; break; } case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -1385,18 +1375,18 @@ libxlMakeNic(virDomainDefPtr def, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported interface type %s"), virDomainNetTypeToString(l_nic->type)); - return -1; + goto cleanup; } if (l_nic->domain_name) { #ifdef LIBXL_HAVE_DEVICE_BACKEND_DOMNAME if (VIR_STRDUP(x_nic->backend_domname, l_nic->domain_name) < 0) - return -1; + goto cleanup; #else virReportError(VIR_ERR_XML_DETAIL, "%s", _("this version of libxenlight does not " "support backend domain name")); - return -1; + goto cleanup; #endif } @@ -1438,7 +1428,14 @@ libxlMakeNic(virDomainDefPtr def, x_nic->rate_interval_usecs = 50000UL; } - return 0; + ret = 0; + + cleanup: + VIR_FREE(brname); + virObjectUnref(network); + virObjectUnref(conn); + + return ret; } static int -- 2.6.1

3 3

[libvirt] [PATCH v3 0/3] Add capability for text based polkit authentication for virsh
by John Ferlan 25 Feb '16

25 Feb '16

v2: http://www.redhat.com/archives/libvir-list/2016-February/msg00618.html Adjustments since v2: Patch 1 - Change not only the message (as requested), but also use a different and new error code (VIR_ERR_AUTH_UNAVAILABLE). Patch 2 - Added a check for "if (!isatty(STDIN_FILENO))" Used a new parameter for pkttyagent call - "--notify-fd", which is documented as "To get notified when the authentication agent has been registered either listen to the Changed D-Bus signal or use --notify-fd to pass the number of a file descriptor that has been passed to the program. This file descriptor will then be closed when the authentication agent has been successfully registered. Followed the systemd mechanism. If it's felt that a timeout of -1 is too dangerous, I'd be fine with changing it. Patch 3 - Since we now can determine our failure based on err->code, use the new VIR_ERR_AUTH_UNAVAILABLE to attempt the AgentCreate. Also, since virPolkitAgentCreate now will wait for the agent to start before returning, the agentstart counter is removed. John Ferlan (3): polkit: Adjust message when authentication agent isn't found util: Introduce API's for Polkit text authentication virsh: Add support for text based polkit authentication include/libvirt/virterror.h | 3 +- src/libvirt_private.syms | 2 ++ src/util/virerror.c | 8 ++++- src/util/virpolkit.c | 85 ++++++++++++++++++++++++++++++++++++++++++--- src/util/virpolkit.h | 5 +++ tests/virpolkittest.c | 8 +++-- tools/virsh.c | 38 +++++++++++++++++--- tools/virsh.h | 2 ++ 8 files changed, 138 insertions(+), 13 deletions(-) -- 2.5.0

3 15

[libvirt] [PATCH 1/2] netdev: Use virNetDevIsVirtualFunction() properly
by Andrea Bolognani 25 Feb '16

25 Feb '16

virNetDevIsVirtualFunction() returns 1 if the interface is a virtual function, 0 if it isn't and -1 on error. This means that, despite the name suggesting otherwise, using it as a predicate is not correct. Fix two callers that were doing so adding an explicit check on the return value. --- src/util/virnetdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ea95552..9e39c26 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2531,7 +2531,7 @@ virNetDevReplaceNetConfig(const char *linkdev, int vf, int ret = -1; char *pfdevname = NULL; - if (vf == -1 && virNetDevIsVirtualFunction(linkdev)) { + if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) { /* If this really *is* a VF and the caller just didn't know * it, we should set the MAC address via PF+vf# instead of * setting directly via VF, because the latter will be @@ -2571,7 +2571,7 @@ virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir) char *pfdevname = NULL; const char *vfdevname = NULL; - if (vf == -1 && virNetDevIsVirtualFunction(linkdev)) { + if (vf == -1 && virNetDevIsVirtualFunction(linkdev) == 1) { /* If this really *is* a VF and the caller just didn't know * it, we should set the MAC address via PF+vf# instead of * setting directly via VF, because the latter will be -- 2.5.0

2 2

[libvirt] [PATCH 2/2] hostdev: Remove temporary variable when checking for VF
by Andrea Bolognani 25 Feb '16

25 Feb '16

The virHostdevIsVirtualFunction() was called exactly twice, and in both cases the return value was saved to a temporary variable before being checked. This would be okay if it improved readability, but in this case is pretty pointless. Get rid of the temporary variable and check the return value directly; while at it, change the check from '<= 0' to '!= 1' to align it with the way other similar *IsVirtualFunction() functions are used thorough the code. --- src/util/virhostdev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9ae217d..2db0da0 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -416,10 +416,8 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev, int vf = -1; int vlanid = -1; bool port_profile_associate = true; - int isvf; - isvf = virHostdevIsVirtualFunction(hostdev); - if (isvf <= 0) { + if (virHostdevIsVirtualFunction(hostdev) != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Interface type hostdev is currently supported on" " SR-IOV Virtual Functions only")); @@ -489,7 +487,6 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev, int ret = -1; int vf = -1; bool port_profile_associate = false; - int isvf; /* This is only needed for PCI devices that have been defined * using <interface type='hostdev'>. For all others, it is a NOP. @@ -497,8 +494,7 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev, if (!virHostdevIsPCINetDevice(hostdev)) return 0; - isvf = virHostdevIsVirtualFunction(hostdev); - if (isvf <= 0) { + if (virHostdevIsVirtualFunction(hostdev) != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Interface type hostdev is currently supported on" " SR-IOV Virtual Functions only")); -- 2.5.0

2 2

[libvirt] [python PATCH 0/4] formatting and (un)signed improvements
by Pavel Hrdina 25 Feb '16

25 Feb '16

Pavel Hrdina (4): libvirt-override: all flags should be defined as unsigned int libvirt-override: fix PyArg_ParseTuple for unsigned int libvirt-override: fix PyArg_ParseTuple for unsigned long long libvirt-override: fix PyArg_ParseTuple for size_t libvirt-override.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.7.1

2 5

[libvirt] [PATCH 0/3] More Coverity changes
by John Ferlan 25 Feb '16

25 Feb '16

All the issues here are found by a later version of Coverity than the one used by our internal testing. Two were false positives and one just an ordering issue with the virCheckFlags in the zfs backend. The future coverity really has a problem with strtok_r usage after a VIR_STRDUP which only checks < 0 because it's perfectly fine for the "source" to be NULL and a < 0 check won't fail. The reason why this is a problem is the target is then NULL and used for the strtok_r call. Code inspection finds the cases we have are all false positives; however, rather than making the <= or sa_assert() type check to validate that - I chose to use the virStringSplitCount in order to split and inspect the input string. It was much cleaner at least on the inspection front. The storage changes related to checking (ret == -1) resulted in a RESOURCE_LEAK false positive. As it turns out, the only reason why -1 was being check was to determine whether or not the VIR_APPEND_ELEMENT insertion failed. If that succeeds, then 'vol' is cleared anyway, so truly we only need to attempt the free if we have a new vol. The virStorageVolDefFree will quietly return if vol == NULL. John Ferlan (3): openvz: Use virStringSplitCount instead of strtok_r zfs: Resolve RESOURCE_LEAK storage: No need to check ret after VIR_APPEND_ELEMENT src/openvz/openvz_conf.c | 32 +++++++++++--------------------- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_zfs.c | 6 ++++-- 3 files changed, 16 insertions(+), 24 deletions(-) -- 2.5.0

2 5

[libvirt] [PATCH v4 0/2] notify about reverting to a snapshot
by Dmitry Andreev 25 Feb '16

25 Feb '16

Reverting to a snapshot may change domain configuration but there will be no events about that in some cases. Lack of the event become a problem for virt-manager https://bugzilla.redhat.com/show_bug.cgi?id=1081148 This patch-set introduces new event and emits it in qemuDomainRevertToSnapshot. v4: rebase v3: [2/2] event is emited only in the case when stopped domain is reverted to a stopped domain. Dmitry Andreev (2): Introduce new VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT sub-event qemu: emit 'defined' event after reverted to snapshot without state changes examples/object-events/event-test.c | 2 ++ include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 8 +++++++- tools/virsh-domain.c | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH] Revert "Error out on missing machine type in machine configs"
by Ján Tomko 25 Feb '16

25 Feb '16

Revert commit 55e6d8cd9eac7eb2aaa4d221585e9402cf7269d5. It unconditionally required a machine type for all machine types even though qemu is the only emulator using them. Reverting this re-introduces the crash when someone fiddles with libvirt's machine configs with /etc/, but fixes persistent domains for other drivers. Breaks https://bugzilla.redhat.com/show_bug.cgi?id=1267256 again. --- A proper fix would be too invasive for the freeze, we would either * have to revert commit f1a89a8 which relaxed the requirement to execute the emulator * or (partially) revert commits a8b628e and 3d92a00 which reintroduced them to post parse callbacks and keep track of which parser requires the machine type in virDomainDefParserConfig. src/conf/domain_conf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3b15cb4..79758d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14851,12 +14851,6 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } VIR_FREE(capsdata); - } else { - if (!def->os.machine) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing machine type")); - goto error; - } } /* Extract domain name */ -- 2.4.10

2 5

[libvirt] [PATCH] libxl: implement virDomainInterfaceStats
by Joao Martins 25 Feb '16

25 Feb '16

Introduce support for domainInterfaceStats API call for querying network interface statistics. Consequently it also enables the use of `virsh domifstat <dom> <interface name>` command plus seeing the interfaces names instead of "-" when doing `virsh domiflist <dom>`. After successful guest creation we fill the network interfaces names based on domain, device id and append suffix if it's emulated in the following form: vif<domid>.<devid>[-emu]. We extract the network interfaces info from the libxl_domain_config object in libxlDomainCreateIfaceNames() to generate ifname. On domain cleanup we also clear ifname, in case it was set by libvirt (i.e. being prefixed with "vif"). We also skip these two steps in case the name of the interface was manually inserted by the adminstrator. Since the introdution of netprefix (commit a040ba9), ifnames with a registered prefix will be freed on virDomain{Obj,Def}Format*, thus eliminating the migration issues observed with the reverted commit d2e5538 whereas source and destination would have the same ifname. For getting the interface statistics we resort to virNetInterfaceStats and let libvirt handle the platform specific nits. Note that the latter is not yet supported in FreeBSD. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since d2e5538: - Check net->ifname beforehand, preventing a crash on the migration failure path. - Use LIBXL_GENERATED_PREFIX_XEN as opposed to hardcoding "vif" - Bump from 1.3.0 to 1.3.2 - Change commit message to mention the migration issue and netprefix. --- src/libxl/libxl_domain.c | 39 ++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 50f7eed..9d0da68 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -762,6 +762,18 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } + if ((vm->def->nnets)) { + size_t i; + + for (i = 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + + if (net->ifname && + STRPREFIX(net->ifname, LIBXL_GENERATED_PREFIX_XEN)) + VIR_FREE(net->ifname); + } + } + if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); @@ -929,6 +941,32 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) libxl_event_free(ctx, ev); } +/* + * Create interface names for the network devices in parameter def. + * Names are created with the pattern 'vif<domid>.<devid><suffix>'. + * devid is extracted from the network devices in the d_config + * parameter. User-provided interface names are skipped. + */ +static void +libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) +{ + size_t i; + + for (i = 0; i < def->nnets && i < d_config->num_nics; i++) { + virDomainNetDefPtr net = def->nets[i]; + libxl_device_nic *x_nic = &d_config->nics[i]; + const char *suffix = + x_nic->nictype != LIBXL_NIC_TYPE_VIF ? "-emu" : ""; + + if (net->ifname) + continue; + + ignore_value(virAsprintf(&net->ifname, + LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", + def->id, x_nic->devid, suffix)); + } +} + /* * Start a domain through libxenlight. @@ -1073,6 +1111,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto cleanup_dom; + libxlDomainCreateIfaceNames(vm->def, &d_config); if ((dom_xml = virDomainDefFormat(vm->def, cfg->caps, 0)) == NULL) goto cleanup_dom; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 404016e..5479441 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -58,6 +58,7 @@ #include "virhostdev.h" #include "network/bridge_driver.h" #include "locking/domain_lock.h" +#include "virstats.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -4662,6 +4663,56 @@ libxlDomainIsUpdated(virDomainPtr dom) } static int +libxlDomainInterfaceStats(virDomainPtr dom, + const char *path, + virDomainInterfaceStatsPtr stats) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + ssize_t i; + int ret = -1; + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainInterfaceStatsEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + /* Check the path is one of the domain's network interfaces. */ + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->ifname && + STREQ(vm->def->nets[i]->ifname, path)) { + ret = 0; + break; + } + } + + if (ret == 0) + ret = virNetInterfaceStats(path, stats); + else + virReportError(VIR_ERR_INVALID_ARG, + _("'%s' is not a known interface"), path); + + endjob: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static int libxlDomainGetTotalCPUStats(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virTypedParameterPtr params, @@ -5539,6 +5590,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ .domainGetCPUStats = libxlDomainGetCPUStats, /* 1.3.0 */ + .domainInterfaceStats = libxlDomainInterfaceStats, /* 1.3.2 */ .connectDomainEventRegister = libxlConnectDomainEventRegister, /* 0.9.0 */ .connectDomainEventDeregister = libxlConnectDomainEventDeregister, /* 0.9.0 */ .domainManagedSave = libxlDomainManagedSave, /* 0.9.2 */ -- 2.1.4

2 2

[libvirt] [PATCH] Error out on missing machine type in machine configs
by Ján Tomko 25 Feb '16

25 Feb '16

Commit f1a89a8 allowed parsing configs from /etc/libvirt without validating the emulator capabilities. Check for the presence of os->type.machine even if the VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS flag is set, otherwise the daemon can crash on carelessly crafted input in the config directory. https://bugzilla.redhat.com/show_bug.cgi?id=1267256 --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 67415fa..5d3fed0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14841,6 +14841,12 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } VIR_FREE(capsdata); + } else { + if (!def->os.machine) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing machine type")); + goto error; + } } /* Extract domain name */ -- 2.4.10

2 3

[libvirt] [PATCH] util: Avoid calling closedir(NULL)
by Jiri Denemark 25 Feb '16

25 Feb '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ea95552..5c79c42 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3104,63 +3104,63 @@ static int virNetDevRDMAFeature(const char *ifname, virBitmapPtr *out) { char *eth_devpath = NULL; char *ib_devpath = NULL; char *eth_res_buf = NULL; char *ib_res_buf = NULL; DIR *dirp = NULL; struct dirent *dp; int ret = -1; if (!virFileExists(SYSFS_INFINIBAND_DIR)) return 0; if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) { virReportSystemError(errno, _("Failed to opendir path '%s'"), SYSFS_INFINIBAND_DIR); - goto cleanup; + return -1; } if (virAsprintf(&eth_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0) goto cleanup; if (!virFileExists(eth_devpath)) goto cleanup; if (virFileReadAll(eth_devpath, RESOURCE_FILE_LEN, &eth_res_buf) < 0) goto cleanup; while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { if (dp->d_name[0] == '.') continue; if (virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", dp->d_name) < 0) continue; if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0 && STREQ(eth_res_buf, ib_res_buf)) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); break; } VIR_FREE(ib_devpath); VIR_FREE(ib_res_buf); } ret = 0; cleanup: closedir(dirp); VIR_FREE(eth_devpath); VIR_FREE(ib_devpath); VIR_FREE(eth_res_buf); VIR_FREE(ib_res_buf); return ret; } /** * virNetDevSendEthtoolIoctl * This function sends ethtool ioctl request * * @ifname: name of the interface * @cmd: reference to an ethtool command structure * * Returns 0 on success, -1 on failure. */ -- 2.7.2

2 1

[libvirt] [PATCH v2 0/2] Enable detection for zero writes
by Martin Kletzander 25 Feb '16

25 Feb '16

This is a second version with few things fixed. The main difference is that now this series uses zeroes instead of zeros. The latter was chosen at first just because there were more occurences in our codebase, but the former is used now to minimise the confusion -- mainly when none of the versions were used when interfacing with the user or mgmt app. The naming is kept from the previous version despite the discussion as I believe this is pretty general. Also the default value is not changed to 'off' in order for it to be general enough (some hypervisors might choose a different default in the future). Martin Kletzander (2): conf: Add support of zero-detection for disks qemu: Add support for zero-detection writes docs/formatdomain.html.in | 10 +++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 23 ++++++++++- src/conf/domain_conf.h | 11 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argv-disk-drive-detect-zeroes.args | 27 +++++++++++++ .../qemuxml2argv-disk-drive-detect-zeroes.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-disk-drive-detect-zeroes.xml | 1 + tests/qemuxml2xmltest.c | 1 + 17 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml -- 2.7.1

2 3

[libvirt] [PATCH V2] Fix bug of attaching redirdev device
by Osier Yang 25 Feb '16

25 Feb '16

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1298070 The corresponding chardev must be attached first, otherwise the the qemu command line won't be complete (missing the host part), --- src/qemu/qemu_hotplug.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ee305e7..40cead7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1381,6 +1381,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, int ret; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; + char *charAlias = NULL; char *devstr = NULL; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -1391,6 +1392,10 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) goto error; + + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) + goto error; + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto error; @@ -1398,6 +1403,14 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, goto error; qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorAttachCharDev(priv->mon, + charAlias, + &(redirdev->source.chr)) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto error; + } + VIR_FREE(charAlias); + ret = qemuMonitorAddDevice(priv->mon, devstr); if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -1414,9 +1427,9 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, return 0; error: + VIR_FREE(charAlias); VIR_FREE(devstr); return -1; - } static int -- 2.1.4

2 3

[libvirt] [PATCH] vircgroupmock: Mock access("/sys/devices/system/cpu/present")
by Michal Privoznik 25 Feb '16

25 Feb '16

There's been a report on the upstream list [1] describing we access /sys/devices/system/cpu/present directly on the host from within our test suite. This may end up in unpredictable results as no all linux systems are required to have that file. Mock access to the file. libvirt.git/tests $ ../run strace vircgrouptest ... access("/sys/devices/system/cpu/present", F_OK) = 0 open("libvirt.git/tests/fakerootdir-DmE8Z9/not/really/sys/fs/cgroup//devices_system_cpu_present", O_RDONLY) = 4 read(4, "8-23,48-159\n", 5121) = 12 read(4, "", 5109) = 0 close(4) = 0 ... Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vircgroupmock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 9ce7d41..756ac51 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -541,7 +541,8 @@ int access(const char *path, int mode) ret = realaccess(newpath, mode); free(newpath); } else if (STREQ(path, "/proc/cgroups") || - STREQ(path, "/proc/self/cgroup")) { + STREQ(path, "/proc/self/cgroup") || + STREQ(path, SYSFS_CPU_PRESENT)) { /* These files are readable for all. */ ret = (mode == F_OK || mode == R_OK) ? 0 : -1; } else if (STREQ(path, "/proc/mounts")) { -- 2.4.10

2 1

[libvirt] how to test libvirt?
by Zhangbo (Oscar) 25 Feb '16

25 Feb '16

Hi all: AFAIK, there're several ways to test libvirt: 1) virt-test, which is driven by autotest or avocado-vt, based on qemu-kvm 2) test driver which is parall to other drivers such as qemu_driver and libxl_driver in libvirt. 3) make -c tests, which aims to do low level tests, that is to test function modules of libvirt. 4) libvirt-test-API I've got 2 questions: 1) besides the 4 test suites, are there any other automatic-test tools? 2) is there any testsuite used to test libxl_driver, similar to virt-test? Anyone knows that? Thanks in advance. Oscar.

4 5

[libvirt] [PATCH] build: accomodate selinux 2.5 header API change
by Eric Blake 24 Feb '16

24 Feb '16

Yet again, selinux has been adding const-correctness; this change is ABI-compatible, but breaks API, which affects us when we try to override things in our testsuite: ../../tests/securityselinuxhelper.c:307:24: error: conflicting types for 'selabel_open' struct selabel_handle *selabel_open(unsigned int backend, ^~~~~~~~~~~~ In file included from ../../tests/securityselinuxhelper.c:32:0: /usr/include/selinux/label.h:73:24: note: previous declaration of 'selabel_open' was here The problem is a new 'const' prior to the second parameter. Fix it the same way we did in commit 292d3f2d: check for the new const at configure time. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. m4/virt-selinux.m4 | 17 ++++++++++++++++- tests/securityselinuxhelper.c | 10 ++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/m4/virt-selinux.m4 b/m4/virt-selinux.m4 index 357b758..a65e978 100644 --- a/m4/virt-selinux.m4 +++ b/m4/virt-selinux.m4 @@ -1,6 +1,6 @@ dnl The libselinux.so library dnl -dnl Copyright (C) 2012-2014 Red Hat, Inc. +dnl Copyright (C) 2012-2014, 2016 Red Hat, Inc. dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -41,6 +41,21 @@ int setcon(char *context); AC_DEFINE_UNQUOTED([VIR_SELINUX_CTX_CONST], [$lv_cv_setcon_const], [Define to empty or 'const' depending on how SELinux qualifies its security context parameters]) + # ...and again for 2.5 + AC_CACHE_CHECK([for selinux selabel_open parameter type], + [lv_cv_selabel_open_const], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <selinux/selinux.h> +#include <selinux/label.h> +struct selabel_handle *selabel_open(unsigned, struct selinux_opt *, unsigned); + ]])], + [lv_cv_selabel_open_const=''], + [lv_cv_selabel_open_const='const'])]) + AC_DEFINE_UNQUOTED([VIR_SELINUX_OPEN_CONST], [$lv_cv_selabel_open_const], + [Define to empty or 'const' depending on how SELinux qualifies its + selabel_open parameter]) AC_MSG_CHECKING([SELinux mount point]) if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 1252c15..2cfa43f 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Red Hat, Inc. + * Copyright (C) 2011-2013, 2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,6 +60,7 @@ static const char *(*realselinux_lxc_contexts_path)(void); #if HAVE_SELINUX_LABEL_H static struct selabel_handle *(*realselabel_open)(unsigned int backend, + VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, unsigned nopts); static void (*realselabel_close)(struct selabel_handle *handle); @@ -304,9 +305,10 @@ const char *selinux_lxc_contexts_path(void) #endif #if HAVE_SELINUX_LABEL_H -struct selabel_handle *selabel_open(unsigned int backend, - struct selinux_opt *opts, - unsigned nopts) +struct selabel_handle * +selabel_open(unsigned int backend, + VIR_SELINUX_OPEN_CONST struct selinux_opt *opts, + unsigned nopts) { char *fake_handle; -- 2.5.0

1 0

[libvirt] Dealing with GCC 6.0
by Martin Kletzander 24 Feb '16

24 Feb '16

So we recently started compiling with gcc 5 and there's a new thing now and we don't build on gcc 6. I know it's just a development build, but it finds new things, like: fdstream.c: In function 'virFDStreamWrite': fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op] if (errno == EAGAIN || errno == EWOULDBLOCK) { ^~ fdstream.c: In function 'virFDStreamRead': fdstream.c:440:29: error: logical 'or' of equal expressions [-Werror=logical-op] if (errno == EAGAIN || errno == EWOULDBLOCK) { ^~ and rpc/virnetsshsession.c: In function 'virNetSSHAuthenticateAgent': rpc/virnetsshsession.c:548:56: error: logical 'and' of equal expressions [-Werror=logical-op] if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED && ^~ rpc/virnetsshsession.c: In function 'virNetSSHAuthenticatePrivkey': rpc/virnetsshsession.c:676:57: error: logical 'or' of equal expressions [-Werror=logical-op] if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED || ^~ The first one is prety easy to fix, that's the only place where we use EWOULDBLOCK, we are using only EAGAIN everywhere else. However, the second one is not that easy to change for me as I'm not a libssh expert and moreover, I would like to know other's opinions on how to tackle that. We can disable the logical-op warning, but it might show something that makes sense (really?). Or we can do bunch of very very ugly "#if"s. Anyone care to share an idea? Have a nice day, Martin

3 4

[libvirt] [PATCH v2 0/4] implement vram64 attribute for QXL video device
by Pavel Hrdina 24 Feb '16

24 Feb '16

New in v2: - added patch to always set primary video device as primary - introduced new qemu monitor functions to update vram64 values after QEMU is started only if QEMU supports this parameter Pavel Hrdina (4): domain_conf: always set primary video device as primary docs/formatdomain: rewrite video documentation qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64 qemu: introduce vram64 attribute for QXL video device docs/formatdomain.html.in | 18 ++++---- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 40 +++++++++++++--- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 32 ++++++++++--- src/qemu/qemu_monitor.c | 35 ++++++++++++++ src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 54 ++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ src/qemu/qemu_process.c | 24 ++++++---- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 + ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-video-qxl-device-vram64.args | 25 ++++++++++ .../qemuxml2argv-video-qxl-device-vram64.xml | 29 ++++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.args | 27 +++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.xml | 32 +++++++++++++ .../qemuxml2xmlout-graphics-listen-network.xml | 2 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2xmlout-graphics-sdl.xml | 2 +- .../qemuxml2xmlout-graphics-spice-compression.xml | 2 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-graphics-spice.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-tls.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-websocket.xml | 2 +- .../qemuxml2xmlout-graphics-vnc.xml | 2 +- .../qemuxml2xmlout-interface-server.xml | 2 +- .../qemuxml2xmlout-net-bandwidth.xml | 2 +- .../qemuxml2xmlout-net-bandwidth2.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- .../qemuxml2xmlout-pci-bridge.xml | 2 +- .../qemuxml2xmlout-pcie-root-port.xml | 2 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 2 +- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 2 +- .../qemuxml2xmlout-pcihole64-q35.xml | 2 +- .../qemuxml2xmlout-q35-usb2-multi.xml | 2 +- .../qemuxml2xmlout-q35-usb2-reorder.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- ...emuxml2xmlout-seclabel-dynamic-none-relabel.xml | 2 +- .../qemuxml2xmlout-serial-spiceport.xml | 2 +- .../qemuxml2xmlout-video-virtio-gpu-device.xml | 2 +- .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 2 +- 58 files changed, 357 insertions(+), 62 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.xml -- 2.7.1

2 6

[libvirt] [FOR 1.3.0 PATCH] conf: add net device prefix for Xen
by Jim Fehlig 24 Feb '16

24 Feb '16

In commit d2e5538b1, the libxl driver was changed to copy interface names autogenerated by libxl to the corresponding network def in the domain's virDomainDef object. The copied name is freed when the domain transitions to the shutoff state. But when migrating a domain, the autogenerated name is included in the XML sent to the destination host. It is possible an interface with the same name already exists on the destination host, causing migration to fail. Indeed the Xen project's OSSTEST CI already encountered such a failure. This patch defines another VIR_NET_GENERATED_PREFIX for Xen, allowing the autogenerated names to be excluded when parsing and formatting inactive config. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- This is an alternative approach to Joao's fix for this regression https://www.redhat.com/archives/libvir-list/2015-December/msg00197.html I think it is the same approach used by the qemu driver. My only reservation is that it expands the potential for clashes with user-defined names. I.e. with this change both 'vnet' and 'vif' are reserved prefixes. src/conf/domain_conf.c | 6 ++++-- src/conf/domain_conf.h | 4 ++++ src/libxl/libxl_domain.c | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2f5c0ed..debcf4e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8428,7 +8428,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, ifname = virXMLPropString(cur, "dev"); if (ifname && (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && - STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX)) { + (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX) || + STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX_XEN))) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); } @@ -19790,7 +19791,8 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name); if (def->ifname && !((flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE) && - (STRPREFIX(def->ifname, VIR_NET_GENERATED_PREFIX)))) { + (STRPREFIX(def->ifname, VIR_NET_GENERATED_PREFIX) || + STRPREFIX(def->ifname, VIR_NET_GENERATED_PREFIX_XEN)))) { /* Skip auto-generated target names for inactive config. */ virBufferEscapeString(buf, "<target dev='%s'/>\n", def->ifname); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 90d8e13..d2cc26f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1085,6 +1085,10 @@ struct _virDomainNetDef { * by libvirt, and cannot be used for a persistent network name. */ # define VIR_NET_GENERATED_PREFIX "vnet" +/* Used for prefix of ifname of any network name generated dynamically + * by libvirt for Xen, and cannot be used for a persistent network name. */ +# define VIR_NET_GENERATED_PREFIX_XEN "vif" + typedef enum { VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT = 0, VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef92974..c5d84a4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -734,7 +734,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, for (i = 0; i < vm->def->nnets; i++) { virDomainNetDefPtr net = vm->def->nets[i]; - if (STRPREFIX(net->ifname, "vif")) + if (STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX_XEN)) VIR_FREE(net->ifname); } } @@ -918,7 +918,8 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) if (net->ifname) continue; - ignore_value(virAsprintf(&net->ifname, "vif%d.%d%s", + ignore_value(virAsprintf(&net->ifname, + VIR_NET_GENERATED_PREFIX_XEN "%d.%d%s", def->id, x_nic->devid, suffix)); } } -- 2.6.1

3 8

[libvirt] request for wiki account
by Adam Hunt 24 Feb '16

24 Feb '16

I would like to request an account to update the libvirt wiki. first: Adam last: Hunt user: voxadam email: voxadam(a)gmail.com --adam

1 0

[libvirt] [PATCH v3 0/7] migration: add multithread compression
by Nikolay Shirokovskiy 24 Feb '16

24 Feb '16

Add options to turn multithread compression on during migration and to configure its parameters. Changes from v2: 1. Multiple field parameter is used to specify compression methods that should be used during migration. VIR_MIGRATE_COMPRESSED option flag now specifies that default compression methods should be used so we keep backward compatibility. This method is lxbzrle for qemu. 2. Patch that adds monitor commands to configure multithread compression parameters and patch that adds compression options to migrate command are reworked. This series has not patches to configure compression parameters before migration. Do we need it? Also it has not patch to introspect compression methods supported by driver as Jiri suggested because I want to publish this series ealier to check that I'm going in right direction. Eli Qiao (1): qemumonitorjsontest: add test for getting multithread compress params Nikolay Shirokovskiy (4): qemu migration: factor out setting migration option migration: add compress method option qemu migration: add multithread compression options qemu migration: add xbzrle compression options ShaoHe Feng (2): qemu monitor: add multithread compress parameters accessors virsh: add compression options for migration include/libvirt/libvirt-domain.h | 44 ++++++- src/qemu/qemu_domain.c | 4 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 116 +++++++++++++++++- src/qemu/qemu_migration.c | 256 +++++++++++++++++++-------------------- src/qemu/qemu_migration.h | 24 ++++ src/qemu/qemu_monitor.c | 31 ++++- src/qemu/qemu_monitor.h | 17 +++ src/qemu/qemu_monitor_json.c | 87 +++++++++++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_monitor_text.c | 100 +++++++++++++++ src/qemu/qemu_monitor_text.h | 5 + tests/qemumonitorjsontest.c | 53 ++++++++ tools/virsh-domain.c | 84 +++++++++++++ tools/virsh.pod | 25 +++- 15 files changed, 711 insertions(+), 142 deletions(-) -- 1.8.3.1

3 23

[libvirt] [PATCH V2 0/4] libxl: support qemu's network-based block backends
by Jim Fehlig 24 Feb '16

24 Feb '16

xl/libxl already supports qemu's network-based block backends such as nbd and rbd. libvirt has supported configuring network disks for long time too. This series marries the two in the libxl driver and in the xl<->xml converter. Only rbd supported is added in this series. Support for other backends such as nbd and iscsi can be added as a follow-up improvement. Patch 1 is super trivial and contains no functional changes. Patch 2 changes the xl disk configuration produced by the xml->xl converter to use the formal key=value syntax described in xl-disk-configuration.txt. Patch 3 adds support for converting rbd info between xl and xml config formats. Patch 4 adds support for rbd disks in the libxl driver. In V2: Change commit msg, test, and code in patch3 to escape literal backslashes with a backslash. Jim Fehlig (4): xenconfig: replace text 'xm' with 'xl' in xlconfigtest xenconfig: produce key=value disk config syntax in xl formatter xenconfig: support xl<->xml conversion of rbd disk devices libxl: add support for rbd qdisk src/libxl/libxl_conf.c | 192 ++++++++++++++++++++- src/xenconfig/xen_xl.c | 176 +++++++++++++++++-- .../test-disk-positional-parms-full.cfg | 26 +++ .../test-disk-positional-parms-full.xml | 54 ++++++ .../test-disk-positional-parms-partial.cfg | 26 +++ .../test-disk-positional-parms-partial.xml | 54 ++++++ .../test-fullvirt-direct-kernel-boot.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-paravirt-cmdline.cfg | 2 +- tests/xlconfigdata/test-paravirt-maxvcpus.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 26 +++ tests/xlconfigdata/test-rbd-multihost-noauth.xml | 51 ++++++ tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigtest.c | 37 ++-- 17 files changed, 618 insertions(+), 40 deletions(-) create mode 100644 tests/xlconfigdata/test-disk-positional-parms-full.cfg create mode 100644 tests/xlconfigdata/test-disk-positional-parms-full.xml create mode 100644 tests/xlconfigdata/test-disk-positional-parms-partial.cfg create mode 100644 tests/xlconfigdata/test-disk-positional-parms-partial.xml create mode 100644 tests/xlconfigdata/test-rbd-multihost-noauth.cfg create mode 100644 tests/xlconfigdata/test-rbd-multihost-noauth.xml -- 2.1.4

3 13

[libvirt] [PATCH] rbd: fix 32-bit build
by Eric Blake 24 Feb '16

24 Feb '16

%zu is not always synonymous with uint64_t; on 32-bit machines, size_t is only 32 bits. Prefer "%llu"/'unsigned long long' when the variable is under our control, and "%"PRIu64 when we are stuck with 'uint64_t' from RBD. Fixes errors such as: ../../src/storage/storage_backend_rbd.c: In function 'virStorageBackendRBDVolWipe': ../../src/storage/storage_backend_rbd.c:1281:15: error: format '%zu' expects argument of type 'size_t', but argument 8 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=] VIR_DEBUG("Need to wipe %zu bytes from RBD image %s/%s", ^ ../../src/util/virlog.h:90:73: note: in definition of macro 'VIR_DEBUG_INT' virLogMessage(src, VIR_LOG_DEBUG, filename, linenr, funcname, NULL, __VA_ARGS__) ^ ../../src/storage/storage_backend_rbd.c:1281:5: note: in expansion of macro 'VIR_DEBUG' VIR_DEBUG("Need to wipe %zu bytes from RBD image %s/%s", ^ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule src/storage/storage_backend_rbd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 0591eec..7d04b39 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -23,6 +23,7 @@ #include <config.h> +#include <inttypes.h> #include "datatypes.h" #include "virerror.h" #include "storage_backend_rbd.h" @@ -403,7 +404,7 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, } VIR_DEBUG("Refreshed RBD image %s/%s (capacity: %llu allocation: %llu " - "obj_size: %zu num_objs: %zu)", + "obj_size: %"PRIu64" num_objs: %"PRIu64")", pool->def->source.name, vol->name, vol->target.capacity, vol->target.allocation, info.obj_size, info.num_objs); @@ -463,7 +464,8 @@ virStorageBackendRBDRefreshPool(virConnectPtr conn, pool->def->available = clusterstat.kb_avail * 1024; pool->def->allocation = poolstat.num_bytes; - VIR_DEBUG("Utilization of RBD pool %s: (kb: %zu kb_avail: %zu num_bytes: %zu)", + VIR_DEBUG("Utilization of RBD pool %s: (kb: %"PRIu64" kb_avail: %"PRIu64 + " num_bytes: %"PRIu64")", pool->def->source.name, clusterstat.kb, clusterstat.kb_avail, poolstat.num_bytes); @@ -1168,8 +1170,8 @@ virStorageBackendRBDVolWipeZero(rbd_image_t image, { int r = -1; int ret = -1; - uint64_t offset = 0; - uint64_t length; + unsigned long long offset = 0; + unsigned long long length; char *writebuf; if (VIR_ALLOC_N(writebuf, info->obj_size * stripe_count) < 0) @@ -1179,13 +1181,13 @@ virStorageBackendRBDVolWipeZero(rbd_image_t image, length = MIN((info->size - offset), (info->obj_size * stripe_count)); if ((r = rbd_write(image, offset, length, writebuf)) < 0) { - virReportSystemError(-r, _("writing %zu bytes failed on " - "RBD image %s at offset %zu"), + virReportSystemError(-r, _("writing %llu bytes failed on " + "RBD image %s at offset %llu"), length, imgname, offset); goto cleanup; } - VIR_DEBUG("Wrote %zu bytes to RBD image %s at offset %zu", + VIR_DEBUG("Wrote %llu bytes to RBD image %s at offset %llu", length, imgname, offset); offset += length; @@ -1207,8 +1209,8 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, { int r = -1; int ret = -1; - uint64_t offset = 0; - uint64_t length; + unsigned long long offset = 0; + unsigned long long length; VIR_DEBUG("Wiping RBD %s volume using discard)", imgname); @@ -1216,13 +1218,13 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, length = MIN((info->size - offset), (info->obj_size * stripe_count)); if ((r = rbd_discard(image, offset, length)) < 0) { - virReportSystemError(-r, _("discarding %zu bytes failed on " - "RBD image %s at offset %zu"), + virReportSystemError(-r, _("discarding %llu bytes failed on " + "RBD image %s at offset %llu"), length, imgname, offset); goto cleanup; } - VIR_DEBUG("Discarded %zu bytes of RBD image %s at offset %zu", + VIR_DEBUG("Discarded %llu bytes of RBD image %s at offset %llu", length, imgname, offset); offset += length; @@ -1278,7 +1280,7 @@ virStorageBackendRBDVolWipe(virConnectPtr conn, goto cleanup; } - VIR_DEBUG("Need to wipe %zu bytes from RBD image %s/%s", + VIR_DEBUG("Need to wipe %"PRIu64" bytes from RBD image %s/%s", info.size, pool->def->source.name, vol->name); switch ((virStorageVolWipeAlgorithm) algorithm) { -- 2.5.0

1 0

[libvirt] Storage backend and RBD improvements
by Wido den Hollander 23 Feb '16

23 Feb '16

This series of patches is mainly focussed on improving the RBD storage pool backend. In the series it fixes a bug in the storage pool driver regarding volume wiping and it also adds the new flag to instruct storage pools to use TRIM for wiping volumes. Afterwards it adds this functionality to the RBD storage pool and in addition it also adds to ability to clone RBD volumes. The original series of patches were reviewed by John Ferlan and this series are revised based on his great feedback. Wido

5 13

[libvirt] [PATCH] libxl: fix bogus indentation from commit fb2bd208
by Jim Fehlig 23 Feb '16

23 Feb '16

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Found by Ján Tomko while reviewing fb2bd208. Pushing under the trivial rule. src/libxl/libxl_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5133299..a109bb5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1095,7 +1095,7 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) } if (!(*srcstr = libxlMakeNetworkDiskSrcStr(src, username, secret))) - goto cleanup; + goto cleanup; ret = 0; -- 2.6.1

1 0

[libvirt] [PATCH v7 00/13] qemu: Add quorum support to libvirt
by Matthias Gatto 23 Feb '16

23 Feb '16

The purpose of these patches is to introduce quorum for libvirt I've try to follow this proposal: http://www.redhat.com/archives/libvir-list/2014-May/msg00533.html This feature ask for 5 task: 1) Allow a _virStorageSource to contain more than one backing store. Because all the actual libvirt code use the backingStore field as a pointer and we needs want to change that, I've decide to encapsulate the backingStore field to simplifie the array manipulation. 2) Add the missing field a quorum need in _virStorageSource and the VIR_STORAGE_TYPE_QUORUM and VIR_STORAGE_FILE_QUORUM in their respectives enums. 3) Parse and format the xml Because a quorum allows to have more than one backing store at the same level we need to change virDomainDiskDefFormat and virDomainDiskDefParseXML to call virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse in a loop. virDomainDiskBackingStoreFormat and virDomainDiskBackingStoreParse can call themself recursively in a loop because a quorum can contain another quorum 4) Build qemu string As for the xml, we have to call the function which create quorum recursively. But this task have the problem explained here: http://www.redhat.com/archives/libvir-list/2014-October/msg00529.html The _virStorageSource missing some informations that can be passed to a child, and therefore this version of quorum is incomplet. 5) Allow to hotplug/change a disk in a quorum This part is not present in these patches because for this task we have to use blockdev-add, and currently libvirt use device_add for hotpluging that doesn't allow to hotplug quorum childs. V2: -Rebase on master -Add Documentation V3: -Transforme the backingStore field in virStorageSource into an array of pointer instead of a pointer -Modify virStorageSourceSetBackingStore to allow it to expand the backingStore size. V4: -Rebase on master V5: -Rebase on master -patch 1-4/9: use patchs from John Ferlan -patch 4/9: check return of virStorageSourceSetBackingStore -patch 5/9: report type of error on virStorageSourceSetBackingStore v6: -Rebase on master -Remove node-name patch -patch 06/13: Add virStorageSourceIsRAID -patch 10/13: Add virDomainDefHasRAID -patch 11-13/13: Block all unsupported operations v7: -Rebase on master. -Parse unconditionally backing store. -fold qemuBuildRAIDFileSourceStr into qemuBuildRAIDStr. -use 0/-1 return values when failing instead of bool. -virStorageSourceSetBackingStore now free backing store when they are already set. Matthias Gatto (13): virstoragefile: Add virStorageSourceGetBackingStore virstoragefile: Always use virStorageSourceGetBackingStore to get backing store virstoragefile: Add virStorageSourceSetBackingStore virstoragefile: Always use virStorageSourceSetBackingStore to set backing store virstoragefile: change backingStore to backingStores. virstoragefile: Add virStorageSourceIsRAID virstoragefile: Add quorum in virstoragefile domain_conf: Read and Write quorum config qemu: Add quorum support in qemuBuildDriveDevStr domain: Add virDomainDefHasRAID qemu: Forbid blocks operations with quorum qemu: qemuDomainGetBlockInfo quorum support qemu: qemuDiskPathToAlias quorum support docs/formatdomain.html.in | 23 ++++- docs/schemas/domaincommon.rng | 21 +++- docs/schemas/storagecommon.rng | 1 + docs/schemas/storagevol.rng | 1 + src/conf/domain_conf.c | 174 ++++++++++++++++++++++++---------- src/conf/domain_conf.h | 1 + src/conf/storage_conf.c | 23 +++-- src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 78 +++++++++++++++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 72 ++++++++++---- src/qemu/qemu_migration.c | 1 + src/qemu/qemu_monitor_json.c | 4 +- src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 24 +++-- src/storage/storage_backend_fs.c | 45 +++++---- src/storage/storage_backend_gluster.c | 11 ++- src/storage/storage_backend_logical.c | 15 ++- src/storage/storage_driver.c | 3 +- src/util/virstoragefile.c | 121 ++++++++++++++++++++--- src/util/virstoragefile.h | 15 ++- tests/virstoragetest.c | 18 ++-- 25 files changed, 518 insertions(+), 151 deletions(-) -- 2.6.2

4 27

[libvirt] [PATCH] Miscellaneous for-loop syntax clean-ups
by Martin Kletzander 23 Feb '16

23 Feb '16

Checking whether x > 0 before looping over [0..x] items doesn't make sense and multi-line body must have curly brackets around it. Best viewed with '-w'. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 24 +++++++++++++------- src/qemu/qemu_capabilities.c | 30 ++++++++++++------------ src/storage/storage_backend_rbd.c | 48 +++++++++++++++++++-------------------- src/vbox/vbox_common.c | 14 ++++-------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 56bd1aa99042..3b15cb46d9ec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22363,17 +22363,20 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } - for (n = 0; n < def->ngraphics; n++) + for (n = 0; n < def->ngraphics; n++) { if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0) goto error; + } - for (n = 0; n < def->nsounds; n++) + for (n = 0; n < def->nsounds; n++) { if (virDomainSoundDefFormat(buf, def->sounds[n], flags) < 0) goto error; + } - for (n = 0; n < def->nvideos; n++) + for (n = 0; n < def->nvideos; n++) { if (virDomainVideoDefFormat(buf, def->videos[n], flags) < 0) goto error; + } for (n = 0; n < def->nhostdevs; n++) { /* If parent.type != NONE, this is just a pointer to the @@ -22386,16 +22389,18 @@ virDomainDefFormatInternal(virDomainDefPtr def, } } - for (n = 0; n < def->nredirdevs; n++) + for (n = 0; n < def->nredirdevs; n++) { if (virDomainRedirdevDefFormat(buf, def->redirdevs[n], flags) < 0) goto error; + } if (def->redirfilter) virDomainRedirFilterDefFormat(buf, def->redirfilter); - for (n = 0; n < def->nhubs; n++) + for (n = 0; n < def->nhubs; n++) { if (virDomainHubDefFormat(buf, def->hubs[n], flags) < 0) goto error; + } if (def->watchdog) virDomainWatchdogDefFormat(buf, def->watchdog, flags); @@ -22411,17 +22416,20 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->nvram) virDomainNVRAMDefFormat(buf, def->nvram, flags); - for (n = 0; n < def->npanics; n++) + for (n = 0; n < def->npanics; n++) { if (virDomainPanicDefFormat(buf, def->panics[n]) < 0) goto error; + } - for (n = 0; n < def->nshmems; n++) + for (n = 0; n < def->nshmems; n++) { if (virDomainShmemDefFormat(buf, def->shmems[n], flags) < 0) goto error; + } - for (n = 0; n < def->nmems; n++) + for (n = 0; n < def->nmems; n++) { if (virDomainMemoryDefFormat(buf, def->mems[n], flags) < 0) goto error; + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</devices>\n"); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e344b095..a165ab4be291 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2772,23 +2772,21 @@ virQEMUCapsLoadCache(virQEMUCapsPtr qemuCaps, const char *filename, goto cleanup; } VIR_DEBUG("Got flags %d", n); - if (n > 0) { - for (i = 0; i < n; i++) { - int flag; - if (!(str = virXMLPropString(nodes[i], "name"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing flag name in QEMU capabilities cache")); - goto cleanup; - } - flag = virQEMUCapsTypeFromString(str); - if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"), str); - goto cleanup; - } - VIR_FREE(str); - virQEMUCapsSet(qemuCaps, flag); + for (i = 0; i < n; i++) { + int flag; + if (!(str = virXMLPropString(nodes[i], "name"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing flag name in QEMU capabilities cache")); + goto cleanup; + } + flag = virQEMUCapsTypeFromString(str); + if (flag < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown qemu capabilities flag %s"), str); + goto cleanup; } + VIR_FREE(str); + virQEMUCapsSet(qemuCaps, flag); } VIR_FREE(nodes); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 098b7dc5f0d0..0591eecde26d 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -566,38 +566,36 @@ virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, VIR_DEBUG("Found %d snapshots for volume %s/%s", snap_count, source->name, vol->name); - if (snap_count > 0) { - for (i = 0; i < snap_count; i++) { - if ((r = rbd_snap_is_protected(image, snaps[i].name, &protected)) < 0) { - virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"), - source->name, vol->name, - snaps[i].name); - goto cleanup; - } - - if (protected == 1) { - VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " - "unprotected", source->name, vol->name, - snaps[i].name); - - if ((r = rbd_snap_unprotect(image, snaps[i].name)) < 0) { - virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"), - source->name, vol->name, - snaps[i].name); - goto cleanup; - } - } + for (i = 0; i < snap_count; i++) { + if ((r = rbd_snap_is_protected(image, snaps[i].name, &protected)) < 0) { + virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"), + source->name, vol->name, + snaps[i].name); + goto cleanup; + } - VIR_DEBUG("Removing snapshot %s/%s@%s", source->name, - vol->name, snaps[i].name); + if (protected == 1) { + VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " + "unprotected", source->name, vol->name, + snaps[i].name); - if ((r = rbd_snap_remove(image, snaps[i].name)) < 0) { - virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + if ((r = rbd_snap_unprotect(image, snaps[i].name)) < 0) { + virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"), source->name, vol->name, snaps[i].name); goto cleanup; } } + + VIR_DEBUG("Removing snapshot %s/%s@%s", source->name, + vol->name, snaps[i].name); + + if ((r = rbd_snap_remove(image, snaps[i].name)) < 0) { + virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + source->name, vol->name, + snaps[i].name); + goto cleanup; + } } ret = 0; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 067ed97cf1cb..5302d1ce80eb 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5541,11 +5541,9 @@ vboxDomainSnapshotGet(vboxGlobalData *data, } cleanup: - if (count > 0) { - for (i = 0; i < count; i++) { - if (snapshots[i] != snapshot) - VBOX_RELEASE(snapshots[i]); - } + for (i = 0; i < count; i++) { + if (snapshots[i] != snapshot) + VBOX_RELEASE(snapshots[i]); } VIR_FREE(snapshots); return snapshot; @@ -6255,10 +6253,8 @@ static int vboxDomainSnapshotListNames(virDomainPtr dom, char **names, ret = nameslen; cleanup: - if (count > 0) { - for (i = 0; i < count; i++) - VBOX_RELEASE(snapshots[i]); - } + for (i = 0; i < count; i++) + VBOX_RELEASE(snapshots[i]); VIR_FREE(snapshots); VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); -- 2.7.1

3 4

[libvirt] [PATCH 0/2] Introduce safewrite_str
by Ján Tomko 23 Feb '16

23 Feb '16

3 7

[libvirt] [PATCH 0/3] Couple of coverity fixes
by Michal Privoznik 23 Feb '16

23 Feb '16

All of these were spotted by coverity tool. Michal Privoznik (3): vbox: Avoid signed and unsigned comparison xen: Check return value of virStringReplace qemuBuildCommandLine: Change the condition for -nographics src/qemu/qemu_command.c | 2 +- src/vbox/vbox_common.c | 8 +++----- src/xenconfig/xen_xl.c | 7 ++++++- 3 files changed, 10 insertions(+), 7 deletions(-) -- 2.4.10

2 6

[libvirt] [PATCH] docs: Try harder to uninstall
by Michal Privoznik 23 Feb '16

23 Feb '16

Imagine you have partially installed libvirt, or maybe you're just running 'make uninstall' from a different version than 'make install' has been ran. One way or another, we are doing plain 'rm' instead of 'rm -f' and thus not trying hard enough when uninstalling. In the rest of our code we stick with -f switch. Do that for docs too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 02eca64..1b4353b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -366,8 +366,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: - for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done - for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done + for h in $(apihtml); do rm -f $(DESTDIR)$(HTML_DIR)/$$h; done + for p in $(apipng); do rm -f $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ + rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ done -- 2.4.10

2 1

[libvirt] libvirt-guests.sh not correctly working - patch included
by Draget 23 Feb '16

23 Feb '16

Greetings, this mail is sent via CC to ubunutu-devel, because I am not 100% sure if the found formating issue might originate from some ubuntu issue. libvirst-guests.sh on Ubuntu Xenial would not work correctly for me. Only one of the guests would be correctly suspended while the others were killed violently. Package: libvirt-bin Version: 1.3.1-1ubuntu2 /usr/lib/libvirt/libvirt-guests.sh The script writes a list of the VMs it will manage into /usr/lib/libvirt/libvirt-guests but I noticed it was in the format: <url> <vm uuid> <vm uuid> <vm uuid> and only the first VM was handled. After reading through the script and doing some try & error patches, I figured that the correct format should be: <url> <vm uuid> <vm uuid> <vm uuid> i.e. with no new lines. The attached patch makes sure the returned list of VMs does not contain new lines. This fixed the issue. Additionally I would suggest adding an information message on line line 444. Changing: [ -f "$LISTFILE" ] && return 0 to: [ -f "$LISTFILE" ] && echo "No VMs started by libvirt-guests.sh, not doing anything." && return 0 Regards, Michael Gajda

1 0

[libvirt] [PATCH] tests: Fix typo oaque -> opaque
by Andrea Bolognani 23 Feb '16

23 Feb '16

No functional changes. --- Pushed under the trivial rule. tests/virhostdevtest.c | 16 ++++++++-------- tests/virpcitest.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 1b30681..cadb66a 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -157,7 +157,7 @@ virHostdevHostSupportsPassthroughKVM(void) # endif static int -testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevPreparePCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -216,7 +216,7 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -250,7 +250,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevPreparePCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -296,7 +296,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -328,7 +328,7 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevDetachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevDetachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -347,7 +347,7 @@ testVirHostdevDetachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) return ret; } static int -testVirHostdevResetPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevResetPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -365,7 +365,7 @@ testVirHostdevResetPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -386,7 +386,7 @@ testVirHostdevReAttachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevUpdateActivePCIHostdevs(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevUpdateActivePCIHostdevs(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; int count, count1; diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 6dceef2..dd02b0c 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -91,7 +91,7 @@ testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) } static int -testVirPCIDeviceDetach(const void *oaque ATTRIBUTE_UNUSED) +testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; virPCIDevicePtr dev[] = {NULL, NULL, NULL}; -- 2.5.0

1 0

[libvirt] [PATCH 0/3] implement vram64 attribute for QXL video device
by Pavel Hrdina 23 Feb '16

23 Feb '16

Pavel Hrdina (3): qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64 docs/formatdomain: rewrite video documentation qemu: introduce vram64 attribute for QXL video device docs/formatdomain.html.in | 18 +++++++----- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 34 ++++++++++++++++++---- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++++ src/qemu/qemu_monitor_json.c | 8 +++++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 ++ .../qemuxml2argv-video-qxl-device-vram64.args | 25 ++++++++++++++++ .../qemuxml2argv-video-qxl-device-vram64.xml | 29 ++++++++++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.args | 27 +++++++++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.xml | 32 ++++++++++++++++++++ 22 files changed, 204 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.xml -- 2.7.1

2 7

Re: [libvirt] [PATCH] Fix bug of attaching redirdev device
by Osier Yang 23 Feb '16

23 Feb '16

ping? > >> On 18 Feb 2016, at 16:02, Osier Yang <osier(a)yunify.com> wrote: > >>> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1298070 > >>> > >>> The corresponding chardev must be attached first, otherwise the > >>> the qemu command line won't be complete (missing the host part), > >>> --- > >>> src/qemu/qemu_hotplug.c | 27 ++++++++++++++++++++++----- > >>> 1 file changed, 22 insertions(+), 5 deletions(-) > >>> > >>> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c > >>> index ee305e7..5095e31 100644 > >>> --- a/src/qemu/qemu_hotplug.c > >>> +++ b/src/qemu/qemu_hotplug.c > >>> @@ -1381,6 +1381,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> int ret; > >>> qemuDomainObjPrivatePtr priv = vm->privateData; > >>> virDomainDefPtr def = vm->def; > >>> + char *charAlias = NULL; > >>> char *devstr = NULL; > >>> > >>> if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { > >>> @@ -1391,21 +1392,33 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> > >>> if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) > >>> goto error; > >>> - if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) > >>> - goto error; > >>> > >>> - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) > >>> + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) > >>> goto error; > >>> > >>> qemuDomainObjEnterMonitor(driver, vm); > >>> + if (qemuMonitorAttachCharDev(priv->mon, > >>> + charAlias, > >>> + &(redirdev->source.chr)) < 0) { > >>> + ignore_value(qemuDomainObjExitMonitor(driver, vm)); > >>> + goto error; > >>> + } > >>> + VIR_FREE(charAlias); > >>> + > >>> + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) > >>> + goto rollback; > >>> + > >>> + if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) > >>> + goto rollback; > >>> + > >>> ret = qemuMonitorAddDevice(priv->mon, devstr); > >>> > >>> if (qemuDomainObjExitMonitor(driver, vm) < 0) > >>> - goto error; > >>> + goto rollback; > >>> > >>> virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); > >>> if (ret < 0) > >>> - goto error; > >>> + goto rollback; > >>> > >>> vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; > >>> > >>> @@ -1414,9 +1427,13 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> return 0; > >>> > >>> error: > >>> + VIR_FREE(charAlias); > >>> VIR_FREE(devstr); > >>> return -1; > >>> > >>> + rollback: > >>> + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); > >>> + goto error; > >>> } > >>> > >>> static int > >>> -- > >>> 2.1.4 > >>> > >>> -- > >>> libvir-list mailing list > >>> libvir-list(a)redhat.com > >>> https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] Fw: [RFC PATCH 0/2] nodeinfo: PPC64: Fix topology and siblings info on capabilities and nodeinfo
by David Gibson 23 Feb '16

23 Feb '16

Sorry, accidentally sent to just Andrea the first time around, resending... Begin forwarded message: Date: Mon, 22 Feb 2016 16:53:15 +1100 From: David Gibson <dgibson(a)redhat.com> To: Andrea Bolognani <abologna(a)redhat.com> Subject: Re: [libvirt] [RFC PATCH 0/2] nodeinfo: PPC64: Fix topology and siblings info on capabilities and nodeinfo On Fri, 19 Feb 2016 17:40:31 +0100 Andrea Bolognani <abologna(a)redhat.com> wrote: > On Tue, 2016-02-16 at 13:04 +1100, David Gibson wrote: > > > So the information don't seem to add up: we claim that the > > > host has 160 online CPUs, but the NUMA topology only contains > > > information about 5 of them per each node, so 20 in total. > > > > > > That's of course because Linux only provides us with topology > > > information for online CPUs, but KVM on ppc64 wants secondary > > > threads to be offline in the host. The secondary threads are > > > still used to schedule guest threads, so reporting 160 online > > > CPUs is correct for the purpose of planning the number of > > > guests based on the capacity of the host; the problem is that > > > the detailed NUMA topology doesn't match with that. > > > > Yeah, that's rather unfortunate. We do want to list all the threads in > > the capabilities, I think, since they're capable of running vcpus. > > There's a problem with that, though, that I didn't think about > when writing the original message. See below. > > > > The new information is more complete than it was before, and > > > this series certainly would help users make better guest > > > allocation choices. On the other hand, it doesn't really solve > > > the problem of nodeinfo and capabilities disagreeing with each > > > other, and pushes the NUMA topology reported by libvirt a > > > little farther from the one reported by the kernel. > > > > Uh.. I don't really see how nodeinfo and capabilities disagree here. > > Because nodeinfo tell us that the host has 160 online CPUs, while > capabilities tell us that only 40 CPUs are actually online. Hmm, ok. I guess the question is what does "online" mean in the context of a libvirt client. It used to be that "online in host" and "able to run vcpus" were the same thing, but now they're not. > Just to clarify, since the naming is not very explicit: nodeinfo > reports *online* CPUs only, and each <cpu> element in capabilities > is supposed to represent an *online* CPU. Offline CPUs are not > listed or counted anywhere. Ok. > > Now how the topology differs from the kernel. > > Because the kernel reports physical information, so online CPUs > that are in the same physical core (as evidenced by the core_id > value) are counted as siblings regardless of the subcore > configuration. Yeah.. I'll have a chat to Ben and/or Paul and see if they think that's the right choice for the kernel. > > > It may also break some assumptions, eg. CPU 0 and 4 both have > > > the same value for 'core_id', so I'd expect them to be among > > > each other's 'siblings', but they no longer are. > > > > Ah, yes, that's wrong. With this setup the core_id should be set to > > the id of the subcore's first thread, rather than the physical core's > > first thread. > > This would be a pretty wild departure from what the kernel is > exposing to userspace. If that's more meaningful for libvirt's clients than the kernel information, I don't think that's necessarily a problem. > > > I have a different proposal: since we're already altering the > > > NUMA topology information reported by the kernel by counting > > > secondary threads as online, we might as well go all the way > > > and rebuild the entire NUMA topology as if they were. > > > > > > So the capabilities XML when subcores-per-core=1 would look > > > like: > > > > > > <cells num='4'> > > > <cell id='0'> > > > <memory unit='KiB'>67108864</memory> > > > <pages unit='KiB' size='64'>1048576</pages> > > > <pages unit='KiB' size='16384'>0</pages> > > > <distances> > > > <sibling id='0' value='10'/> > > > <sibling id='1' value='20'/> > > > <sibling id='16' value='40'/> > > > <sibling id='17' value='40'/> > > > </distances> > > > <cpus num='10'> > > > <cpu id='0' socket_id='0' core_id='32' subcore_id='0' siblings='0-7'/> > > > > I don't think adding a subcore_id is a good idea. Because it's only > > ever likely to mean something on ppc64, tools are qlikely to just > > ignore it and use the core_id. > > Fair enough, and something we definitely need to take into account. > > > Most of the time that will be wrong: > > behaviorally subcores act like cores in almost all regards. > > > > That could be worked around by instead having core_id give the subcore > > address and adding a new "supercore_id" or "core_group_id" or something. > > Well, those would be just as likely to be ignored by tools as > subcore_id and capacity, wouldn't they? :) Yes, but it means when they ignore those and look at "core_id" they'll get the subcore id, not the physical core id, which is probably what they actually wanted. Those few (if any) tools that really, truly, need the physical core information get to look at supercore or whatever. > > But frankly, I don't think there's actually much point exposing the > > physical topology in addition to the logical (subcore) topology. Yes, > > subcores will have different performance characteristics to real cores > > which will be relevant in some situations. But if you're manually > > setting the host's subcore mode then you're already into the realm of > > manually tweaking parameters based on knowledge of your system and > > workload. Basically I don't see anything upper layers would do with > > the subcore vs. core information that isn't likely to be overriden by > > manual tweaks in any case where you're setting the subcore mode at all. > > > > Bear in mind that now that we have dynamic split core merged, I'm not > > sure there are *any* realistic use cases for using manual subcore > > splitting. > > As far as I know, and of course correct me if I'm wrong, dynamic split > cores are a way to avoid heavy performance drops when the host is Not so much heavy performance drops per se. What it's really about is mitigating the case where the system is overcommited in terms of number of virtual cores, but not in terms of number of virtual threads. Without dynamic split core the system will make more use of the host's threading capabilities, with it, it will do a much better job. > overcommitted, but it has some overhead of its own because of the need > to split the core when entering KVM and restoring the previous > configuration when exiting it. Hmm.. I guess there would be a little extra latency on entering and exiting the guest. I don't know if it's at all significant compared to the already substantial cost of entering/leaving the guest. > Splitting cores manually, on the other hand, is less flexible but > gives the admin complete control over resource allocations and has > no overhead, which makes it critical for fine performance tuning. Well.. except manual splitting can only be done system wide an only do, whereas dynamic split-core can do it per-core which might allow it to better match the workload. > So unless my understanding is off, I believe we need to expose the > topology in a way that enables both use cases. Well, that would be ideal, certainly. > > So, as noted, I actually prefer Shivaprasad's original approach of > > treating subcores as cores. The implementation of that does need some > > adjustment as noted above, basically treating subcores as cores even > > more universally than the current patches do. > > > > Basically I see manually setting the subcores-per-core as telling the > > system you want it treated as having more cores. So libvirt shouldn't > > decide it knows better and report physical cores instead. > > It's not really a case of libvirt thinking it knows better, it's more > a case of the kernel always reporting information about the physical > topology and x86 not having AFAIK any configuration where physical > and logical topology disagree, whereas that's the case on ppc64 as > soon as you split a core. Hmm. I'm not entirely sure what point you're making there. > > Tangentially related is the question of how to deal with threads which > > are offline in the host but can be used for vcpus, which appears with > > or without subcores. > > This is exactly the issue I was thinking about at the beginning of > the message: if I see a <cpu> element that means the CPU is online, > and I expect to be able to pin a vCPU to it, but that would no > longer be the case if we started adding <cpu> elements for CPUs > that are offline in the host - any attempt to pin vCPUs to such > CPUs would fail. Ah, good point. That sounds like a case for the "capacity" property then. > > I have no very strong opinion between the options of (1) adding <cpu> > > entries for the offline threads (whose siblings should be set based on > > the subcore) or (2) adding a capacity tag to the online threads > > indicating that you can put more vcpus on them that the host online > > thread count indicates. > > > > (1) is more likely to do the right thing with existing tools, but (2) > > is more accurately expressive. > > I kinda think it would be the other way around, as I expect existing > tools to make some of the assumptions described above. > > So after discussing for a while with Shivaprasad on IRC, reading > your reply and thinking about it some more, I'm starting to think > that we should report the same information as the kernel whenever > possible, and enhance it with hints such as capacity for tools > and admins, but carefully avoid being too clever for our own good. Well, I'm tempted to say that ship has sailed for libvirt.. :p. But I don't disagree. > We can paper over most of the differences between x86 and ppc64, > but not all of them, I believe. Documentation is key here, and > there's definitely room for improvement both when it comes to > reasonable assumptions and ppc64 specific quirks - this is > something I'm planning to address. > > So my proposal is to drop patch 1/2 entirely and rework patch 2/2 > to just add the capacity attribute (maybe with a more descriptive > name?), without touching the list of siblings or any other > information retrieved from the kernel. > > Cheers. > > -- > Andrea Bolognani > Software Engineer - Virtualization Team -- David Gibson <dgibson(a)redhat.com> Senior Software Engineer, Virtualization, Red Hat -- David Gibson <dgibson(a)redhat.com> Senior Software Engineer, Virtualization, Red Hat

1 0

Re: [libvirt] kvm: "warning: host doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21]"
by Eduardo Habkost 22 Feb '16

22 Feb '16

(CCing libvir-list) On Sat, Feb 20, 2016 at 04:00:30AM -0500, Paolo Bonzini wrote: > ----- Original Message ----- > > From: "Jan Kiszka" <jan.kiszka(a)web.de> > > To: "Eduardo Habkost" <ehabkost(a)redhat.com>, "Paolo Bonzini" <pbonzini(a)redhat.com> > > Cc: "qemu-devel" <qemu-devel(a)nongnu.org>, "kvm" <kvm(a)vger.kernel.org> > > Sent: Saturday, February 20, 2016 9:09:32 AM > > Subject: kvm: "warning: host doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21]" > > > > Hi all, > > > > I suppose 5120901a37 introduced this: qemu with kernel_irqchip=off now > > generates these warnings, one per VCPU, during QEMU startup. Is the plan > > to live with them until we finally have x2APIC emulation in userspace > > (ie. also MSR vmexiting to there), or should we otherwise avoid it? > > I think it's a bug, x2apic should be auto-suppressed with kernel_irqchip=off. My first reaction is to dislike the idea of adding yet another variable that affects the results of CPU models. But considering that we are moving towards a design where libvirt must not assume or query any low-level detail from CPU models at all, maybe this won't be harmful. -- Eduardo

1 0

[libvirt] [PATCH] qemu: add support for LSI SAS1068 (aka MPT Fusion) SCSI controller
by Paolo Bonzini 22 Feb '16

22 Feb '16

This does nothing more than adding the new device and capability. The device is present since QEMU 2.6.0. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++- .../qemuxml2argv-disk-scsi-mptsas1068.args | 27 +++++++++++++ .../qemuxml2argv-disk-scsi-mptsas1068.xml | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ .../qemuxml2xmlout-disk-scsi-mptsas1068.xml | 44 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 ++ 8 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e34..2b953ea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -314,6 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vserport-change-event", /* 210 */ "virtio-balloon-pci.deflate-on-oom", + "mptsas1068", ); @@ -1567,6 +1568,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-tablet-pci", QEMU_CAPS_VIRTIO_TABLET }, { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST }, { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST }, + { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e5353de..b73c529 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -343,6 +343,7 @@ typedef enum { QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ + QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d7f19f3..4d4d65e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -872,11 +872,19 @@ qemuSetSCSIControllerModel(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MPTSAS1068)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the LSI SAS1068 (MPT Fusion) controller")); + return -1; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MEGASAS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support " - "the LSI SAS1078 controller")); + "the LSI SAS1078 (MegaRAID) controller")); return -1; } break; @@ -4753,6 +4761,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: virBufferAddLit(&buf, "spapr-vscsi"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + virBufferAddLit(&buf, "mptsas1068"); + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: virBufferAddLit(&buf, "megasas"); break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args new file mode 100644 index 0000000..bdfc1af --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args @@ -0,0 +1,27 @@ +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 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0,wwn=0x5000c50015ea71ac \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..b817b69 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + <wwn>5000c50015ea71ac</wwn> + </disk> + <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='lsisas1068'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c7693b..b5d92c4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -865,6 +865,10 @@ mymain(void) DO_TEST("disk-scsi-megasas", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST("disk-scsi-mptsas1068", + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..a88b63a --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <wwn>5000c50015ea71ac</wwn> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsisas1068'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d9550cc..d7d10f6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,10 @@ mymain(void) DO_TEST_FULL("disk-scsi-megasas", WHEN_ACTIVE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST_FULL("disk-scsi-mptsas1068", WHEN_ACTIVE, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old"); DO_TEST_FULL("disk-mirror", WHEN_ACTIVE, NONE); DO_TEST_FULL("disk-mirror", WHEN_INACTIVE, NONE); -- 2.5.0

3 4

[libvirt] [PATCH] Fix bug of attaching redirdev device
by Osier Yang 22 Feb '16

22 Feb '16

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1298070 The corresponding chardev must be attached first, otherwise the the qemu command line won't be complete (missing the host part), --- src/qemu/qemu_hotplug.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ee305e7..5095e31 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1381,6 +1381,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, int ret; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; + char *charAlias = NULL; char *devstr = NULL; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -1391,21 +1392,33 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) goto error; - if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) - goto error; - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) goto error; qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorAttachCharDev(priv->mon, + charAlias, + &(redirdev->source.chr)) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto error; + } + VIR_FREE(charAlias); + + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) + goto rollback; + + if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + goto rollback; + ret = qemuMonitorAddDevice(priv->mon, devstr); if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto error; + goto rollback; virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); if (ret < 0) - goto error; + goto rollback; vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; @@ -1414,9 +1427,13 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, return 0; error: + VIR_FREE(charAlias); VIR_FREE(devstr); return -1; + rollback: + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + goto error; } static int -- 2.1.4

2 2

[libvirt] [PATCH v2 0/9] PCI hostdev refactoring
by Andrea Bolognani 22 Feb '16

22 Feb '16

Changes in v2: * Internal functions operate on a single device, don't pass around device lists for no reason * Use virHostdev prefix for internal functions * Split off style adjustments and comments updated to separate patches See the cover letter for v1[1] for details about the series. Cheers. [1] https://www.redhat.com/archives/libvir-list/2016-January/msg00835.html Andrea Bolognani (9): hostdev: Add virHostdevOnlyReattachPCIDevice() hostdev: Use common reattach code to rollback prepare errors hostdev: Use common reattach code in virHostdevPCINodeDeviceReAttach() hostdev: Add virHostdevOnlyDetachPCIDevice() hostdev: Use common detach code in virHostdevPCINodeDeviceDetach() hostdev: Minor style adjustments hostdev: Update comments pci: Phase out virPCIDeviceReattachInit() pci: Add debug messages when unbinding from stub driver src/libvirt_private.syms | 1 - src/util/virhostdev.c | 385 ++++++++++++++++++++++++++++++----------------- src/util/virpci.c | 30 ++-- src/util/virpci.h | 1 - tests/virpcitest.c | 5 +- 5 files changed, 272 insertions(+), 150 deletions(-) -- 2.5.0

2 29

[libvirt] About the vfio error when using SR-IOV
by Xiao Ma (xima2) 22 Feb '16

22 Feb '16

Hi, All I want to use the SR-IOV of intel 82576 NIC. I enabled IOMMU and VT-d and SR-IOV in BIOS. And enabled VT-d in kernel. The OS information is bellow: [root@host3 nova]# cat /etc/redhat-release CentOS Linux release 7.1.1503 (Core) [root@host3 nova]# uname -an Linux host3.localdomain 3.10.0-229.el7.x86_64 #1 SMP Fri Mar 6 11:36:42 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux [root@host3 nova]# rpm -qa|grep qemu libvirt-daemon-driver-qemu-1.2.8-16.el7.x86_64 qemu-kvm-1.5.3-86.el7.x86_64 qemu-kvm-common-1.5.3-86.el7.x86_64 ipxe-roms-qemu-20130517-6.gitc4bce43.el7.noarch qemu-img-1.5.3-86.el7.x86_64 [root@host3 nova]# rpm -qa|grep libvirt libvirt-daemon-1.2.8-16.el7.x86_64 libvirt-daemon-driver-nwfilter-1.2.8-16.el7.x86_64 libvirt-python-1.2.8-7.el7.x86_64 libvirt-daemon-driver-storage-1.2.8-16.el7.x86_64 libvirt-daemon-driver-qemu-1.2.8-16.el7.x86_64 libvirt-daemon-config-nwfilter-1.2.8-16.el7.x86_64 libvirt-daemon-driver-secret-1.2.8-16.el7.x86_64 libvirt-daemon-driver-interface-1.2.8-16.el7.x86_64 libvirt-client-1.2.8-16.el7.x86_64 libvirt-glib-0.1.7-3.el7.x86_64 libvirt-daemon-driver-network-1.2.8-16.el7.x86_64 libvirt-daemon-driver-nodedev-1.2.8-16.el7.x86_64 libvirt-daemon-kvm-1.2.8-16.el7.x86_64 And I can see the vf of the NIC after ‘ echo '7' > /sys/class/net/ens1f1/device/sriov_numvfs ' [root@host3 VTS2.1-demo]# lspci |grep -i ethernet 08:00.0 Ethernet controller: QLogic Corp. 10GbE Converged Network Adapter (TCP/IP Networking) (rev 02) 08:00.1 Ethernet controller: QLogic Corp. 10GbE Converged Network Adapter (TCP/IP Networking) (rev 02) 0f:00.0 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 0f:00.1 Ethernet controller: Intel Corporation 82576 Gigabit Network Connection (rev 01) 10:10.1 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.3 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.5 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:10.7 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.1 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.3 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) 10:11.5 Ethernet controller: Intel Corporation 82576 Virtual Function (rev 01) I configured the interface as bellow in XML: <interface type="hostdev" managed="yes"> <mac address="fa:16:3e:f7:57:5f"/> <source> <address type="pci" domain="0x0000" bus="0x10" slot="0x10" function="0x3"/> </source> <vlan> <tag id="1000"/> </vlan> </interface> But the error output when I boot one vm: [root@host3 VTS2.1-demo]# virsh create vtc.demo.xml error: Failed to create domain from vtc.demo.xml error: internal error: early end of file from monitor: possible problem: 2016-02-22T07:38:42.169035Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: vfio: error, group 17 is not viable, please ensure all devices within the iommu_group are bound to their vfio bus driver. 2016-02-22T07:38:42.169215Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: vfio: failed to get group 17 2016-02-22T07:38:42.169233Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: Device initialization failed. 2016-02-22T07:38:42.169248Z qemu-kvm: -device vfio-pci,host=10:10.3,id=hostdev0,bus=pci.0,addr=0x3: Device 'vfio-pci' could not be initialized Could you please help to solve it? Looking forward for your reply. Thanks.

3 2

[libvirt] [PATCH] cmdNetworkUpdate: Prefer VSH_EXCLUSIVE_OPTIONS over if-else tree
by Michal Privoznik 22 Feb '16

22 Feb '16

We have macros that check and reject mutually exclusive parameters to our commands. Use those instead of if-else tree. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-network.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 1ae206a..d0bd7a3 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -907,9 +907,12 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - unsigned int flags = 0; + unsigned int flags = VIR_NETWORK_UPDATE_AFFECT_CURRENT; const char *affected; + VSH_EXCLUSIVE_OPTIONS_VAR(current, live); + VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + if (!(network = virshCommandOptNetwork(ctl, cmd, NULL))) return false; @@ -962,18 +965,10 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) xml = xmlFromFile; } - if (current) { - if (live || config) { - vshError(ctl, "%s", _("--current must be specified exclusively")); - goto cleanup; - } - flags |= VIR_NETWORK_UPDATE_AFFECT_CURRENT; - } else { - if (config) - flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; - if (live) - flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; - } + if (config) + flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + if (live) + flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; if (virNetworkUpdate(network, command, section, parentIndex, xml, flags) < 0) { -- 2.4.10

2 3

[libvirt] [PATCH v2] Migration with --live --offline option performs offline migration without warning/error.
by Nitesh Konkar 22 Feb '16

22 Feb '16

This patch gives an error when migration is attempted with both --live and --offline options. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 43c8436..7b4a08e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9837,6 +9837,10 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) int timeout = 0; bool live_flag = false; virshCtrlData data = { .dconn = NULL }; + bool live = vshCommandOptBool(cmd, "live"); + bool offline = vshCommandOptBool(cmd, "offline"); + + VSH_EXCLUSIVE_OPTIONS_VAR(live, offline); if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu_process: mark auto-generated spice ports as reserved
by Pavel Hrdina 22 Feb '16

22 Feb '16

In case you will specify graphics like this: <graphics type='spice' port='-1'/> or <graphics type='spice' port='-1' tlsPort='6000'/> libvirt will automatically add autoport='no'. This leads to an issue that in qemuProcessStop() we don't release that port because we are releasing both port if autoport=yes or only port marked as reserved. If autoport=no but we request to generate port via '-1' we need to mark that port as reserved in order to release it. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1299696 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eaf9fea..e7f19a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3694,6 +3694,9 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, goto error; graphics->data.spice.port = port; + + if (!graphics->data.spice.autoport) + graphics->data.spice.portReserved = true; } if (needTLSPort || graphics->data.spice.tlsPort == -1) { @@ -3708,6 +3711,9 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, goto error; graphics->data.spice.tlsPort = tlsPort; + + if (!graphics->data.spice.autoport) + graphics->data.spice.tlsPortReserved = true; } return 0; -- 2.7.1

2 2

[libvirt] [PATCH rfc v4 0/6] storage:dir: ploop volumes support
by Olga Krishtal 22 Feb '16

22 Feb '16

v4: - fixed identation issues. - in case of .uploadVol, DiskDescriptor.xml is restored. - added check of ploops'accessibility v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

4 24

[libvirt] Plans for next release
by Daniel Veillard 22 Feb '16

22 Feb '16

So we are getting close to the end of the month and it's time to push a new release. I think that if we want to push it by March 1st we should start the freeze Wednesday at the latest, maybe RC1 on Wed, RC2 friday and release next Mon if everything looks okay. If there is an issue with this plan, please tell :) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Migration with --live --offline option performs offline migration without warning/error.
by Nitesh Konkar 22 Feb '16

22 Feb '16

This patch gives an error when migration is attempted with both --live and --offline options. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..527db38 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9795,6 +9795,12 @@ doMigrate(void *opaque) } else { /* For traditional live migration, connect to the destination host directly. */ virDomainPtr ddom = NULL; + + if ((flags & VIR_MIGRATE_OFFLINE) && (flags & VIR_MIGRATE_LIVE)){ + vshError(ctl, "%s", _("migrate: Using both --live and --offline option together is not permitted.")); + goto out; + } if ((ddom = virDomainMigrate3(dom, dconn, params, nparams, flags))) { virDomainFree(ddom); -- 1.8.3.1

2 2

[libvirt] [PATCH] virDomainDefFormatInternal: Drop useless check
by Michal Privoznik 22 Feb '16

22 Feb '16

There's a check if a domain definition has any graphics card and if so, we iterate over each one of them. This makes no sense, because even if it has none we can still iterate over. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e47d613..56bd1aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22363,11 +22363,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; } - if (def->ngraphics > 0) { - for (n = 0; n < def->ngraphics; n++) - if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0) - goto error; - } + for (n = 0; n < def->ngraphics; n++) + if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0) + goto error; for (n = 0; n < def->nsounds; n++) if (virDomainSoundDefFormat(buf, def->sounds[n], flags) < 0) -- 2.4.10

3 2

[libvirt] [PATCH] adminDaemonListServers: Don't leak @srv_names array
by Michal Privoznik 22 Feb '16

22 Feb '16

When getting a list of servers registered for a daemon, it's returned as a dynamically allocated array filled in with pointers to constant strings. Because the array is dynamic, it should be freed when no longer needed (but not the strings!). Even the function that creates the array suggests that. ==19446== 48 bytes in 3 blocks are definitely lost in loss record 821 of 1,034 ==19446== at 0x4C2C28E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==19446== by 0x54BAFC8: virReallocN (viralloc.c:245) ==19446== by 0x54BB0BE: virExpandN (viralloc.c:294) ==19446== by 0x54BB391: virInsertElementsN (viralloc.c:436) ==19446== by 0x164E3D: virNetDaemonGetServerNames (virnetdaemon.c:217) ==19446== by 0x15616F: adminDaemonListServers (admin_server.c:52) ==19446== by 0x155B8C: adminDispatchConnectListServers (admin.c:151) ==19446== by 0x155FD8: adminDispatchConnectListServersHelper (admin_dispatch.h:101) ==19446== by 0x568E862: virNetServerProgramDispatchCall (virnetserverprogram.c:437) ==19446== by 0x568E3C3: virNetServerProgramDispatch (virnetserverprogram.c:307) ==19446== by 0x5687B5B: virNetServerProcessMsg (virnetserver.c:135) ==19446== by 0x5687C1B: virNetServerHandleJob (virnetserver.c:156) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/admin_server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/admin_server.c b/daemon/admin_server.c index 7521e82..0196bfe 100644 --- a/daemon/admin_server.c +++ b/daemon/admin_server.c @@ -68,6 +68,7 @@ adminDaemonListServers(virNetDaemonPtr dmn, ret = nsrvs; cleanup: + VIR_FREE(srv_names); virObjectListFree(srvs); return ret; } -- 2.4.10

2 1

[libvirt] [PATCH 0/3] make virDomainObjGetPersistentDef return only persistent definition
by Nikolay Shirokovskiy 21 Feb '16

21 Feb '16

I want to make virDomainObjGetPersistentDef return only persistent definition as one can infer from its name. Patches 1 and 2 clean things up to make reasoning that this operation is possible more clear. Nikolay Shirokovskiy (3): domain: reuse update flags checking functions libxl: remove check duplicates common-impl: make virDomainObjGetPersistentDef return only persistent config src/conf/domain_conf.c | 19 ++++----- src/libxl/libxl_driver.c | 103 ++++------------------------------------------- src/lxc/lxc_driver.c | 75 +++------------------------------- 3 files changed, 24 insertions(+), 173 deletions(-) -- 1.8.3.1

2 13

[libvirt] [PATCH] libxl: support assignment from a pool of SRIOV VFs
by Chunyan Liu 20 Feb '16

20 Feb '16

Add codes to support creating domain with network defition of assigning SRIOV VF from a pool. And fix hot plug and unplug SRIOV VF under this kind of network defition. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_conf.c | 5 +++-- src/libxl/libxl_domain.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- src/libxl/libxl_driver.c | 12 ++++++++++++ tests/Makefile.am | 3 +++ 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6320421..f50c68a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1260,7 +1260,8 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; for (i = 0; i < nnics; i++) { - if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) + if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV || + l_nics[i]->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) continue; if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics])) @@ -1278,7 +1279,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); d_config->nics = x_nics; - d_config->num_nics = nnics; + d_config->num_nics = nvnics; return 0; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cf5c9f6..9bf7a5a 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" +#include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -314,7 +315,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, virDomainHostdevSubsysPCIPtr pcisrc; if (dev->type == VIR_DOMAIN_DEVICE_NET) - hostdev = &(dev->data.net)->data.hostdev.def; + hostdev = &dev->data.net->data.hostdev.def; else hostdev = dev->data.hostdev; pcisrc = &hostdev->source.subsys.u.pci; @@ -916,6 +917,48 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) libxl_event_free(ctx, ev); } +static int +libxlNetworkPrepareDevices(virDomainDefPtr def) +{ + int ret = -1; + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + int actualType; + + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(def, net) < 0) + goto cleanup; + + actualType = virDomainNetGetActualType(net); + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV && + net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { + /* Each type='hostdev' network device must also have a + * corresponding entry in the hostdevs array. For netdevs + * that are hardcoded as type='hostdev', this is already + * done by the parser, but for those allocated from a + * network / determined at runtime, we need to do it + * separately. + */ + virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); + virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; + + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + + if (virDomainHostdevInsert(def, hostdev) < 0) + goto cleanup; + } + } + ret = 0; + cleanup: + return ret; +} /* * Start a domain through libxenlight. @@ -992,6 +1035,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm, true) < 0) goto cleanup; + if (libxlNetworkPrepareDevices(vm->def) < 0) + goto cleanup; + if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, cfg->ctx, &d_config) < 0) goto cleanup; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4a9134e..6aca042 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3047,6 +3047,12 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver, libxl_device_pci_init(&pcidev); + /* For those allocated from a network pool/ determined at runtime, it's + * not handled by libxlDomainDeviceDefPostParse as hostdev, we need to + * set backend correctly. + */ + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + if (virDomainHostdevFind(vm->def, hostdev, &found) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("target pci device %.4x:%.2x:%.2x.%.1x already exists"), @@ -3388,6 +3394,12 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver, libxl_device_pci_init(&pcidev); + /* For those allocated from a network pool/ determined at runtime, it's + * not handled by libxlDomainDeviceDefPostParse as hostdev, we need to + * set backend correctly. + */ + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + idx = virDomainHostdevFind(vm->def, hostdev, &detach); if (idx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/tests/Makefile.am b/tests/Makefile.am index ee16666..6a9fb19 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -526,6 +526,9 @@ endif ! WITH_XEN if WITH_LIBXL libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la +if WITH_NETWORK +libxl_LDADDS += ../src/libvirt_driver_network_impl.la +endif WITH_NETWORK libxl_LDADDS += $(LDADDS) xlconfigtest_SOURCES = \ -- 1.8.5.6

3 2

[libvirt] [PATCH] docs: List possible GIC versions
by Andrea Bolognani 19 Feb '16

19 Feb '16

Recent changes to the handling of GIC version, specifically commit 2a7b11eafb67, have clearly defined what values are acceptable for the version attribute of the <gic> element. Update the documentation accordingly. --- docs/formatdomain.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e96798f..faee603 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1577,7 +1577,8 @@ Controller instead of APIC in order to handle interrupts. For example, the 'aarch64' architecture uses <code>gic</code> instead of <code>apic</code>. The optional - attribute <code>version</code> specifies the GIC version; + attribute <code>version</code> specifies the GIC version (one of + <code>2</code>, <code>3</code> and <code>host</code>); however, it may not be supported by all hypervisors. <span class="since">Since 1.2.16</span> </dd> -- 2.5.0

2 6

[libvirt] [PATCH 0/2] tweak iothread/emulator pinning setting
by Peter Krempa 19 Feb '16

19 Feb '16

Per review feedback ... Peter Krempa (2): qemu: emulatorpin: Always set affinity when pinning emulator thread qemu: iothreadpin: Always set affinity when pinning iothread src/qemu/qemu_driver.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 0/6] vcpu info refactors - part 3a
by Peter Krempa 19 Feb '16

19 Feb '16

A short dump of patches that are separate enough which can be reviewed while I'm working on other things. Peter Krempa (6): virsh: cmdVcpuPin: Simplify handling of API flags util: Use virBitmapIsBitSet in freebsd impl of virProcessSetAffinity qemu: vcpupin: Don't overwrite errors from functions setting pinning qemu: vcpupin: Always set affinity even when cgroups are supported qemu: qemuDomainGetStatsVcpu: Fix output for possible sparse vCPU settings virsh: cpupin: Extract getter code into a separate function src/qemu/qemu_driver.c | 23 +++------ src/util/virprocess.c | 5 +- tools/virsh-domain.c | 134 +++++++++++++++++++++++++++---------------------- 3 files changed, 82 insertions(+), 80 deletions(-) -- 2.6.2

2 11

[libvirt] [PATCH 0/3] domain: AddImplicitControllers in PostParse
by Cole Robinson 19 Feb '16

19 Feb '16

Move virDomainDefAddImplicitControllers to virDomainDefPostParse so PostParse users don't need to open code it. Patch #1 makes the change, and adjusts some xen output to match Patch #2 is an unrelated cleanup, but it will clash with patch #3 Patch #3 drops a now redundant AddImplicitControllers call in qemu_parse_command.c, which reorders the test output a bit Cole Robinson (3): domain: add implicit controllers from post parse qemu: parse: rename qemuCaps->caps qemu: parse: drop redundant AddImplicitControllers src/conf/domain_conf.c | 7 +++---- src/qemu/qemu_parse_command.c | 19 ++++++++----------- src/qemu/qemu_parse_command.h | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-clock-localtime.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-console-compat.xml | 2 +- .../qemuargv2xml-disk-cdrom-empty.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 2 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 2 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 2 +- .../qemuargv2xml-disk-drive-cache-directsync.xml | 2 +- .../qemuargv2xml-disk-drive-cache-unsafe.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-wb.xml | 2 +- .../qemuargv2xml-disk-drive-cache-v2-wt.xml | 2 +- .../qemuargv2xml-disk-drive-error-policy-enospace.xml | 2 +- .../qemuargv2xml-disk-drive-error-policy-stop.xml | 2 +- ...gv2xml-disk-drive-error-policy-wreport-rignore.xml | 2 +- .../qemuargv2xml-disk-drive-fmt-qcow.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-export.xml | 2 +- ...emuargv2xml-disk-drive-network-nbd-ipv6-export.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-ipv6.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd-unix.xml | 2 +- .../qemuargv2xml-disk-drive-network-nbd.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-ceph-env.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-ipv6.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd.xml | 2 +- .../qemuargv2xml-disk-drive-network-sheepdog.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 2 +- .../qemuargv2xml-graphics-sdl-fullscreen.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 2 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 2 +- .../qemuargv2xml-graphics-vnc-socket.xml | 2 +- .../qemuargv2xml-graphics-vnc-tls.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 2 +- .../qemuargv2xml-hostdev-pci-address.xml | 2 +- .../qemuargv2xml-hostdev-usb-address.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml | 2 +- .../qemuargv2xml-machine-core-off.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-machine-core-on.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-migrate.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml | 2 +- .../qemuargv2xml-misc-disable-suspends.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-user.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-nographics-vga.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 2 +- .../qemuargv2xml-serial-tcp-telnet.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-smp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-sound.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 1 + .../sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml | 1 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 1 + .../sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv.xml | 1 + tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 1 + tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 1 + .../test-fullvirt-direct-kernel-boot-bogus-extra.xml | 1 + .../test-fullvirt-direct-kernel-boot-extra.xml | 1 + .../xlconfigdata/test-fullvirt-direct-kernel-boot.xml | 1 + tests/xlconfigdata/test-fullvirt-multiusb.xml | 1 + tests/xlconfigdata/test-new-disk.xml | 1 + tests/xlconfigdata/test-spice-features.xml | 1 + tests/xlconfigdata/test-spice.xml | 1 + tests/xlconfigdata/test-vif-rate.xml | 1 + tests/xmconfigdata/test-escape-paths.xml | 1 + tests/xmconfigdata/test-fullvirt-default-feature.xml | 1 + tests/xmconfigdata/test-fullvirt-force-hpet.xml | 1 + tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 1 + tests/xmconfigdata/test-fullvirt-localtime.xml | 1 + tests/xmconfigdata/test-fullvirt-net-netfront.xml | 1 + tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 1 + tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 1 + .../xmconfigdata/test-fullvirt-serial-dev-2-ports.xml | 1 + .../test-fullvirt-serial-dev-2nd-port.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-file.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-null.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pty.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 1 + .../xmconfigdata/test-fullvirt-serial-tcp-telnet.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-udp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-unix.xml | 1 + tests/xmconfigdata/test-fullvirt-sound.xml | 1 + tests/xmconfigdata/test-fullvirt-usbmouse.xml | 1 + tests/xmconfigdata/test-fullvirt-usbtablet.xml | 1 + tests/xmconfigdata/test-fullvirt-utc.xml | 1 + tests/xmconfigdata/test-no-source-cdrom.xml | 1 + tests/xmconfigdata/test-pci-devs.xml | 1 + 139 files changed, 149 insertions(+), 93 deletions(-) -- 2.5.0

3 9

[libvirt] [PATCH 0/9] Fix race conditions with qemuProcessStop
by Jiri Denemark 19 Feb '16

19 Feb '16

Jiri Denemark (9): qemu: Export qemuDomainObjBeginNestedJob qemu: End nested jobs properly qemu: Pass async job to qemuProcessInit qemu: Introduce qemuProcessBeginStopJob qemu: Start an async job for processGuestPanicEvent qemu: Process monitor EOF in a job qemu: Simplify error handling in qemuProcessReconnect qemu: Avoid calling qemuProcessStop without a job Check for active domain in virDomainObjWait src/conf/domain_conf.c | 7 ++ src/qemu/qemu_domain.c | 9 +-- src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 179 +++++++++++++++++++++++-------------------- src/qemu/qemu_migration.c | 9 ++- src/qemu/qemu_monitor.c | 14 +++- src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_process.c | 191 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_process.h | 6 ++ 9 files changed, 254 insertions(+), 168 deletions(-) -- 2.7.1

2 18

[libvirt] [PATCH] test: qemuxml2argv: Drop QEMU_CAPS_DEVICE uses
by Andrea Bolognani 19 Feb '16

19 Feb '16

Since commit 51045df01b3c, the QEMU_CAPS_DEVICE capability is enabled automatically and shouldn't be passed as an argument to DO_TEST(); however, commit 998a936c4c1a accidentally introduced few such uses. --- tests/qemuxml2argvtest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 349e6ed..bb80c22 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1700,18 +1700,18 @@ mymain(void) QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST_FAILURE("aarch64-gic-v3", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); - DO_TEST("aarch64-gic-host", QEMU_CAPS_DEVICE, + DO_TEST("aarch64-gic-host", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-host", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-host", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_DEVICE, + DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-not-arm", QEMU_CAPS_DEVICE, + DO_TEST_FAILURE("aarch64-gic-not-arm", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); -- 2.5.0

2 2

[libvirt] [PATCH] qemu: add spice opengl support
by Marc-André Lureau 19 Feb '16

19 Feb '16

Add Spice graphics gl attribute. qemu 2.6 should have -spice gl=on argument to enable opengl rendering context (patches on the ML). This is necessary to actually enable virgl rendering. Add a qemuxml2argv test for virtio-gpu + spice with virgl. Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/formatdomain.html.in | 6 +++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 19 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 4 ++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 24 ++++++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 43 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 160 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e96798f..cb2c178 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4991,6 +4991,12 @@ qemu-kvm -net nic,model=? /dev/null 0.8.8</span>); and <code>usbredir</code> (<span class="since">since 0.9.12</span>). </p> + <p> + Spice may provide accelerated server-side rendering with + OpenGL. You can enable or disable OpenGL support explicitly with + the <code>gl</code> attribute. + (<span class="since">since 1.3.2</span>). + </p> <pre> <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> <channel name='main' mode='secure'/> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 67af93a..d4672d0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2711,6 +2711,11 @@ </choice> </attribute> </optional> + <optional> + <attribute name="gl"> + <ref name="virYesNo"/> + </attribute> + </optional> <interleave> <ref name="listenElements"/> <zeroOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index acd58a1..0976e09 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10779,6 +10779,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, char *port = virXMLPropString(node, "port"); char *tlsPort; char *autoport; + char *gl; char *defaultMode; int defaultModeVal; @@ -10813,6 +10814,20 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, VIR_FREE(autoport); } + if ((gl = virXMLPropString(node, "gl")) != NULL) { + int glVal; + + if ((glVal = virTristateBoolTypeFromString(gl)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown gl value '%s'"), gl); + VIR_FREE(gl); + goto error; + } + + def->data.spice.gl = glVal; + VIR_FREE(gl); + } + def->data.spice.defaultMode = VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY; if ((defaultMode = virXMLPropString(node, "defaultMode")) != NULL) { @@ -21032,6 +21047,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (def->data.spice.gl) + virBufferAsprintf(buf, " gl='%s'", + virTristateBoolTypeToString(def->data.spice.gl)); + if (def->data.spice.port) virBufferAsprintf(buf, " port='%d'", def->data.spice.port); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1de3be3..d3b3ed2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1586,6 +1586,7 @@ struct _virDomainGraphicsDef { int streaming; int copypaste; /* enum virTristateBool */ int filetransfer; /* enum virTristateBool */ + int gl; /* enum virTristateBool */ } spice; } data; /* nListens, listens, and *port are only useful if type is vnc, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e34..cab4d7d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -314,6 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vserport-change-event", /* 210 */ "virtio-balloon-pci.deflate-on-oom", + "spice-gl", ); @@ -2625,6 +2626,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "chardev", "append", QEMU_CAPS_CHARDEV_FILE_APPEND }, + { "spice", "gl", QEMU_CAPS_SPICE_GL }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e5353de..0c857d2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -343,6 +343,7 @@ typedef enum { QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ + QEMU_CAPS_SPICE_GL, /* -spice gl */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b751f04..666dfc6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6047,6 +6047,17 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, } } + if (graphics->data.spice.gl) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_GL)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support spice OpenGL")); + goto error; + } + + virBufferAsprintf(&opt, ",gl=%s", + virTristateSwitchTypeToString(graphics->data.spice.gl)); + } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { /* If qemu supports seamless migration turn it * unconditionally on. If migration destination diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps index 931bc4f..679d65a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps @@ -172,4 +172,5 @@ <flag name='ich9-disable-s4'/> <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='spice-gl'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies index 7b692b5..07aadba 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.replies @@ -3345,6 +3345,10 @@ { "parameters": [ { + "name": "gl", + "type": "boolean" + }, + { "name": "seamless-migration", "type": "boolean" }, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args new file mode 100644 index 0000000..1361784 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args @@ -0,0 +1,24 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,\ +if=none,id=drive-ide0-0-0,cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-spice port=0,gl=on \ +-device virtio-vga,id=video0,virgl=on,bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml new file mode 100644 index 0000000..07afad2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' gl='yes' autoport='no'/> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 349e6ed..542141a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1458,6 +1458,12 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + DO_TEST("video-virtio-gpu-spice-gl", QEMU_CAPS_DEVICE, + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, + QEMU_CAPS_SPICE, + QEMU_CAPS_SPICE_GL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST_PARSE_ERROR("video-invalid", NONE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE_VIRTIO_RNG, diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml new file mode 100644 index 0000000..51b8a1e --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' gl='yes' autoport='no'/> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 56dc821..d24ad2b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -751,6 +751,7 @@ mymain(void) DO_TEST("video-virtio-gpu-device"); DO_TEST("video-virtio-gpu-virgl"); + DO_TEST("video-virtio-gpu-spice-gl"); DO_TEST("virtio-input"); DO_TEST("virtio-input-passthrough"); -- 2.5.0

3 5

[libvirt] [PATCH] Use correct pci addresses during interface-detach[v2]
by Nitesh Konkar 19 Feb '16

19 Feb '16

The virsh attach virsh detach interface command fails when both live and config are set and when the interface gets attached to different pci slots on live and config xml respectively. When we attach an interface with both --live and --config, the first time they get the same PCI slots, but the second time onwards it differs and hence the virsh detach-interface --live --config command fails. This patch makes sure that when both --live --config are set , qemuDomainDetachDeviceFlags is called twice, once with config xml and once with live xml. Steps to see the issue: virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config virsh attach-interface --domain DomainName --type network --source default --mac 52:54:00:4b:76:5f --live --config virsh detach-interface --domain DomainName --type network --mac 52:54:00:4b:76:5f --live --config Signed-off-by:nitkon12@linux.vnet.ibm.com --- tools/virsh-domain.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 62acecb..43c8436 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10815,7 +10815,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) char buf[64]; int diff_mac; size_t i; - int ret; + int ret, flag_live_config_both = 0; bool functionReturn = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); @@ -10830,7 +10830,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (config || persistent) flags |= VIR_DOMAIN_AFFECT_CONFIG; - if (live) + if (!(config || persistent) && live) // Only Live flags |= VIR_DOMAIN_AFFECT_LIVE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -10851,6 +10851,8 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) else doc = virDomainGetXMLDesc(dom, 0); + forlivexml: + if (!doc) goto cleanup; @@ -10921,6 +10923,14 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (ret != 0) { vshError(ctl, "%s", _("Failed to detach interface")); } else { + if ((config || persistent) && live && flag_live_config_both == 0) {//executed only when live config both in cmd. + doc = virDomainGetXMLDesc(dom, 0); + flag_live_config_both=1; //Need to execute this code only once + flags |= VIR_DOMAIN_AFFECT_LIVE; //set live flag + flags &= (~VIR_DOMAIN_AFFECT_CONFIG ); // need to unset config flag as config xml detach is already done. + mac=NULL; + goto forlivexml; + } vshPrint(ctl, "%s", _("Interface detached successfully\n")); functionReturn = true; } -- 1.8.3.1

1 0

[libvirt] [PATCH v2] admin: Fix memory leak in remoteAdminConnectClose
by Erik Skultety 19 Feb '16

19 Feb '16

When virt-admin is run with valgrind, this kind of output can be obtained: HEAP SUMMARY: in use at exit: 134,589 bytes in 1,031 blocks total heap usage: 2,667 allocs, 1,636 frees, 496,755 bytes allocated 88 bytes in 1 blocks are definitely lost in loss record 82 of 128 at 0x4C2A9C7: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x52F6D1F: virAllocVar (viralloc.c:560) by 0x5350268: virObjectNew (virobject.c:193) by 0x53503E0: virObjectLockableNew (virobject.c:219) by 0x4E3BBCB: virAdmConnectNew (datatypes.c:832) by 0x4E38495: virAdmConnectOpen (libvirt-admin.c:209) by 0x10C541: vshAdmConnect (virt-admin.c:107) by 0x10C7B2: vshAdmReconnect (virt-admin.c:163) by 0x10CC7C: cmdConnect (virt-admin.c:298) by 0x110838: vshCommandRun (vsh.c:1224) by 0x10DFD8: main (virt-admin.c:862) LEAK SUMMARY: definitely lost: 88 bytes in 1 blocks indirectly lost: 0 bytes in 0 blocks possibly lost: 0 bytes in 0 blocks still reachable: 134,501 bytes in 1,030 blocks suppressed: 0 bytes in 0 blocks This is because virNetClientSetCloseCallback was being reinitialized incorrectly. By resetting the callbacks in a proper way, the leak is fixed. --- src/admin/admin_remote.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index e634fa7..3745b9e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -180,7 +180,9 @@ remoteAdminConnectClose(virAdmConnectPtr conn) goto done; } - virNetClientSetCloseCallback(priv->client, NULL, NULL, NULL); + virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, + virObjectFreeCallback); + virNetClientClose(priv->client); rv = 0; -- 2.4.3

2 2

[libvirt] VMware driver: SessionIsActive API / Sessions.ValidateSession permission
by Richard W.M. Jones 18 Feb '16

18 Feb '16

The VMware driver currently calls the SessionIsActive API, which requires the vCenter Sessions.ValidateSession permission. https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/esx/esx_vi.c;h=af822b14… This causes a problem that you have to give this permission to any libvirt client accessing VMware, and you have to give it from the very top level of vCenter, all the way down through the Cluster, Folder, hypervisor levels. This has caused a bit of pushback from virt-v2v users who consider that the SessionIsActive API is an "admin" API which they don't want to give out to roles using v2v. Is calling SessionIsActive necessary? From my (very limited) understanding, it seems as if we might use 'SessionManager. currentSession' property instead, which doesn't require admin permissions. Actually the code [see link above] already does this when ctx->hasSessionIsActive is false, but that doesn't apply to modern vCenter. See also https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=5699034b65afd49d91dff… which doesn't really explain why this was added. Also, why is it even necessary to check if the session is active here? Shouldn't we just log in unconditionally? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

2 4

[libvirt] [PATCH v2 0/5] Add virtio-gpu & virgl support
by Marc-André Lureau 18 Feb '16

18 Feb '16

The following series allow using virtio-gpu and virgl if qemu support it. Ths Spice bits are not yet in qemu 2.5, but should make it in 2.6 and I added the RFC patches that are expected to not change much. v1->v2: addressing Ján Tomko review - update accel2d/accel3d to be tristate and fix its usage - use a single QEMU_CAPS_DEVICE_VIRTIO_GPU cap for -device virtio-gpu-* & virtio-vga - remove qemu legacy, -vga support or command line parsing - add xml2xml tests - squash xml2argvtests with their respecitve feature addition commits - update libvirt version in doc - update commit messages Marc-André Lureau (5): Replace support{2d,3d} with accel{2d,3d} domain: replace bool accel{2d,3d} with a tristate qemu: add virtio video device qemu: add virtio-gpu virgl support RFC qemu: add spice opengl support docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 6 + src/conf/domain_conf.c | 84 +- src/conf/domain_conf.h | 6 +- src/qemu/qemu_capabilities.c | 12 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 40 +- src/vbox/vbox_common.c | 18 +- src/vz/vz_sdk.c | 2 +- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 22 +- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 22 +- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 95 +- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 168 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 4043 ++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + .../qemuxml2argv-video-virtio-gpu-device.args | 23 + .../qemuxml2argv-video-virtio-gpu-device.xml | 31 + .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 23 + .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 36 + .../qemuxml2argv-video-virtio-gpu-virgl.args | 23 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 33 + tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmltest.c | 4 + 29 files changed, 4732 insertions(+), 99 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.replies create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.xml -- 2.5.0

4 16

[libvirt] [PATCH] admin: Fix memory leak in remoteAdminConnectClose
by Erik Skultety 18 Feb '16

18 Feb '16

When virt-admin is run with valgrind, this kind of output can be obtained: HEAP SUMMARY: in use at exit: 134,589 bytes in 1,031 blocks total heap usage: 2,667 allocs, 1,636 frees, 496,755 bytes allocated 88 bytes in 1 blocks are definitely lost in loss record 82 of 128 at 0x4C2A9C7: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x52F6D1F: virAllocVar (viralloc.c:560) by 0x5350268: virObjectNew (virobject.c:193) by 0x53503E0: virObjectLockableNew (virobject.c:219) by 0x4E3BBCB: virAdmConnectNew (datatypes.c:832) by 0x4E38495: virAdmConnectOpen (libvirt-admin.c:209) by 0x10C541: vshAdmConnect (virt-admin.c:107) by 0x10C7B2: vshAdmReconnect (virt-admin.c:163) by 0x10CC7C: cmdConnect (virt-admin.c:298) by 0x110838: vshCommandRun (vsh.c:1224) by 0x10DFD8: main (virt-admin.c:862) LEAK SUMMARY: definitely lost: 88 bytes in 1 blocks indirectly lost: 0 bytes in 0 blocks possibly lost: 0 bytes in 0 blocks still reachable: 134,501 bytes in 1,030 blocks suppressed: 0 bytes in 0 blocks This is because virNetClientSetCloseCallback was being reinitialized incorrectly. By resetting the callbacks in a proper way, the leak itself is fixed, however we should still dispose of the client object properly by issuing virObjectUnref on it. --- src/admin/admin_remote.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index e634fa7..e174e88 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -180,7 +180,11 @@ remoteAdminConnectClose(virAdmConnectPtr conn) goto done; } - virNetClientSetCloseCallback(priv->client, NULL, NULL, NULL); + virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, + virObjectFreeCallback); + virNetClientClose(priv->client); + virObjectUnref(priv->client); + priv->client = NULL; rv = 0; -- 2.4.3

1 1

[libvirt] Libvirtd and OSX... with QEMU
by Justin Clift 18 Feb '16

18 Feb '16

Heyas, Interestingly on OSX, starting libvirtd (1.3.1) indicates it can see the installed QEMU. However, it crashes out shortly afterwards with a weird error: 2016-01-17 22:02:17.159+0000: 18446744073709551615: error : virEventPollRunOnce:648 : Unable to poll on file handles: Bad file descriptor Does anyone know what that might be about, and/or how to capture more meaningful info? :) Regards and best wishes, Justin Clift

2 6

[libvirt] [PATCH v2 00/10] Reorganizing qemu_command.c continued
by John Ferlan 18 Feb '16

18 Feb '16

v1: http://www.redhat.com/archives/libvir-list/2016-February/msg00804.html v2 changes: Patch 1 makes changes as requested from review. Patches 2-7 are v1's 4-10 take a different approach by creating qemuBuildXXXXCommandLine helper routines. Patches 8-10 are new, but follow the others... John Ferlan (10): qemu: Make basic upfront checks before create command qemu: Rename qemuBuildMachineArgStr qemu: Rename qemuBuildCpuArgStr to qemuBuildCpuCommandLine qemu: Introduce qemuBuildMemCommandLine qemu: Rename qemuBuildSmpArgStr to qemuBuildSmpCommandLine qemu: Introduce qemuBuildIOThreadCommandLine qemu: Introduce qemuBuildNumaCommandLine qemu: Introduce qemuBuildSmbiosCommandLine qemu: Introduce qemuBuildSgaCommandLine qemu: Introduce qemuBuildMonitorCommandLine src/qemu/qemu_command.c | 740 ++++++++++++++++++++++++++++-------------------- 1 file changed, 434 insertions(+), 306 deletions(-) -- 2.5.0

3 22

[libvirt] [PATCHv3 0/2] notify about reverting to a snapshot
by Dmitry Andreev 18 Feb '16

18 Feb '16

Reverting to snapshot may change domain configuration but there will be no events about that. Lack of the event become a problem for virt-manager https://bugzilla.redhat.com/show_bug.cgi?id=1081148 This patch-set introduces new event and emits it in qemuDomainRevertToSnapshot. v3: [2/2] event is emited only in the case when stopped domain is reverted to a stopped domain. Dmitry Andreev (2): Introduce new VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT sub-event qemu: emit 'defined' event after reverted to snapshot without state changes examples/object-events/event-test.c | 2 ++ include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 8 +++++++- tools/virsh-domain.c | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) -- 1.8.3.1

3 5

[libvirt] [PATCH] qemu: cgroup: fix cgroup permission logic
by Bjoern Walk 18 Feb '16

18 Feb '16

Fix logic error introduced in commit d6c91b3c which essentially broke starting any domain. Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> --- src/qemu/qemu_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 53642a1..f3c5fbb 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -65,7 +65,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) return 0; - if (readonly) + if (!readonly) perms |= VIR_CGROUP_DEVICE_WRITE; VIR_DEBUG("Allow path %s, perms: %s", -- 2.3.0

2 1

[libvirt] [PATCH v2] virsh: Remove <backingStore> when changing cdrom media source
by Peter Krempa 18 Feb '16

18 Feb '16

Since the code is changing the source image path by modifying the existing XML snippet the <backingStore> stays in place. As <backingStore> is relevant to the <source> part of the image, the update of that part makes the element invalid. CD/floppy images usually don't have a backing chain and the element is currently ignored though but it might start being used in the future so let's start behaving correctly. Drop the <backingStore> subtree once we want to update the XML. Before this patch, you'd get: $ virsh change-media --eject --print-xml 10 hdc <disk type="file" device="cdrom"> <driver name="qemu" type="qcow2"/> <backingStore type="file" index="1"> <format type="qcow2"/> <source file="/var/lib/libvirt/images/vm.1436949097"/> <backingStore/> </backingStore> <target dev="hdc" bus="ide"/> ... </disk> After: $ virsh change-media --eject --print-xml 10 hdc <disk type="file" device="cdrom"> <driver name="qemu" type="qcow2"/> <target dev="hdc" bus="ide"/> ... </disk> --- Notes: v2: - adapted to new version of code - fixed use after free from previous version - added more text to commit message tools/virsh-domain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bf65a60..83edb21 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11052,6 +11052,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, { xmlNodePtr tmp = NULL; xmlNodePtr source = NULL; + xmlNodePtr backingStore = NULL; xmlNodePtr target_node = NULL; xmlNodePtr text_node = NULL; char *device_type = NULL; @@ -11092,13 +11093,22 @@ virshUpdateDiskXML(xmlNodePtr disk_node, if (xmlStrEqual(tmp->name, BAD_CAST "target")) target_node = tmp; + if (xmlStrEqual(tmp->name, BAD_CAST "backingStore")) + backingStore = tmp; + /* * We've found all we needed. */ - if (source && target_node) + if (source && target_node && backingStore) break; } + /* drop the <backingStore> subtree since it would become invalid */ + if (backingStore) { + xmlUnlinkNode(backingStore); + xmlFreeNode(backingStore); + } + if (type == VIRSH_UPDATE_DISK_XML_EJECT) { if (!source) { vshError(NULL, _("The disk device '%s' doesn't have media"), target); -- 2.6.2

2 1

[libvirt] [PATCH] qemu: Kill VIR_WRAPPER_SHELL_PREFIX
by Peter Krempa 17 Feb '16

17 Feb '16

The migration code now doesn't need it, so remove the macros and the configure code that is detecting it. --- configure.ac | 50 ------------------------------------------------- src/qemu/qemu_monitor.h | 13 ------------- 2 files changed, 63 deletions(-) diff --git a/configure.ac b/configure.ac index 7d74f53..93d347c 100644 --- a/configure.ac +++ b/configure.ac @@ -1111,56 +1111,6 @@ dnl LIBVIRT_DRIVER_CHECK_BHYVE -dnl -dnl check for shell that understands <> redirection without truncation, -dnl needed by src/qemu/qemu_monitor_{text,json}.c. -dnl -if test "$with_qemu" = yes; then - lv_wrapper_shell= - AC_CACHE_CHECK([for shell that supports <> redirection], - [lv_cv_wrapper_shell], - [ - # If cross-compiling, guess that /bin/sh is good enough except for - # Linux, where it might be dash 0.5.5 which is known broken; and on - # Linux, we have a good chance that /bin/bash will exist. - # If we guess wrong, a user can override the cache variable. - # Going through /bin/bash is a slight slowdown if /bin/sh works. - if test "$cross_compiling" = yes; then - case $host_os in - linux*) lv_cv_wrapper_shell=/bin/bash ;; - *) lv_cv_wrapper_shell=/bin/sh ;; - esac - else - for lv_cv_wrapper_shell in /bin/sh bash ksh zsh none; do - test $lv_cv_wrapper_shell = none && - AC_MSG_ERROR([could not find decent shell]) - echo a > conftest.a - ($lv_cv_wrapper_shell -c ': 1<>conftest.a') 2>/dev/null && - case `cat conftest.a`.$lv_cv_wrapper_shell in - a./*) break;; dnl /bin/sh is good enough - a.*) dnl bash, ksh, and zsh all understand 'command', use that - dnl to determine the absolute path of the shell - lv_cv_wrapper_shell=`$lv_cv_wrapper_shell -c \ - "command -v $lv_cv_wrapper_shell"` - case $lv_cv_wrapper_shell in - /*) break;; - esac - ;; - esac - done - rm -f conftest.a - fi - ]) - if test "x$lv_cv_wrapper_shell" != x/bin/sh; then - lv_wrapper_shell=$lv_cv_wrapper_shell - fi - if test "x$lv_wrapper_shell" != x; then - AC_DEFINE_UNQUOTED([VIR_WRAPPER_SHELL], ["$lv_wrapper_shell"], - [Define to the absolute path of a shell that does not truncate on - <> redirection, if /bin/sh does not fit the bill]) - fi -fi - dnl dnl check for kernel headers required by src/bridge.c diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 134cbb6..d1a667a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -926,17 +926,4 @@ int qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon, int qemuMonitorMigrateIncoming(qemuMonitorPtr mon, const char *uri); -/** - * When running two dd process and using <> redirection, we need a - * shell that will not truncate files. These two strings serve that - * purpose. - */ -# ifdef VIR_WRAPPER_SHELL -# define VIR_WRAPPER_SHELL_PREFIX VIR_WRAPPER_SHELL " -c '" -# define VIR_WRAPPER_SHELL_SUFFIX "'" -# else -# define VIR_WRAPPER_SHELL_PREFIX /* nothing */ -# define VIR_WRAPPER_SHELL_SUFFIX /* nothing */ -# endif - #endif /* QEMU_MONITOR_H */ -- 2.6.2

2 1

[libvirt] [PATCH 0/5] tests: qemuargv2xml: Enabling REGENERATE_OUTPUT
by Cole Robinson 17 Feb '16

17 Feb '16

This reworks qemuargv2xml and lxcconf2xml tests to allow use of VIR_TEST_REGENERATE_OUTPUT Cole Robinson (5): tests: qemuargv2xml: Remove unneeded XML blanking tests: qemuargv2xml: Remove UUID randomness tests: qemuargv2xml: hardcode disk auth usage= tests: qemuargv2xml: Drop memory XML blanking tests: lxcconf2xml: Drop XML blanking tests/lxcconf2xmltest.c | 22 +++------ tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 +- .../qemuargv2xml-clock-localtime.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 +- .../qemuargv2xml-console-compat.xml | 4 +- .../qemuargv2xml-disk-cdrom-empty.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 4 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 4 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 +- .../qemuargv2xml-hostdev-pci-address.xml | 6 +-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 4 +- .../qemuargv2xml-machine-core-on.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 +- .../qemuargv2xml-misc-disable-s3.xml | 6 +-- .../qemuargv2xml-misc-disable-suspends.xml | 6 +-- .../qemuargv2xml-misc-enable-s4.xml | 6 +-- .../qemuargv2xml-misc-no-reboot.xml | 4 +- .../qemuargv2xml-net-eth-ifname.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xml-pseries-nvram.xml | 2 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 +- tests/qemuargv2xmltest.c | 54 ++++++++++++---------- 50 files changed, 133 insertions(+), 135 deletions(-) -- 2.5.0

2 8

[libvirt] [PATCH] qemu: Move PORT definitions to qemu_conf.c
by Cole Robinson 17 Feb '16

17 Feb '16

Which is the only user. That was the only reason for including qemu_command.h, though we need to explicitly include qemu_domain.h afterwards. --- Had this sitting in a branch. jferlan: this is in your neck of the woods, not sure if it's going to conflict with any of your reorg patches though... src/qemu/qemu_command.h | 16 ---------------- src/qemu/qemu_conf.c | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 776954e..fb684d0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -39,22 +39,6 @@ # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_FSDEV_HOST_PREFIX "fsdev-" -/* These are only defaults, they can be changed now in qemu.conf and - * explicitly specified port is checked against these two (makes - * sense to limit the values). - * - * This limitation is mentioned in qemu.conf, so bear in mind that the - * configuration file should reflect any changes made to these values. - */ -# define QEMU_REMOTE_PORT_MIN 5900 -# define QEMU_REMOTE_PORT_MAX 65535 - -# define QEMU_WEBSOCKET_PORT_MIN 5700 -# define QEMU_WEBSOCKET_PORT_MAX 65535 - -# define QEMU_MIGRATION_PORT_MIN 49152 -# define QEMU_MIGRATION_PORT_MAX 49215 - VIR_ENUM_DECL(qemuVideo) typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 14683f5..fd3055f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -36,8 +36,8 @@ #include "virerror.h" #include "qemu_conf.h" -#include "qemu_command.h" #include "qemu_capabilities.h" +#include "qemu_domain.h" #include "viruuid.h" #include "virbuffer.h" #include "virconf.h" @@ -58,6 +58,22 @@ VIR_LOG_INIT("qemu.qemu_conf"); +/* These are only defaults, they can be changed now in qemu.conf and + * explicitly specified port is checked against these two (makes + * sense to limit the values). + * + * This limitation is mentioned in qemu.conf, so bear in mind that the + * configuration file should reflect any changes made to these values. + */ +#define QEMU_REMOTE_PORT_MIN 5900 +#define QEMU_REMOTE_PORT_MAX 65535 + +#define QEMU_WEBSOCKET_PORT_MIN 5700 +#define QEMU_WEBSOCKET_PORT_MAX 65535 + +#define QEMU_MIGRATION_PORT_MIN 49152 +#define QEMU_MIGRATION_PORT_MAX 49215 + static virClassPtr virQEMUDriverConfigClass; static void virQEMUDriverConfigDispose(void *obj); -- 2.5.0

2 2

[libvirt] [PATCH] libvirt-guests: emit most messages to stderr
by Michael Chapman 17 Feb '16

17 Feb '16

Some of the shell functions in this script (e.g. check_guests_shutdown) produce output that is captured and processed by other parts of the script. Any error messages from these shell functions must go to stderr, not stdout. Rather than trying to determine which messages are safe for stdout and which are not (and maintaining this safety as the script is refactored), simplify things by emitting all messages to stderr, except for the output from gueststatus(), rh_status() and usage(). Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- tools/libvirt-guests.sh.in | 94 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 7f74b85..80b1ec7 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -92,16 +92,16 @@ test_connect() i=${CONNECT_RETRIES} while [ $i -gt 0 ]; do - run_virsh "$uri" connect 2>/dev/null + run_virsh "$uri" connect >/dev/null 2>/dev/null if [ $? -eq 0 ]; then return 0; fi sleep ${RETRIES_SLEEP} - eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i" + eval_gettext "Unable to connect to libvirt currently. Retrying .. \$i" >&2 i=$(($i-1)) done - eval_gettext "Can't connect to \$uri. Skipping." - echo + eval_gettext "Can't connect to \$uri. Skipping." >&2 + echo >&2 return 1 } @@ -163,8 +163,8 @@ start() { [ -f "$LISTFILE" ] || { started; return 0; } if [ "x$ON_BOOT" != xstart ]; then - gettext "libvirt-guests is configured not to start any guests on boot" - echo + gettext "libvirt-guests is configured not to start any guests on boot" >&2 + echo >&2 rm -f "$LISTFILE" started return 0 @@ -187,19 +187,19 @@ start() { done set +f if ! "$configured"; then - eval_gettext "Ignoring guests on \$uri URI"; echo + eval_gettext "Ignoring guests on \$uri URI" >&2; echo >&2 continue fi test_connect "$uri" || continue - eval_gettext "Resuming guests on \$uri URI..."; echo + eval_gettext "Resuming guests on \$uri URI..." >&2; echo >&2 for guest in $list; do name=$(guest_name "$uri" "$guest") - eval_gettext "Resuming guest \$name: " + eval_gettext "Resuming guest \$name: " >&2 if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - gettext "already active"; echo + gettext "already active" >&2; echo >&2 else if "$isfirst"; then isfirst=false @@ -208,7 +208,7 @@ start() { fi retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ - gettext "done"; echo + gettext "done" >&2; echo >&2 if "$sync_time"; then run_virsh "$uri" domtime --sync "$name" >/dev/null fi @@ -234,7 +234,7 @@ suspend_guest() bypass= slept=0 test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - printf '%s...\n' "$label" + printf '%s...\n' "$label" >&2 run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & virsh_pid=$! while true; do @@ -246,9 +246,9 @@ suspend_guest() progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ awk '/^Data processed:/{print $3, $4}') if [ -n "$progress" ]; then - printf '%s%s\n' "$label" "$progress" + printf '%s%s\n' "$label" "$progress" >&2 else - printf '%s%s\n' "$label" "..." + printf '%s%s\n' "$label" "..." >&2 fi fi done @@ -264,8 +264,8 @@ shutdown_guest() guest=$2 name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo + eval_gettext "Starting shutdown on guest: \$name" >&2 + echo >&2 retval run_virsh "$uri" shutdown "$guest" >/dev/null || return timeout=$SHUTDOWN_TIMEOUT check_timeout=false @@ -283,24 +283,24 @@ shutdown_guest() if $check_timeout; then if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" "$name" "$timeout" + printf "$format" "$name" "$timeout" >&2 fi timeout=$(($timeout - 1)) else slept=$(($slept + 1)) if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" "$name" + printf "$format" "$name" >&2 fi fi done if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - eval_gettext "Shutdown of guest \$name failed to complete in time." + eval_gettext "Shutdown of guest \$name failed to complete in time." >&2 else - eval_gettext "Shutdown of guest \$name complete." + eval_gettext "Shutdown of guest \$name complete." >&2 fi - echo + echo >&2 fi } @@ -313,8 +313,8 @@ shutdown_guest_async() guest=$2 name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo + eval_gettext "Starting shutdown on guest: \$name" >&2 + echo >&2 retval run_virsh "$uri" shutdown "$guest" > /dev/null } @@ -337,8 +337,8 @@ check_guests_shutdown() guests_up= for guest in $guests; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." - echo + eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." >&2 + echo >&2 continue fi if "$guest_running"; then @@ -363,8 +363,8 @@ print_guests_shutdown() esac name=$(guest_name "$uri" "$guest") - eval_gettext "Shutdown of guest \$name complete." - echo + eval_gettext "Shutdown of guest \$name complete." >&2 + echo >&2 done } @@ -404,18 +404,18 @@ shutdown_guests_parallel() if $check_timeout; then if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) "$timeout" + printf "$format" $(($guestcount + $shutdowncount)) "$timeout" >&2 fi timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then - eval_gettext "Timeout expired while shutting down domains"; echo + eval_gettext "Timeout expired while shutting down domains" >&2; echo >&2 RETVAL=1 return fi else slept=$(($slept + 1)) if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) + printf "$format" $(($guestcount + $shutdowncount)) >&2 fi fi @@ -435,8 +435,8 @@ stop() { if [ "x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" - echo + gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" >&2 + echo >&2 RETVAL=6 return fi @@ -449,21 +449,21 @@ stop() { test_connect "$uri" || continue - eval_gettext "Running guests on \$uri URI: " + eval_gettext "Running guests on \$uri URI: " >&2 list=$(list_guests "$uri") if [ $? -eq 0 ]; then empty=true for uuid in $list; do - "$empty" || printf ", " - printf %s "$(guest_name "$uri" "$uuid")" + "$empty" || printf ", " >&2 + printf %s "$(guest_name "$uri" "$uuid")" >&2 empty=false done if "$empty"; then - gettext "no running guests." + gettext "no running guests." >&2 fi - echo + echo >&2 fi if "$suspending"; then @@ -472,26 +472,26 @@ stop() { empty=true for uuid in $transient; do if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " + eval_gettext "Not suspending transient guests on URI: \$uri: " >&2 empty=false else - printf ", " + printf ", " >&2 fi - printf %s "$(guest_name "$uri" "$uuid")" + printf %s "$(guest_name "$uri" "$uuid")" >&2 done - echo + echo >&2 # reload domain list to contain only persistent guests list=$(list_guests "$uri" "--persistent") if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" - echo + eval_gettext "Failed to list persistent guests on \$uri" >&2 + echo >&2 RETVAL=1 set +f return fi else - gettext "Failed to list transient guests" - echo + gettext "Failed to list transient guests" >&2 + echo >&2 RETVAL=1 set +f return @@ -507,9 +507,9 @@ stop() { if [ -s "$LISTFILE" ]; then while read uri list; do if "$suspending"; then - eval_gettext "Suspending guests on \$uri URI..."; echo + eval_gettext "Suspending guests on \$uri URI..." >&2; echo >&2 else - eval_gettext "Shutting down guests on \$uri URI..."; echo + eval_gettext "Shutting down guests on \$uri URI..." >&2; echo >&2 fi if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && -- 2.4.3

2 3

[libvirt] [PATCH 0/6] NSS module for libvirt
by Michal Privoznik 17 Feb '16

17 Feb '16

Are you tired of remembering IP addresses for your domains? Do you have enough of configuring static IPs so that you can add them to your hosts file? Then libvirt NSS module is exactly what you need! NSS does a lot in a Linux host. These patches aim at translating domain names into IP addresses. All you need to do, is install libnss_libvirt.so.2 (e.g. via 'make install' ran from source dir), enable the module in nsswitch.conf: $ grep libvirt /etc/nsswitch.conf hosts: files dns libvirt and you're all set. Now you can just: $ ping $mydomain $ ssh user@$mydomain or anything you'd like. The only limitation is that it has to be libvirt who has assigned the domain IP address. The limitation comes from implementation in which '/var/lib/libvirt/dnsmasq/*.status' files are parsed when looking up a hostname. What's beautiful on this feature is that it helps any users regardless of their systemd attitude. On systemd hosts there already exists a similar module 'mymachines' which takes its data from machined. And libvirt does communicate with machined when creating a domain. But unfortunately at that time we know nothing about guest's IPs and therefore do not tell them to machined, which in turn can't tell anything to mymachines module. To make things worse, machined seems to be lacking an API to tell it the addresses later on when libvirt finds out. Therefore even systemd distros will benefit from this feature. If the feature makes its way in, I'll describe all the steps in a wiki (hence, no documentation in this patch set - although, if you have a bright idea where should I put it, I'm all ears). Enjoy! Michal Privoznik (6): Export virLease* functions for leases file handling virjson: Resolve const correctness Initial support for NSS plugin skeleton nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test cfg.mk | 2 +- configure.ac | 2 + m4/virt-nss.m4 | 51 ++++++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 + src/network/leaseshelper.c | 271 +-------------------------- src/util/virjson.c | 58 +++--- src/util/virjson.h | 54 +++--- src/util/virlease.c | 304 ++++++++++++++++++++++++++++++ src/util/virlease.h | 44 +++++ tests/Makefile.am | 18 ++ tests/nssdata/virbr0.status | 14 ++ tests/nssmock.c | 140 ++++++++++++++ tests/nsstest.c | 184 +++++++++++++++++++ tools/Makefile.am | 45 +++++ tools/nss/libvirt_nss.c | 436 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 ++++++ tools/nss/libvirt_nss.syms | 12 ++ 19 files changed, 1368 insertions(+), 327 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

3 14

[libvirt] devAlias correct parsing
by Alexander Burluka 17 Feb '16

17 Feb '16

Hello, I would be grateful if you help me with next thing: I've successfully subscribed on VIR_DOMAIN_EVENT_ID_TRAY_CHANGE event in my application (QEMU based). It perfectly works and returns to me an device alias (e.g. "drive-scsi0-0-1-0"). Of course I can split this string by delimiter '-'. However, I've found private virDomainDefFindDevice function within libvirt and seems that its make correct parsing. How can I use it in my code? Thank you! -- Regards, Alexander Burluka

2 2

[libvirt] [PATCH] vircgroup: Update virCgroupDenyDevicePath stub
by Michal Privoznik 17 Feb '16

17 Feb '16

In cf113e8d we changed the declaration of virCgroupAllowDevicePath() and virCgroupDenyDevicePath(). However, while updating the stub for non-cgroup platforms for the former we forgot to update the latter too causing a build failure. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index d032c60..38398fd 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4689,7 +4689,8 @@ virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UNUSED, int virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED, const char *path ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED) + int perms ATTRIBUTE_UNUSED, + bool ignoreEacces ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); -- 2.4.10

1 0

[libvirt] [PATCH 0/2] Clean up rest of migration code
by Peter Krempa 17 Feb '16

17 Feb '16

As requested in review. Peter Krempa (2): qemu: monitor: Remove unused qemuMonitorMigrateToFile qemu: Remove unnecessary calculations in qemuDomainSaveMemory src/qemu/qemu_driver.c | 30 ++---------------------- src/qemu/qemu_monitor.c | 61 ------------------------------------------------- src/qemu/qemu_monitor.h | 17 -------------- 3 files changed, 2 insertions(+), 106 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 00/10] Reorganizing qemu_command.c continued
by John Ferlan 17 Feb '16

17 Feb '16

Figure I'll do these in smaller chunks - it's a large module. Suffice to say there's a lot of "movement" and patches for each is tedius, but I hope in the end it will be easier to deal with. For the most part all patches are primarily code motion, although git diff may have you believe otherwise. Essentially, I'm starting at the top of qemuBuildCommandLine and working my way through either moving functions in a top down order from the beginning of the module or more usually creating a qemuBuildXXXXCommandLine function and calling it from the main processing code. I did not "manage" any of the QEMU_CAPS_DEVICE changes (e.g, remove code), but I could while I'm at if that's desired. Hopefully not many people are touching this module right now ;-)! John Ferlan (10): qemu: Move qemuDeviceDriveHostAlias qemu: Remove local emulator qemu: Make basic upfront checks before creating command qemu: Reorganize -machine arguments qemu: Reorganize -cpu arguments qemu: Reorganize qemuBuildDomainLoaderCommandLine call qemu: Reorganize -m arguments qemu: Reorganize -smp argument qemu: Reorganize IOThread -object arguments qemu: Reorganize -numa arguments src/qemu/qemu_alias.c | 16 + src/qemu/qemu_alias.h | 4 + src/qemu/qemu_command.c | 9010 ++++++++++++++++++++++++----------------------- src/qemu/qemu_command.h | 3 - src/qemu/qemu_hotplug.c | 6 +- 5 files changed, 4583 insertions(+), 4456 deletions(-) -- 2.5.0

2 18

[libvirt] [PATCH] syms: add forgotten virAdmConnectClass symbol
by Erik Skultety 17 Feb '16

17 Feb '16

Although it currently doesn't cause any linking issues, the symbol should be exported correctly according to our conventions. --- Pushed under trivial rule. src/libvirt_admin_private.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_admin_private.syms b/src/libvirt_admin_private.syms index ffaf4f3..f22137b 100644 --- a/src/libvirt_admin_private.syms +++ b/src/libvirt_admin_private.syms @@ -12,6 +12,7 @@ xdr_admin_connect_list_servers_ret; xdr_admin_connect_open_args; # datatypes.h +virAdmConnectClass; virAdmGetServer; virAdmServerClass; -- 2.4.3

1 0

[libvirt] [PATCH v4 0/7] admin: Introduce server listing API
by Erik Skultety 17 Feb '16

17 Feb '16

Since v3: - refactors to virHashForEach and hash iterators - servers are now stored in a hash table instead of an array - added forgotten virObjectLock in remoteAdminConnectListServers Erik Skultety (7): util: Add a return value to void hash iterators util: Refactor virHashForEach so it returns as soon as an iterator fails virnetdaemon: Store servers in a hash table admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API virt-admin: Introduce cmdSrvList daemon/Makefile.am | 5 +- daemon/admin.c | 181 +++++++++++++++ daemon/admin.h | 36 +++ daemon/admin_server.c | 111 +++------- daemon/admin_server.h | 26 +-- daemon/libvirtd.c | 6 +- include/libvirt/libvirt-admin.h | 25 ++- po/POTFILES.in | 3 +- src/admin/admin_protocol.x | 26 ++- src/admin/admin_remote.c | 71 ++++++ src/admin_protocol-structs | 15 ++ src/conf/network_conf.c | 15 +- src/conf/nwfilter_params.c | 8 +- src/conf/snapshot_conf.c | 31 +-- src/conf/virchrdev.c | 7 +- src/conf/virdomainobjlist.c | 17 +- src/datatypes.c | 35 +++ src/datatypes.h | 38 ++++ src/libvirt-admin.c | 79 +++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 3 + src/locking/lock_daemon.c | 10 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_controller.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 3 +- src/nwfilter/nwfilter_gentech_driver.c | 5 +- src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 13 +- src/rpc/virnetdaemon.c | 225 +++++++++++++------ src/rpc/virnetdaemon.h | 8 +- src/test/test_driver.c | 14 +- src/uml/uml_driver.c | 13 +- src/util/virclosecallbacks.c | 9 +- src/util/virhash.c | 28 ++- src/util/virhash.h | 6 +- src/xen/xm_internal.c | 7 +- tests/virhashtest.c | 54 +++-- .../input-data-admin-server-names.json | 129 +++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 8 +- .../output-data-admin-server-names.json | 126 +++++++++++ .../virnetdaemondata/output-data-anon-clients.json | 6 +- .../output-data-initial-nomdns.json | 6 +- tests/virnetdaemondata/output-data-initial.json | 6 +- .../output-data-no-keepalive-required.json | 242 +++++++++++---------- tests/virnetdaemontest.c | 63 +++--- tools/virt-admin.c | 61 ++++++ 47 files changed, 1361 insertions(+), 442 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 tests/virnetdaemondata/input-data-admin-server-names.json create mode 100644 tests/virnetdaemondata/output-data-admin-server-names.json -- 2.4.3

2 13

[libvirt] [PATCH 00/10] Setup cgroups for firmware devices and related refactors
by Peter Krempa 17 Feb '16

17 Feb '16

Peter Krempa (10): qemu: cgroup: Remove abandoned function qemuAddToCgroup qemu: migration: Refactor code now that we assume support for fd migration util: cgroup: Instrument virCgroupDenyDevice to handle -1 device number as * util: cgroup: Drop virCgroup(Allow|Deny)DeviceMajor util: cgroup: Allow ignoring EACCES in virCgroup(Allow|Deny)DevicePath qemu: cgroup: Avoid reporting errors from inaccessible NFS volumes qemu: cgroup: Switch to qemu(Setup|Teardown)ImageCgroup qemu: cgroup: Split up qemuSetImageCgroupInternal qemu: cgroup: Extract guts of qemuSetupImageCgroupInternal qemu: cgroup: Setup cgroups for bios/firmware images src/libvirt_private.syms | 2 - src/lxc/lxc_cgroup.c | 16 ++--- src/lxc/lxc_driver.c | 9 ++- src/qemu/qemu_cgroup.c | 151 +++++++++++++++++++++++++++------------------- src/qemu/qemu_cgroup.h | 8 +-- src/qemu/qemu_driver.c | 8 +-- src/qemu/qemu_migration.c | 114 ++++++++++++---------------------- src/qemu/qemu_migration.h | 2 +- src/util/vircgroup.c | 142 ++++++++++++++----------------------------- src/util/vircgroup.h | 14 ++--- 10 files changed, 199 insertions(+), 267 deletions(-) -- 2.6.2

2 21

[libvirt] [PATCH] Revert "storageVolCreateXMLFrom: Check if backend knows how to createVol"
by Ján Tomko 17 Feb '16

17 Feb '16

This reverts commit 611a278fa46d3136b7fe5c6ab05e660ca3c8fdf4. According to the original commit message, this is dead code: It is highly unlikely that a backend will know how to create a volume from a different volume (buildVolFrom) and not know how to create an empty volume (createVol). --- src/storage/storage_driver.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 81b1584..e0ded01 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2037,13 +2037,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; - if (!backend->createVol) { - virReportError(VIR_ERR_NO_SUPPORT, - "%s", _("storage pool does not support volume " - "creation")); - goto cleanup; - } - if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support" -- 2.4.10

2 1

[libvirt] [PATCH 00/12] Split up qemu_command.c
by John Ferlan 16 Feb '16

16 Feb '16

Before disappearing too far down the rabbit hole... My recent foray into qemu_command.c to split out qemu_parse_command.c got me thinking that the module could use quite a bit of a reorganization. It's about 11,400 lines of all sorts of various functions. This started out as an attempt to order functions as they are used, but started turning into extracting certain API's/Helpers into other qemu_*.c modules. There's still quite a bit to do, but rather than hold onto it too long I figured I'd send what I have so far now (and keep working through while waiting for reviews). This is essentially all code motion with some function renames along the way. John Ferlan (12): qemu-command: Move qemuBuildTPMBackendStr qemu-command: Move qemuVirCommandGetFDSet qemu-command: Move qemuBuildTPMDevStr qemu-command: Move qemuVirCommandGetDevSet qemu: Move qemuPhysIfaceConnect to qemu_interface.c and rename qemu: Move qemuNetworkIfaceConnect to qemu_interface.c and rename qemu-command: Move qemuDomainSupports* functions qemu-command: Move qemuDomain*Address* functions to qemu_domain.c qemu-command: Move remaining qemuDomain* functions qemu-command: Move and rename qemuOpenVhostNet qemu-command: Move qemuNetworkPrepareDevices qemu-command: Move qemuAssign*Alias* API's into their own module po/POTFILES.in | 2 + src/Makefile.am | 1 + src/qemu/qemu_assign_alias.c | 468 +++++++ src/qemu/qemu_assign_alias.h | 60 + src/qemu/qemu_command.c | 3073 +++++------------------------------------- src/qemu/qemu_command.h | 48 - src/qemu/qemu_domain.c | 1646 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 25 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_hotplug.c | 19 +- src/qemu/qemu_interface.c | 378 ++++++ src/qemu/qemu_interface.h | 22 + src/qemu/qemu_process.c | 56 +- tests/qemuhotplugtest.c | 1 + tests/qemuxml2argvtest.c | 1 + 15 files changed, 2978 insertions(+), 2823 deletions(-) create mode 100644 src/qemu/qemu_assign_alias.c create mode 100644 src/qemu/qemu_assign_alias.h -- 2.5.0

3 32

[libvirt] [PATCH] conf: Use a temporary int variable to store GIC version
by Andrea Bolognani 16 Feb '16

16 Feb '16

Since no value in the virGICVersion enumeration is negative, a clever enough compiler can report an error such as src/conf/domain_conf.c:15337:75: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 || ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ virGICVersionTypeFromString() can, however, return a negative value if the input string is not part of the enumeration, so we definitely need that check. Work around the problem by storing the return value in a temporary int variable. --- Pushed under the build-breaker rule. src/conf/domain_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 295bc1b..0d2957b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14728,7 +14728,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; - int n, virtType; + int n, virtType, gic_version; long id = -1; virDomainDefPtr def; bool uuid_generated = false; @@ -15334,12 +15334,13 @@ virDomainDefParseXML(xmlDocPtr xml, node = ctxt->node; ctxt->node = nodes[i]; if ((tmp = virXPathString("string(./@version)", ctxt))) { - if ((def->gic_version = virGICVersionTypeFromString(tmp)) < 0 || - def->gic_version == VIR_GIC_VERSION_NONE) { + gic_version = virGICVersionTypeFromString(tmp); + if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) { virReportError(VIR_ERR_XML_ERROR, _("malformed gic version: %s"), tmp); goto error; } + def->gic_version = gic_version; VIR_FREE(tmp); } def->features[val] = VIR_TRISTATE_SWITCH_ON; -- 2.5.0

1 0

[libvirt] [PATCH 0/7] Improve GIC support
by Andrea Bolognani 16 Feb '16

16 Feb '16

This series was really just supposed to enable guests to use the special "host" GIC version, but I ended up changing a bunch of other stuff and adding a whole lot of new test cases. I've also made it so the GIC availability is always reflected in the domain XML, the same way other implicit devices and features work. The GIC-related definitions are in their own file: depending on whether we end up probing for host GIC support ourselves or relying on QEMU this might turn out to be a huge overkill :) Cheers. Andrea Bolognani (7): gic: Introduce virGICVersion enumeration schema: List allowed GIC versions conf: Use virGICVersion enumeration in virDomainDef qemu: Default to GIC v2 qemu: Always enable GIC on ARM virt machines tests: Reorganize and simplify GIC test cases tests: Add more GIC test cases docs/schemas/domaincommon.rng | 6 +++- src/Makefile.am | 1 + src/conf/domain_conf.c | 15 ++++---- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 5 +++ src/qemu/qemu_command.c | 8 +++-- src/qemu/qemu_domain.c | 29 ++++++++++++++++ src/util/virgic.c | 33 ++++++++++++++++++ src/util/virgic.h | 38 ++++++++++++++++++++ .../qemuxml2argv-aarch64-aavmf-virtio-mmio.xml | 1 + .../qemuxml2argv-aarch64-gic-default.args | 1 + .../qemuxml2argv-aarch64-gic-default.xml | 22 ++++++++++++ ...gic.args => qemuxml2argv-aarch64-gic-host.args} | 13 +++---- .../qemuxml2argv-aarch64-gic-host.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-invalid.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-none.args | 1 + .../qemuxml2argv-aarch64-gic-none.xml | 19 ++++++++++ .../qemuxml2argv-aarch64-gic-not-arm.xml | 22 ++++++++++++ .../qemuxml2argv-aarch64-gic-not-virt.xml | 22 ++++++++++++ ...gicv3.args => qemuxml2argv-aarch64-gic-v2.args} | 12 +++---- ...h64-gic.xml => qemuxml2argv-aarch64-gic-v2.xml} | 14 ++------ .../qemuxml2argv-aarch64-gic-v3.args | 20 +++++++++++ ...4-gicv3.xml => qemuxml2argv-aarch64-gic-v3.xml} | 14 ++------ tests/qemuxml2argvtest.c | 40 ++++++++++++++++++---- .../qemuxml2xmlout-aarch64-gic-default.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none.xml | 1 + tests/qemuxml2xmltest.c | 7 ++-- 27 files changed, 331 insertions(+), 61 deletions(-) create mode 100644 src/util/virgic.c create mode 100644 src/util/virgic.h create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.xml rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic.args => qemuxml2argv-aarch64-gic-host.args} (57%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-invalid.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-arm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-not-virt.xml rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gicv3.args => qemuxml2argv-aarch64-gic-v2.args} (55%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic.xml => qemuxml2argv-aarch64-gic-v2.xml} (61%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gicv3.xml => qemuxml2argv-aarch64-gic-v3.xml} (61%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml -- 2.5.0

3 24

[libvirt] [PATCH] qemu: fix hot unplug of PCI devices with VFIO
by Ludovic Beliveau 16 Feb '16

16 Feb '16

Currently, on hot unplug of PCI devices with VFIO driver for QEMU, libvirt is trying to restore the host devices to it's previous value (basically a chown on the previous user/group). However for devices with VFIO driver, when the device is unbinded it is removed from the /dev/vfio file system causing the restore label to fail. The fix is to not restore the label for those PCI devices since they are going to be teared down anyway. Signed-off-by: Ludovic Beliveau <ludovic.beliveau(a)windriver.com> --- diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f8db960..f5beabd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2996,6 +2996,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *drivestr = NULL; + virDomainHostdevSubsysPCIPtr pcisrc = NULL; + bool is_vfio = false; VIR_DEBUG("Removing host device %s from domain %p %s", hostdev->info->alias, vm, vm->def->name); @@ -3039,6 +3041,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + pcisrc = &hostdev->source.subsys.u.pci; + is_vfio = pcisrc->backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; qemuDomainRemovePCIHostDevice(driver, vm, hostdev); /* QEMU might no longer need to lock as much memory, eg. we just * detached the last VFIO device, so adjust the limit here */ @@ -3058,7 +3062,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Failed to remove host device cgroup ACL"); - if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, + if (!is_vfio && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, vm->def, hostdev, NULL) < 0) { VIR_WARN("Failed to restore host device labelling"); }

3 2

[libvirt] [PATCH] Spell VMware with a lowercase w
by Ján Tomko 16 Feb '16

16 Feb '16

Replace all occurrences of VMWare outside the news. --- docs/formatdomain.html.in | 2 +- docs/migration.html.in | 2 +- docs/storage.html.in | 2 +- libvirt.spec.in | 2 +- src/util/virerror.c | 2 +- src/util/virstoragefile.c | 2 +- tools/virsh.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b3187bb..e96798f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1569,7 +1569,7 @@ <dt><code>vmport</code></dt> <dd>Depending on the <code>state</code> attribute (values <code>on</code>, <code>off</code>, default <code>on</code>) enable or disable - the emulation of VMWare IO port, for vmmouse etc. + the emulation of VMware IO port, for vmmouse etc. <span class="since">Since 1.2.16</span> </dd> <dt><code>gic</code></dt> diff --git a/docs/migration.html.in b/docs/migration.html.in index 6986cc0..8efdd7f 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -475,7 +475,7 @@ </pre> <p> - Supported by Xen, QEMU, VMWare and VirtualBox drivers + Supported by Xen, QEMU, VMware and VirtualBox drivers </p> <h3><a name="scenarionativepeer2peer">Native migration, client to and peer2peer between, two libvirtd servers</a></h3> diff --git a/docs/storage.html.in b/docs/storage.html.in index 1f01330..b0efe69 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -161,7 +161,7 @@ <li><code>qcow</code>: QEMU v1 disk image format</li> <li><code>qcow2</code>: QEMU v2 disk image format</li> <li><code>qed</code>: QEMU Enhanced Disk image format</li> - <li><code>vmdk</code>: VMWare disk image format</li> + <li><code>vmdk</code>: VMware disk image format</li> <li><code>vpc</code>: VirtualPC disk image format</li> </ul> <p> diff --git a/libvirt.spec.in b/libvirt.spec.in index dd54dfc..fc2e2cf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -190,7 +190,7 @@ %endif # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, -# VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), +# VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), # or HyperV. %if 0%{?rhel} %define with_openvz 0 diff --git a/src/util/virerror.c b/src/util/virerror.c index 3a3ddef..e1bcf52 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -105,7 +105,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Audit Utils", "Sysinfo Utils", "I/O Stream Utils", - "VMWare Driver", + "VMware Driver", "Event Loop", /* 40 */ "Xen Light Driver", diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 3e79ae1..49b1745 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -490,7 +490,7 @@ vmdk4GetBackingStore(char **res, *res = NULL; /* * Technically this should have been VMDK, since - * VMDK spec / VMWare impl only support VMDK backed + * VMDK spec / VMware impl only support VMDK backed * by VMDK. QEMU isn't following this though and * does probing on VMDK backing files, hence we set * AUTO diff --git a/tools/virsh.c b/tools/virsh.c index b96dbda..eb84dd0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -550,7 +550,7 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, " OpenVZ"); #endif #ifdef WITH_VMWARE - vshPrint(ctl, " VMWare"); + vshPrint(ctl, " VMware"); #endif #ifdef WITH_PHYP vshPrint(ctl, " PHYP"); -- 2.4.10

3 3

[libvirt] PING: [RFC] vhost-user + shared memory + NUMA
by Pavel Fedin 15 Feb '16

15 Feb '16

Hello! Sorry, but i did not get any answer to the last question. Would it be OK to require <memoryBacking> and implicitly add only shared mode ? Kind regards, Pavel Fedin Senior Engineer Samsung Electronics Research center Russia > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of > Pavel Fedin > Sent: Thursday, February 11, 2016 5:36 PM > To: 'Daniel P. Berrange' > Cc: 'Libvirt' > Subject: Re: [libvirt] [RFC] vhost-user + shared memory + NUMA > > Hello! > > > > Ok, then would it be a good compromise if we require <memoryBacking>, and only > implicitly > > add "shared" if we have vhost-user > > > devices? This way we would not change the way the guest memory is allocated. > > > > Adding shared implicitly *will* change the way guest memory is allocated, > > as it will have to use tmpfs to make it shared. > > You perhaps didn't get my idea. I meant - we will still need to specify <memoryBacking> with > huge pages, just no <numa>. Therefore, the memory will be allocated via file backend from > hugetlbfs. Only mode will be changed implicitly (private -> shared). > > > > IMHO being able to manually specify "shared" both in <numa> and > > > in <memoryBacking> would be ambiguous. > > > > That's not really any different to what we have already with NUMA. > > The top level setting would apply as the default, and the NUMA level > > settings override it if needed. > > Well, the only little drawback would be necessity to add "shared" by itself. This would > require additional patching to clients (e. g. openstack). > > Kind regards, > Pavel Fedin > Senior Engineer > Samsung Electronics Research center Russia > > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

2 1

[libvirt] [PATCH 0/2] virsh: fix usage of vshPrint
by Peter Krempa 15 Feb '16

15 Feb '16

Peter Krempa (2): vsh: Simplify bailing out on OOM conditions vsh: Replace vshPrint macro with function tools/virsh-domain.c | 16 +++++++++------- tools/vsh.c | 34 +++++++++++++++++++++++++++++----- tools/vsh.h | 5 ++--- 3 files changed, 40 insertions(+), 15 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH 0/4] Couple of storage related fixes
by Michal Privoznik 15 Feb '16

15 Feb '16

After an e-mail on libvirt-users [1] I've realized there are some things that we can do better. The first two patches introduce a new feature. The other two are just some fixes. Michal Privoznik (4): cmdVolCreateAs: Rework to follow usual func pattern virsh: Teach vol-create-as to --print-xml storageVolCreateXML: Swap order of two operations storageVolCreateXMLFrom: Check if backend knows how to createVol src/storage/storage_driver.c | 15 +++++++++++---- tools/virsh-volume.c | 33 +++++++++++++++++++++------------ tools/virsh.pod | 6 ++++-- 3 files changed, 36 insertions(+), 18 deletions(-) -- 2.4.10

3 11

[libvirt] ARM KVM GICv3 Support
by Christoffer Dall 15 Feb '16

15 Feb '16

Hi all, I'm trying to figure out what the correct solution for libvirt support for ARM KVM guests with GICv3 is. The challenge is that QEMU's virt machine model defaults to GICv2 unless you specify an additional "-machine gic-version=host" parameter to QEMU, in which case your VM gets the same GIC version as your host. Now, I'm told that this is inconvenient for libvirt, because it typically does not pass any -machine options, is that correct? Further, there are two additional complications: First, some guest images may not include GICv3 support. For Linux, this is relatively old kernels (prior to v3.17), but other guests may only support GICv2. Second, some hardware platforms only support GICv2 guests, some only support GICv3 guests, and some support both GICv2 and GICv3 guests (those hosts with a GICv3 with the backwards compatibility support). It is unclear to me how libvirt users will relate to these constraints. For example, in an OpenStack deployment, will it somehow be easy to tell which nodes support which GIC version such that administrators can choose compatible VM images, or how does that work? The end goal here is to determine if we need to add any functionality to QEMU to better support libvirt, and what kind of features/glue need to be added to libvirt for this to work. Much thanks for any feedback! -Christoffer

12 53

[libvirt] [libvirt-php] Status of Development?
by Markus Petzsch 15 Feb '16

15 Feb '16

Hello, I've noticed that the PHP libvirt binding is missing some functions which are present in other implementations. Namely things like attach-interface which allow live modification of a running VM. How is the current status of the PHP binding? Will we see new features in the future or is learning Python the better option? :-) Markus

2 1

[libvirt] [PATCH 0/3] networking logging improvements
by Laine Stump 14 Feb '16

14 Feb '16

1/3 was originally part of 2/3, but I decided I should split it out since it changes something other than logging (although it should still be a NOP). 2/3 changes what's logged when a domain interface is connected to / disconnected from a network, and 3/3 changes what is logged during 802.1QbX associate/disassociate operations. All of these logging changed have proven useful to me when debugging 802.1QbX problems on a downstream version of libvirt (0.10.2 in RHEL6), so I thought I'd share the joy :-) Laine Stump (3): network: consolidate connection count updates for device pool network: consolidated info log for all network allocate/free operations util: clean up and expand 802.1QbX negotiation logging src/network/bridge_driver.c | 91 +++++++++++++++++++--------------------- src/util/virnetdevvportprofile.c | 60 ++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 56 deletions(-) -- 2.5.0

2 7

[libvirt] Improvements to the RBD storage backend
by Wido den Hollander 12 Feb '16

12 Feb '16

Hi, After review by John Ferlan I'm sending a revised version of my earlier patch which adds the fast-diff feature for RBD volumes. Before the patch there is one small improvement which is later used by the fast-diff feature. The other is a bugfix where the #ifdef in the code wasn't requiring the right version of librbd. Wido

2 4

[libvirt] [PATCH] domsuspend: Fix warning on mingw build
by Andrea Bolognani 12 Feb '16

12 Feb '16

Commit d82170d introduced a workaround for domtop: in that example program, we define a symbol called ERROR for our own use, but since a symbol with the same name is already defined in one of mingw's header files, we get a warning when using that compiler. domsuspend defines the same problematic symbol, so the workaround has been copied over. --- examples/domsuspend/suspend.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c index 11f7302..3e3f70e 100644 --- a/examples/domsuspend/suspend.c +++ b/examples/domsuspend/suspend.c @@ -34,6 +34,21 @@ static int debug; +/* On mingw, there's a header file that poisons the well: + * + * + * CC domtop.o + *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] + * #define ERROR(...) \ + * ^ + *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, + * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, + * from ../../gnulib/lib/unistd.h:48, + * from domtop.c:35: + * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition + * #define ERROR 0 + */ +#undef ERROR #define ERROR(...) \ do { \ fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ -- 2.5.0

2 2

[libvirt] [PATCH v2 0/3] Add capability for text based polkit authentication for virsh
by John Ferlan 12 Feb '16

12 Feb '16

v1: http://www.redhat.com/archives/libvir-list/2016-February/msg00545.html Differences to v1: - Patch 1, adjust error message slightly - Patch 2, remove the unnecessary virPolkitAgentCheck and the sleep - Patch 3, remove the --pkauth parameter adjust the logic to attempt the authentications in a loop with the first being one for the graphical agent. If that fails because there was no agent to be found, then start up the text based agent. Also add logic to wait for the text based authentication agent to start (just in case). John Ferlan (3): polkit: Adjust message when action-id isn't found util: Introduce API's for Polkit text authentication virsh: Add support for text based polkit authentication src/libvirt_private.syms | 2 ++ src/util/virpolkit.c | 64 +++++++++++++++++++++++++++++++++++++++++++++--- src/util/virpolkit.h | 5 ++++ tests/virpolkittest.c | 3 ++- tools/virsh.c | 49 ++++++++++++++++++++++++++++++++---- tools/virsh.h | 2 ++ 6 files changed, 115 insertions(+), 10 deletions(-) -- 2.5.0

2 12

[libvirt] [PATCH] virportallocatortest: Run on linux only
by Michal Privoznik 12 Feb '16

12 Feb '16

After the rework of mocking of our tests there's the virportallocator test failing to link on mingw. Well, it's the mocking library actually: ../gnulib/lib/.libs/libgnu.a(bind.o): In function `rpl_bind': /home/jenkins/libvirt-mingw/build32/gnulib/lib/../../../gnulib/lib/bind.c:33: multiple definition of `rpl_bind' .libs/virportallocatormock_la-virportallocatormock.o:/home/jenkins/libvirt-mingw/build32/tests/../../tests/virportallocatormock.c:79: first defined here I've no idea why this matters to mingw and does not to others. Nevertheless, if we make the test linux only the problem goes away. Apparently, our test for RTLD_NEXT is not sufficient because mingw32 defines it. Lets put aside for a while fact that it has the same value as RTLD_DEFAULT which by description has different meaning, shall we? Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virportallocatormock.c | 6 ++++-- tests/virportallocatortest.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c index e44191e..fa6e75b 100644 --- a/tests/virportallocatormock.c +++ b/tests/virportallocatormock.c @@ -25,7 +25,7 @@ # include <dlfcn.h> #endif -#if defined(RTLD_NEXT) +#if defined(__linux__) && defined(RTLD_NEXT) # include "internal.h" # include <sys/socket.h> # include <errno.h> @@ -105,4 +105,6 @@ int bind(int sockfd ATTRIBUTE_UNUSED, return 0; } -#endif /* ! defined(RTLD_NEXT) */ +#else /* defined(__linux__) && defined(RTLD_NEXT) */ +/* Nothing to override on other platforms. */ +#endif diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 1a5d759..4574215 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -27,7 +27,8 @@ # include <dlfcn.h> #endif -#if defined(RTLD_NEXT) +#if defined(__linux__) && defined(RTLD_NEXT) + # include "virutil.h" # include "virerror.h" # include "viralloc.h" @@ -174,7 +175,7 @@ mymain(void) } VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so") -#else /* ! defined(RTLD_NEXT) */ +#else /* defined(__linux__) && defined(RTLD_NEXT) */ int main(void) { -- 2.4.10

2 1

[libvirt] [PATCH] migration: add option to set target ndb server port
by Nikolay Shirokovskiy 12 Feb '16

12 Feb '16

Current libvirt + qemu pair lacks secure migrations in case of VMs with non-shared disks. The only option to migrate securely natively is to use tunneled mode and some kind of secure destination URI. But tunelled mode does not support non-shared disks. The other way to make migration secure is to organize a tunnel by external means. This is possible in case of shared disks migration thru use of proper combination of destination URI, migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration param. But again this is not possible in case of non shared disks migration as we have no option to control target nbd server port. But fixing this much more simplier that supporting non-shared disks in tunneled mode. So this patch adds option to set target ndb port. Finally all qemu migration connections will be secured AFAIK but even in this case this patch could be convinient if one wants all migration traffic be put in a single connection. --- include/libvirt/libvirt-domain.h | 10 +++ src/qemu/qemu_driver.c | 25 ++++--- src/qemu/qemu_migration.c | 138 +++++++++++++++++++++++++++------------ src/qemu/qemu_migration.h | 3 + tools/virsh-domain.c | 12 ++++ tools/virsh.pod | 5 +- 6 files changed, 141 insertions(+), 52 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index d26faa5..e577f26 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -757,6 +757,16 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_MIGRATE_DISKS "migrate_disks" +/** + * VIR_MIGRATE_PARAM_NBD_PORT: + * + * virDomainMigrate* params field: port that destination nbd server should use + * for incoming disks migration. Type is VIR_TYPED_PARAM_INT. If set to 0 or + * omitted, libvirt will choose a suitable default. At the moment this is only + * supported by the QEMU driver. + */ +# define VIR_MIGRATE_PARAM_NBD_PORT "nbd_port" + /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ccf68b..4d00ba4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12082,7 +12082,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12135,7 +12135,7 @@ qemuDomainMigratePerform(virDomainPtr dom, * Consume any cookie we were able to decode though */ ret = qemuMigrationPerform(driver, dom->conn, vm, - NULL, dconnuri, uri, NULL, NULL, 0, NULL, + NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ flags, dname, resource, false); @@ -12308,7 +12308,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12334,6 +12334,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, const char *dname = NULL; const char *uri_in = NULL; const char *listenAddress = cfg->migrationAddress; + int nbdPort = 0; int nmigrate_disks; const char **migrate_disks = NULL; char *origname = NULL; @@ -12354,7 +12355,10 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, &uri_in) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12385,7 +12389,8 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cookieout, cookieoutlen, uri_in, uri_out, &def, origname, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, + nbdPort, flags); cleanup: VIR_FREE(migrate_disks); @@ -12519,7 +12524,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, } return qemuMigrationPerform(driver, dom->conn, vm, xmlin, - dconnuri, uri, NULL, NULL, 0, NULL, + dconnuri, uri, NULL, NULL, 0, NULL, 0, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, true); @@ -12546,6 +12551,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, int nmigrate_disks; const char **migrate_disks = NULL; unsigned long long bandwidth = 0; + int nbdPort; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -12569,7 +12575,10 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, &graphicsuri) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12589,7 +12598,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ret = qemuMigrationPerform(driver, dom->conn, vm, dom_xml, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, true); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 51e7125..362da0f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1709,7 +1709,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *listenAddr, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1717,6 +1718,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, char *diskAlias = NULL; size_t i; + if (nbdPort < 0 || nbdPort > USHRT_MAX) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nbd port must be in range 0-65535")); + return -1; + } + for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -1733,10 +1740,15 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto cleanup; - if (!port && - ((virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) || - (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { - goto exit_monitor; + if (port == 0) { + if (nbdPort) + port = nbdPort; + else + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto exit_monitor; + + if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0) + goto exit_monitor; } if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0) @@ -1750,7 +1762,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); - if (ret < 0) + // second clause means port is autoselected + if (ret < 0 && nbdPort == 0) virPortAllocatorRelease(driver->migrationPorts, port); return ret; @@ -2062,6 +2075,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationCookiePtr mig, const char *host, + int nbdPort, unsigned long speed, unsigned int *migrate_flags, size_t nmigrate_disks, @@ -2081,6 +2095,12 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); + if (nbdPort != mig->nbd->port) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("target qemu does not support setting nbd port")); + return -1; + } + /* steal NBD port and thus prevent its propagation back to destination */ port = mig->nbd->port; mig->nbd->port = 0; @@ -3402,6 +3422,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { virDomainObjPtr vm = NULL; @@ -3601,7 +3622,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) { if (qemuMigrationStartNBDServer(driver, vm, incoming->address, - nmigrate_disks, migrate_disks) < 0) { + nmigrate_disks, migrate_disks, + nbdPort) < 0) { goto stopjob; } cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; @@ -3653,6 +3675,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (autoPort) priv->migrationPort = port; + // in this case port is autoselected and we don't need to manage it anymore + // after cookie is baked + if (nbdPort != 0) + priv->nbdPort = 0; ret = 0; cleanup: @@ -3664,7 +3690,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* priv is set right after vm is added to the list of domains * and there is no 'goto cleanup;' in the middle of those */ VIR_FREE(priv->origname); - virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); + // release if port is auto selected which is not the case if + // it is given in parameters + if (nbdPort == 0) + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; qemuDomainRemoveInactive(driver, vm); } @@ -3721,7 +3750,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, flags); + st, NULL, 0, false, NULL, 0, NULL, 0, flags); return ret; } @@ -3763,6 +3792,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { unsigned short port = 0; @@ -3776,11 +3806,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " "def=%p, origname=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); *uri_out = NULL; @@ -3885,7 +3915,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cookieout, cookieoutlen, def, origname, NULL, uri ? uri->scheme : "tcp", port, autoPort, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); cleanup: virURIFree(uri); VIR_FREE(hostname); @@ -4365,7 +4395,8 @@ qemuMigrationRun(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { int ret = -1; unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND; @@ -4383,11 +4414,11 @@ qemuMigrationRun(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " "spec=%p (dest=%d, fwd=%d), dconn=%p, graphicsuri=%s, " - "nmigrate_disks=%zu, migrate_disks=%p", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d", driver, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType, dconn, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, nbdPort); if (flags & VIR_MIGRATE_NON_SHARED_DISK) { migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK; @@ -4425,6 +4456,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* This will update migrate_flags on success */ if (qemuMigrationDriveMirror(driver, vm, mig, spec->dest.host.name, + nbdPort, migrate_speed, &migrate_flags, nmigrate_disks, @@ -4661,7 +4693,8 @@ static int doNativeMigrate(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { qemuDomainObjPrivatePtr priv = vm->privateData; virURIPtr uribits = NULL; @@ -4670,10 +4703,11 @@ static int doNativeMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " - "graphicsuri=%s, nmigrate_disks=%zu migrate_disks=%p", + "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p, " + "nbdPort=%d", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, nbdPort); if (!(uribits = qemuMigrationParseURI(uri, NULL))) return -1; @@ -4711,7 +4745,8 @@ static int doNativeMigrate(virQEMUDriverPtr driver, ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn, - graphicsuri, nmigrate_disks, migrate_disks); + graphicsuri, nmigrate_disks, migrate_disks, + nbdPort); if (spec.destType == MIGRATION_DEST_FD) VIR_FORCE_CLOSE(spec.dest.fd.qemu); @@ -4735,7 +4770,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { virNetSocketPtr sock = NULL; int ret = -1; @@ -4745,10 +4781,12 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " - "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p", + "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p, " + "nbdPort=%d", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, + nbdPort); spec.fwdType = MIGRATION_FWD_STREAM; spec.fwd.stream = st; @@ -4772,7 +4810,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn, - graphicsuri, nmigrate_disks, migrate_disks); + graphicsuri, nmigrate_disks, migrate_disks, + nbdPort); cleanup: if (spec.destType == MIGRATION_DEST_FD) { @@ -4883,12 +4922,12 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, ret = doTunnelMigrate(driver, vm, st, NULL, 0, NULL, NULL, flags, resource, dconn, - NULL, 0, NULL); + NULL, 0, NULL, 0); else ret = doNativeMigrate(driver, vm, uri_out, cookie, cookielen, NULL, NULL, /* No out cookie with v2 migration */ - flags, resource, dconn, NULL, 0, NULL); + flags, resource, dconn, NULL, 0, NULL, 0); /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) @@ -4952,6 +4991,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long long bandwidth, bool useParams, unsigned long flags) @@ -4975,11 +5015,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, " "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, bandwidth=%llu, " - "useParams=%d, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " + "bandwidth=%llu, useParams=%d, flags=%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), - NULLSTR(listenAddress), nmigrate_disks, migrate_disks, + NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, bandwidth, useParams, flags); /* Unlike the virDomainMigrateVersion3 counterpart, we don't need @@ -5029,6 +5069,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_MIGRATE_PARAM_MIGRATE_DISKS, migrate_disks[i]) < 0) goto cleanup; + if (nbdPort && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, + nbdPort) < 0) + goto cleanup; } if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) @@ -5114,13 +5159,13 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); } else { ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); } /* Perform failed. Make sure Finish doesn't overwrite the error */ @@ -5295,6 +5340,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags, const char *dname, unsigned long resource, @@ -5310,10 +5356,12 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, " "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, " - "migrate_disks=%p, flags=%lx, dname=%s, resource=%lu", + "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, " + "resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags, NULLSTR(dname), resource); + nmigrate_disks, migrate_disks, nbdPort, flags, NULLSTR(dname), + resource); if (flags & VIR_MIGRATE_TUNNELLED && uri) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -5408,8 +5456,8 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, if (*v3proto) { ret = doPeer2PeerMigrate3(driver, sconn, dconn, dconnuri, vm, xmlin, dname, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, resource, - useParams, flags); + nmigrate_disks, migrate_disks, nbdPort, + resource, useParams, flags); } else { ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, dconnuri, flags, dname, resource); @@ -5446,6 +5494,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5481,13 +5530,13 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { ret = doPeer2PeerMigrate(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, flags, dname, resource, &v3proto); } else { qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, resource, NULL, NULL, 0, NULL); + flags, resource, NULL, NULL, 0, NULL, 0); } if (ret < 0) goto endjob; @@ -5547,6 +5596,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, const char *graphicsuri, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5572,7 +5622,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, NULL, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); if (ret < 0) { if (qemuMigrationRestoreDomainState(conn, vm)) { @@ -5614,6 +5664,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5625,13 +5676,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver, { VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, " + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " "flags=%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, NULLSTR(dname), resource, v3proto); + nmigrate_disks, migrate_disks, nbdPort, + NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, + flags, NULLSTR(dname), resource, v3proto); if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (cookieinlen) { @@ -5642,7 +5694,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); @@ -5656,14 +5708,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver, if (v3proto) { return qemuMigrationPerformPhase(driver, conn, vm, uri, graphicsuri, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource); } else { return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 2445e13..2796361 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -51,6 +51,7 @@ VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG, \ VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_NBD_PORT, VIR_TYPED_PARAM_INT, \ VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING | \ VIR_TYPED_PARAM_MULTIPLE, \ NULL @@ -134,6 +135,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, @@ -146,6 +148,7 @@ int qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d239ba8..54c9fd0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9651,6 +9651,10 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_STRING, .help = N_("comma separated list of disks to be migrated") }, + {.name = "nbd-port", + .type = VSH_OT_INT, + .help = N_("port to use by target nbd server") + }, {.name = NULL} }; @@ -9661,6 +9665,7 @@ doMigrate(void *opaque) virDomainPtr dom = NULL; const char *desturi = NULL; const char *opt = NULL; + int optInt = 0; unsigned int flags = 0; virshCtrlData *data = opaque; vshControl *ctl = data->ctl; @@ -9703,6 +9708,13 @@ doMigrate(void *opaque) VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0) goto save_error; + if (vshCommandOptInt(ctl, cmd, "nbd-port", &optInt) < 0) + goto out; + if (optInt && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, optInt) < 0) + goto save_error; + if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0) goto out; if (opt && diff --git a/tools/virsh.pod b/tools/virsh.pod index e830c59..c0c4e81 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1532,7 +1532,7 @@ to the I<uri> namespace is displayed instead of being modified. [I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -[I<--migrate-disks> B<disk-list>] +[I<--migrate-disks> B<disk-list>] [I<--nbd-port> B<port>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -1659,6 +1659,9 @@ addresses are accepted as well as hostnames (the resolving is done on destination). Some hypervisors do not support this feature and will return an error if this parameter is used. +Optional I<nbd-port> sets the port that hypervisor on destination side should +bind to for incoming nbd traffic. Currently it is supported only by qemu. + =item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to -- 1.8.3.1

2 4

[libvirt] [PATCH 0/4] vz: rework domain creation
by Mikhail Feoktistov 12 Feb '16

12 Feb '16

Patches 1 and 2 make preparation for patch 4 Patch 3 fixes notification subscription To get domain info we should receive and handle notification from hypervisor Patch 4 fixes race condition when adding domain to domains list Race condition: User calls defineXML to create new instance. The main thread from vzDomainDefineXMLFlags() creates new instance by prlsdkCreateVm. Then this thread calls prlsdkAddDomain to add new domain to domains list. The second thread receives notification from hypervisor that new VM was created. It calls prlsdkHandleVmAddedEvent() and also tries to add new domain to domains list. These two threads call virDomainObjListFindByUUID() from prlsdkAddDomain() and don't find new domain. So they add two domains with the same uuid to domains list. Mikhail Feoktistov (4): vz: make output arguments in prlsdkGetDomainIds as optional vz: remove unused struct field vz: fix notification subscription vz: fix race condition when adding domain to domains list src/vz/vz_driver.c | 13 ++- src/vz/vz_sdk.c | 261 ++++++++++++++++++++++------------------------------- src/vz/vz_sdk.h | 7 +- src/vz/vz_utils.c | 44 +++++++++ src/vz/vz_utils.h | 5 +- 5 files changed, 174 insertions(+), 156 deletions(-) -- 1.8.3.1

3 6

[libvirt] [PATCH 0/3] Add capability for text based polkit authentication for virsh
by John Ferlan 12 Feb '16

12 Feb '16

https://bugzilla.redhat.com/show_bug.cgi?id=872166 As an alternative to commit id 'e94979e90' which allows polkit authentication by adding users to the 'libvirt' group, add the ability to start and utilize a text based authentication agent for virsh. At the very least patch 1 will suffice part of the issue listed in the bz - the opaque error message related to "some agent". For patch 2, it was far easier to utilize what polkit provides in pkttyagent and pkcheck utilities, than adding some code which requires POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE being #defined for compilation. I chose 'pkauth' to mean polkit authentication - figured it was a workable shorthand, but if there's better suggestions those can be considered. John Ferlan (3): polkit: Adjust message when action-id isn't found util: Introduce API's for Polkit text authentication virsh: Add support for text based polkit authentication src/libvirt_private.syms | 3 ++ src/util/virpolkit.c | 104 +++++++++++++++++++++++++++++++++++++++++++++-- src/util/virpolkit.h | 7 ++++ tests/virpolkittest.c | 3 +- tools/virsh.c | 22 ++++++++-- tools/virsh.h | 2 + tools/virsh.pod | 10 +++++ tools/vsh.h | 1 + 8 files changed, 144 insertions(+), 8 deletions(-) -- 2.5.0

2 11

[libvirt] [PATCH 0/2] tests: Fix mock libraries linking
by Andrea Bolognani 11 Feb '16

11 Feb '16

This patches make sure mock libraries do not link against either too many or too few libraries. Cheers. Andrea Bolognani (2): tests: Use plain close() in mock code tests: Link mock libraries against gnulib and gnulib only tests/Makefile.am | 21 +++++++++++++++------ tests/virportallocatortest.c | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) -- 2.5.0

2 5

[libvirt] [PATCH 0/4] tests: Fix syntax-check failure, plus extras
by Andrea Bolognani 11 Feb '16

11 Feb '16

Commit a03cbfe0fb introduced a syntax-check failure: patch 1/4 prepares for 2/4, where the failure is actually fixed. Patches 3/4 and 4/4 improve the naming consistency for mock libraries by shuffling files around a bit. Cheers. Andrea Bolognani (4): tests: Split off the mock part of the port allocator test tests: Allow use of close() in mock libraries tests: Don't use "lib" prefix for mock libraries tests: Rename virmockdbus -> virdbusmock for consistency cfg.mk | 2 +- tests/Makefile.am | 26 ++++---- tests/{virmockdbus.c => virdbusmock.c} | 2 +- tests/virfirewalltest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatormock.c | 108 +++++++++++++++++++++++++++++++ tests/virportallocatortest.c | 112 +++------------------------------ tests/virsystemdtest.c | 2 +- 8 files changed, 134 insertions(+), 122 deletions(-) rename tests/{virmockdbus.c => virdbusmock.c} (97%) create mode 100644 tests/virportallocatormock.c -- 2.5.0

2 7