- Devel - libvirt List Archives

[libvirt] [PATCH] network: increase openvswitch call timeout
by Stefan Zimmermann 22 Nov '16

22 Nov '16

Since a successful completion of the calls to openvswitch is expected a long timeout should be chosen to account for heavily loaded systems. Therefore this patch increases the timeout value from 5 to 120 seconds. Signed-off-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/util/virnetdevopenvswitch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 9283bbb..37c2dce 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -87,7 +87,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", + virCommandAddArgList(cmd, "--timeout=120", "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); if (virtVlan && virtVlan->nTags > 0) { @@ -181,7 +181,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch virCommandPtr cmd = NULL; cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", ifname, NULL); + virCommandAddArgList(cmd, "--timeout=120", "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -210,7 +210,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) size_t len; int ret = -1; - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface", + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=120", "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); @@ -253,7 +253,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) return 0; } - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=120", "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 2.8.4

2 1

[libvirt] [PATCH 0/2] qemu: Fix propagation of 'qemu_id' parameter in the vcpus
by Peter Krempa 22 Nov '16

22 Nov '16

The propagation code got misplaced in the code that optimizes the extraction of the halted state of the vcpus. Peter Krempa (2): tests: qemumonitorjson: Rename 'qemu-id' to 'enable-id' in cpu info test qemu: monitor: Properly propagate the 'qemu_id' field through the matcher src/qemu/qemu_monitor.c | 3 ++ .../qemumonitorjson-cpuinfo-ppc64-basic.data | 10 ++++++- .../qemumonitorjson-cpuinfo-ppc64-hotplug-1.data | 20 +++++++++++-- .../qemumonitorjson-cpuinfo-ppc64-hotplug-2.data | 30 ++++++++++++++++++-- .../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 30 ++++++++++++++++++-- .../qemumonitorjson-cpuinfo-ppc64-no-threads.data | 24 ++++++++++------ ...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 15 ++++++---- .../qemumonitorjson-cpuinfo-x86-full.data | 33 ++++++++++++++-------- tests/qemumonitorjsontest.c | 5 +++- 9 files changed, 136 insertions(+), 34 deletions(-) -- 2.10.2

3 4

[libvirt] [PATCH 0/3] qemu: Don't call qemuMonitorGetCPUInfo to update vCPU halted state
by Peter Krempa 22 Nov '16

22 Nov '16

The original implementation reused qemuMonitorGetCPUInfo to update the halted state. The function is very complex and should not be called all the time just to update a trivial parameter. Add infrastructure to properly update the state without the need to match in hotplug parameters. Peter Krempa (3): qemu: monitor: Extract qemu cpu id along with other data qemu: monitor: Extract halted state to a bitmap indexed by cpu id qemu: domain: Refresh vcpu halted state using qemuMonitorGetCpuHalted src/qemu/qemu_domain.c | 20 ++++++++------------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 3 +++ src/qemu/qemu_monitor_text.c | 11 +++++++++++ tests/qemumonitorjsontest.c | 8 ++++---- 7 files changed, 70 insertions(+), 16 deletions(-) -- 2.10.2

3 8

[libvirt] [PATCH] libxl: add tunnelled migration support
by Bob Liu 22 Nov '16

22 Nov '16

Tunnelled migration doesn't require any extra network connections beside the libvirt daemon. It's capable of strong encryption and the default option of openstack-nova. This patch adds the tunnelled migration(Tunnel3params) support to libxl. On the src side, the data flow is: * libxlDoMigrateSend() -> pipe * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. While on the dest side: Stream -> pipe -> 'recvfd of libxlDomainStartRestore' The usage is the same as p2p migration, execpt adding one extra '--tunnelled' to the libvirt p2p migration command. Signed-off-by: Bob Liu <bob.liu(a)oracle.com> --- src/libxl/libxl_driver.c | 58 ++++++++- src/libxl/libxl_migration.c | 281 +++++++++++++++++++++++++++++++++++++++++--- src/libxl/libxl_migration.h | 9 ++ 3 files changed, 331 insertions(+), 17 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b66cb1f..bc2633b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5918,6 +5918,61 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, } static int +libxlDomainMigratePrepareTunnel3Params(virConnectPtr dconn, + virStreamPtr st, + virTypedParameterPtr params, + int nparams, + const char *cookiein, + int cookieinlen, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri_in = NULL; + +#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME + virReportUnsupportedError(); + return -1; +#endif + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + + goto error; + + if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + goto error; + + if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) + goto error; + + if (libxlDomainMigrationPrepareTunnel3(dconn, st, &def, cookiein, + cookieinlen, flags) < 0) + goto error; + + return 0; + + error: + virDomainDefFree(def); + return -1; +} + +static int libxlDomainMigratePrepare3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, @@ -6017,7 +6072,7 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (flags & VIR_MIGRATE_PEER2PEER) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, dconnuri, uri, dname, flags) < 0) goto cleanup; @@ -6501,6 +6556,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */ .domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.6 */ .domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.6 */ + .domainMigratePrepareTunnel3Params = libxlDomainMigratePrepareTunnel3Params, /* 2.5.0 */ .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.6 */ .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 534abb8..f3152dc 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -44,6 +44,7 @@ #include "libxl_migration.h" #include "locking/domain_lock.h" #include "virtypedparam.h" +#include "fdstream.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -484,6 +485,90 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, } int +libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags) +{ + libxlMigrationCookiePtr mig = NULL; + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + libxlMigrationDstArgs *args = NULL; + virThread thread; + int dataFD[2] = { -1, -1 }; + int ret = -1; + + if (libxlMigrationEatCookie(cookiein, cookieinlen, &mig) < 0) + goto error; + + if (mig->xenMigStreamVer > LIBXL_SAVE_VERSION) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Xen migration stream version '%d' is not supported on this host"), + mig->xenMigStreamVer); + goto error; + } + + if (!(vm = virDomainObjListAdd(driver->domains, *def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto error; + + /* + * The data flow of tunnel3 migration in the dest side: + * stream -> pipe -> recvfd of libxlDomainStartRestore + */ + if (pipe(dataFD) < 0) + goto error; + + /* Stream data will be written to pipeIn */ + if (virFDStreamOpen(st, dataFD[1]) < 0) + goto error; + dataFD[1] = -1; /* 'st' owns the FD now & will close it */ + + if (libxlMigrationDstArgsInitialize() < 0) + goto error; + + if (!(args = virObjectNew(libxlMigrationDstArgsClass))) + goto error; + + args->conn = dconn; + args->vm = vm; + args->flags = flags; + args->migcookie = mig; + /* Receive from pipeOut */ + args->recvfd = dataFD[0]; + args->nsocks = 0; + if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to create thread for receiving migration data")); + goto error; + } + + ret = 0; + goto done; + + error: + VIR_FORCE_CLOSE(dataFD[1]); + VIR_FORCE_CLOSE(dataFD[0]); + virObjectUnref(args); + /* Remove virDomainObj from domain list */ + if (vm) { + virDomainObjListRemove(driver->domains, vm); + vm = NULL; + } + + done: + if (vm) + virObjectUnlock(vm); + + return ret; +} + +int libxlDomainMigrationPrepare(virConnectPtr dconn, virDomainDefPtr *def, const char *uri_in, @@ -710,9 +795,154 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, return ret; } -/* This function is a simplification of virDomainMigrateVersion3Full - * excluding tunnel support and restricting it to migration v3 - * with params since it was the first to be introduced in libxl. +typedef struct _libxlTunnelMigrationThread libxlTunnelMigrationThread; +struct _libxlTunnelMigrationThread { + virThread thread; + virStreamPtr st; + int srcFD; +}; +#define TUNNEL_SEND_BUF_SIZE 65536 + +/* + * The data flow of tunnel3 migration in the src side: + * libxlDoMigrateSend() -> pipe + * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. + */ +static void libxlTunnel3MigrationFunc(void *arg) +{ + libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *)arg; + char *buffer = NULL; + struct pollfd fds[1]; + int timeout = -1; + + if (VIR_ALLOC_N(buffer, TUNNEL_SEND_BUF_SIZE) < 0) { + virReportError(errno, "%s", _("poll failed in migration tunnel")); + return; + } + + fds[0].fd = data->srcFD; + for (;;) { + int ret; + + fds[0].events = POLLIN; + fds[0].revents = 0; + ret = poll(fds, ARRAY_CARDINALITY(fds), timeout); + if (ret < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; + virReportError(errno, "%s", + _("poll failed in libxlTunnel3MigrationFunc")); + goto cleanup; + } + + if (ret == 0) { + VIR_DEBUG("poll got timeout"); + break; + } + + if (fds[0].revents & (POLLIN | POLLERR | POLLHUP)) { + int nbytes; + + nbytes = read(data->srcFD, buffer, TUNNEL_SEND_BUF_SIZE); + if (nbytes > 0) { + /* Write to dest stream */ + if (virStreamSend(data->st, buffer, nbytes) < 0) { + virReportError(errno, "%s", + _("tunnelled migration failed to send to virStream")); + virStreamAbort(data->st); + goto cleanup; + } + } else if (nbytes < 0) { + virReportError(errno, "%s", + _("tunnelled migration failed to read from xen side")); + virStreamAbort(data->st); + goto cleanup; + } else { + /* EOF; transferred all data */ + break; + } + } + } + + if (virStreamFinish(data->st) < 0) + virReportError(errno, "%s", + _("tunnelled migration failed to finish stream")); + cleanup: + VIR_FREE(buffer); + + return; +} + +struct libxlTunnelControl { + libxlTunnelMigrationThread tmThread; + int dataFD[2]; +}; + +static int +libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + virStreamPtr st, + struct libxlTunnelControl *tc) +{ + libxlTunnelMigrationThread *tmThreadPtr = NULL; + int ret = -1; + + if (VIR_ALLOC(tc) < 0) + goto out; + + tc->dataFD[0] = -1; + tc->dataFD[1] = -1; + if (pipe(tc->dataFD) < 0) { + virReportError(errno, "%s", _("Unable to make pipes")); + goto out; + } + + tmThreadPtr = &tc->tmThread; + /* Read from pipe */ + tmThreadPtr->srcFD = tc->dataFD[0]; + /* Write to dest stream */ + tmThreadPtr->st = st; + if (virThreadCreate(&tmThreadPtr->thread, true, + libxlTunnel3MigrationFunc, + tmThreadPtr) < 0) { + virReportError(errno, "%s", + _("Unable to create tunnel migration thread")); + goto out; + } + + virObjectUnlock(vm); + /* Send data to pipe */ + ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); + virObjectLock(vm); + + out: + /* libxlMigrationStopTunnel will be called in libxlDoMigrateP2P to free + * all resources for us. */ + return ret; +} + +static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) +{ + libxlTunnelMigrationThread *tmThreadPtr = NULL; + + if (!tc) + return; + + tmThreadPtr = &tc->tmThread; + if (tmThreadPtr) { + virThreadCancel(&tmThreadPtr->thread); + virThreadJoin(&tmThreadPtr->thread); + } + + VIR_FORCE_CLOSE(tc->dataFD[0]); + VIR_FORCE_CLOSE(tc->dataFD[1]); + VIR_FREE(tc); +} + +/* This function is a simplification of virDomainMigrateVersion3Full and + * restricting it to migration v3 with params since it was the first to be + * introduced in libxl. */ static int libxlDoMigrateP2P(libxlDriverPrivatePtr driver, @@ -737,6 +967,9 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, bool cancelled = true; virErrorPtr orig_err = NULL; int ret = -1; + /* For tunnel migration */ + virStreamPtr st = NULL; + struct libxlTunnelControl *tc = NULL; dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin, &cookieout, &cookieoutlen); @@ -764,29 +997,40 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, VIR_DEBUG("Prepare3"); virObjectUnlock(vm); - ret = dconn->driver->domainMigratePrepare3Params - (dconn, params, nparams, cookieout, cookieoutlen, NULL, NULL, &uri_out, destflags); + if (flags & VIR_MIGRATE_TUNNELLED) { + if (!(st = virStreamNew(dconn, 0))) + goto cleanup; + ret = dconn->driver->domainMigratePrepareTunnel3Params + (dconn, st, params, nparams, cookieout, cookieoutlen, NULL, NULL, destflags); + } else { + ret = dconn->driver->domainMigratePrepare3Params + (dconn, params, nparams, cookieout, cookieoutlen, NULL, NULL, &uri_out, destflags); + } virObjectLock(vm); if (ret == -1) goto cleanup; - if (uri_out) { - if (virTypedParamsReplaceString(&params, &nparams, - VIR_MIGRATE_PARAM_URI, uri_out) < 0) { - orig_err = virSaveLastError(); + if (!(flags & VIR_MIGRATE_TUNNELLED)) { + if (uri_out) { + if (virTypedParamsReplaceString(&params, &nparams, + VIR_MIGRATE_PARAM_URI, uri_out) < 0) { + orig_err = virSaveLastError(); + goto finish; + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domainMigratePrepare3 did not set uri")); goto finish; } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("domainMigratePrepare3 did not set uri")); - goto finish; } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); - ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); - + if (flags & VIR_MIGRATE_TUNNELLED) + ret = libxlMigrationStartTunnel(driver, vm, flags, st, tc); + else + ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); if (ret < 0) orig_err = virSaveLastError(); @@ -824,6 +1068,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, vm->def->name); cleanup: + if (flags & VIR_MIGRATE_TUNNELLED) { + libxlMigrationStopTunnel(tc); + virObjectUnref(st); + } + if (ddomain) { virObjectUnref(ddomain); ret = 0; diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 8a074a0..fcea558 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -29,6 +29,7 @@ # define LIBXL_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE | \ VIR_MIGRATE_PEER2PEER | \ + VIR_MIGRATE_TUNNELLED | \ VIR_MIGRATE_PERSIST_DEST | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ VIR_MIGRATE_PAUSED) @@ -53,6 +54,14 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, const char *dname); int +libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags); + +int libxlDomainMigrationPrepare(virConnectPtr dconn, virDomainDefPtr *def, const char *uri_in, -- 2.6.5

2 3

[libvirt] [PATCH] bhyve: cleanup bhyveBuildNetArgStr error handling
by Roman Bogorodskiy 21 Nov '16

21 Nov '16

Use 'goto cleanup'-style error handling instead of explicitly freeing variables in every error path. --- src/bhyve/bhyve_command.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 022b03b..4914d98 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -52,26 +52,25 @@ bhyveBuildNetArgStr(const virDomainDef *def, char macaddr[VIR_MAC_STRING_BUFLEN]; char *realifname = NULL; char *brname = NULL; + int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) - return -1; + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Network type %d is not supported"), virDomainNetGetActualType(net)); - return -1; + goto cleanup; } if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) { - VIR_FREE(brname); - return -1; - } + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) + goto cleanup; } if (!dryRun) { @@ -80,33 +79,24 @@ bhyveBuildNetArgStr(const virDomainDef *def, virDomainNetGetActualVirtPortProfile(net), virDomainNetGetActualVlan(net), VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; + goto cleanup; } realifname = virNetDevTapGetRealDeviceName(net->ifname); - if (realifname == NULL) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; - } + if (realifname == NULL) + goto cleanup; VIR_DEBUG("%s -> %s", net->ifname, realifname); /* hack on top of other hack: we need to set * interface to 'UP' again after re-opening to find its * name */ - if (virNetDevSetOnline(net->ifname, true) != 0) { - VIR_FREE(realifname); - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; - } + if (virNetDevSetOnline(net->ifname, true) != 0) + goto cleanup; } else { if (VIR_STRDUP(realifname, "tap0") < 0) - return -1; + goto cleanup; } @@ -114,9 +104,14 @@ bhyveBuildNetArgStr(const virDomainDef *def, virCommandAddArgFormat(cmd, "%d:0,virtio-net,%s,mac=%s", net->info.addr.pci.slot, realifname, virMacAddrFormat(&net->mac, macaddr)); + + ret = 0; + cleanup: + VIR_FREE(brname); + VIR_FREE(net->ifname); VIR_FREE(realifname); - return 0; + return ret; } static int -- 2.10.1

2 2

[libvirt] Opinions on removing the old, legacy libvirt Xen driver
by Jim Fehlig 21 Nov '16

21 Nov '16

Hi All, I briefly mentioned this at an evening event during the KVM Forum / Xen Dev Summit, but the list is certainly a better place to discuss such a topic. What do folks think about finally removing the old, legacy, xend-based driver from the libvirt sources? The Xen community made xl/libxl the primary toolstack in Xen 4.1. In Xen 4.2, it was made the default toolstack. In Xen 4.5, xm/xend was completely removed from the Xen source tree. According to the Xen release support matrix [0], upstream maintenance of Xen 4.1-4.3 has been dropped for some time, including "long term" security support. Xen 4.4-4.5 no longer receive regular maintenance support, with security support ending in March for 4.4 and January 2018 for 4.5. In short, the fully maintained upstream Xen releases don't even contain xm/xend :-). As for downstreams, I doubt anyone is interested in running the last several libvirt releases on an old Xen installition with xm/xend, let alone libvirt.git master. SUSE, which still supports Xen, has no interest in using a new libvirt on older (but still supported) SLES that uses the xm/xend toolstack. I struggle to find a good reason to keep any of the old cruft under src/xen/. I do think we should keep the xm/sexpr config parsing/formatting code src/xenconfig/ since it is useful for converting old xm and sexpr config to libvirt domXML. Thanks for opinions and comments! Regards, Jim [0] https://wiki.xenproject.org/wiki/Xen_Project_Release_Features

7 7

[libvirt] Resolve listen IP for graphics attached to Open vSwitch network
by Petr Horacek 21 Nov '16

21 Nov '16

Hello, libvirt allows us to attach graphics device to a network, then it resolves IP on its own. However, when OVS network is used and not attached to a fake-bridge, but rather to OVS bridge and given VLAN tag, libvirt is not able to resolve IP (it tries to use IP of bridge, whereas it should check another port). Network definition: <network> <name>net1</name> <forward mode='bridge'/> <bridge name='ovsbr0'/> <virtualport type='openvswitch'/> <vlan> <tag id='20'/> </vlan> </network> Graphics definition: <graphics type='spice'> <listen type='network' network='net1'/> </graphics> Network setup: ovs-vsctl add-br ovsbr0 ovs-vsctl add-port ovsbr0 net1 tag=20 -- set Interface net1 type=internal ip address add 192.168.10.1/24 dev net1 We need graphics to listen on IP 192.168.10.1. In order to do that, libvirt should use first IP found on given bridge's (ovsbr0) ports with given vlan tag (20). When no vlan tag is given, it should also check the bridge itself (as it does now). It should also work with portgroups (as interface does). Note: Interface attached to this type of networks works OK. Do you think it would be possible to implement/fix this scenario? Thanks a lot, Petr

1 1

[libvirt] [PATCH] NEWS: Start using the improved format
by Andrea Bolognani 21 Nov '16

21 Nov '16

This entry is meant to both get the ball rolling on the switch and to provide a blueprint of what NEWS file entries are supposed to look like. --- We need to start somewhere, and what better way than talking about the change itself? ;) docs/news.html.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index deeee4d..fca1e29 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -16,6 +16,15 @@ to gauge progress. </p> + <h3>v2.5.0: <i>unreleased</i></h3> + <ul> + <li>Switch to an improved NEWS file format<br/> + List user-visible changes instead of single commits for a better + high-level overview of differences between libvirt releases + </li> + <li>Various bug fixes and improvements</li> + </ul> + <h3>v2.4.0: Nov 1 2016</h3> <ul> <li>Documentation:<br/> -- 2.7.4

2 2

[libvirt] [PATCH] qemu_monitor_json: Don't check existence of "return" object
by Jiri Denemark 21 Nov '16

21 Nov '16

Whenever qemuMonitorJSONCheckError returns 0, the "return" object is guaranteed to exist. Thus virJSONValueObjectGetObject will never fail to get it. On the other hand, virJSONValueObjectGetArray may fail since the "return" object may not be an array. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 160 ++++++++----------------------------------- 1 file changed, 30 insertions(+), 130 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9e06a4d27..ef8672cad 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1219,11 +1219,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-status reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "running", running) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1443,12 +1439,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", &val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1609,12 +1600,7 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - /* Success */ - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info balloon reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetNumberUlong(data, "actual", &mem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1715,11 +1701,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-get reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(statsdata = virJSONValueObjectGet(data, "stats"))) { VIR_DEBUG("data does not include 'stats'"); @@ -2679,11 +2661,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, int rc; double mbps; - if (!(ret = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info migration reply was missing return data")); - return -1; - } + ret = virJSONValueObjectGetObject(reply, "return"); if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2976,11 +2954,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing dump guest memory capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetObject(reply, "return"); if (!(formats = virJSONValueObjectGetArray(caps, "formats"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3160,11 +3134,6 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); - if (!data) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing return information")); - goto error; - } if (virJSONValueObjectGetNumberInt(data, "fd", &ret) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("incomplete return information")); @@ -4745,11 +4714,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-version reply was missing 'return' data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(qemu = virJSONValueObjectGetObject(data, "qemu"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4815,13 +4780,8 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-machines reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-machines reply data was not an array")); goto cleanup; @@ -4925,13 +4885,8 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-definitions reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-cpu-definitions reply data was not an array")); goto cleanup; @@ -4998,13 +4953,8 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-commands reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-commands reply data was not an array")); goto cleanup; @@ -5068,13 +5018,8 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-events reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-events reply data was not an array")); goto cleanup; @@ -5258,11 +5203,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", enabled) < 0 || virJSONValueObjectGetBoolean(data, "present", present) < 0) { @@ -5302,13 +5243,8 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list-types reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list-types reply data was not an array")); goto cleanup; @@ -5369,13 +5305,8 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list reply data was not an array")); goto cleanup; @@ -5613,13 +5544,8 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device-list-properties reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("device-list-properties reply data was not an array")); goto cleanup; @@ -5673,11 +5599,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-target reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(arch = virJSONValueObjectGetString(data, "arch"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6110,14 +6032,8 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply was missing return data"), - qmpCmd); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s reply data was not an array"), qmpCmd); @@ -6329,15 +6245,9 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, goto cleanup; if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { - virJSONValuePtr data; + virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); const char *path; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("chardev-add reply was missing return data")); - goto cleanup; - } - if (!(path = virJSONValueObjectGetString(data, "pty"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("chardev-add reply was missing pty path")); @@ -6686,13 +6596,8 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-iothreads reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-iothreads reply data was not an array")); goto cleanup; @@ -6780,13 +6685,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-memory-devices reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-memory-devices reply data was not an array")); goto cleanup; -- 2.11.0.rc2

2 1

[libvirt] [PATCH 0/5] qemu: parse: Fix parsing of weird cpu topology specifications
by Peter Krempa 21 Nov '16

21 Nov '16

Peter Krempa (5): qemu: parse: Validate that the VM has at least one cpu qemu: parse: Allow the 'cpus=' prefix for current cpu number qemu: parse: Assign topology info earlier qemu: parse: Assign maximum cpu count from topology if not provided qemu: process: Set current vcpu count to maximum if it was not specified src/qemu/qemu_parse_command.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) -- 2.10.2

3 7

[libvirt] [PATCH] docs: Use Overpass Mono as the monospace font
by Martin Kletzander 21 Nov '16

21 Nov '16

Because this makes the font the same size as the non-monospaced one, let's change those properties a little bit as well. <pre/> will be shrunk a bit and <code/> inside <p/> or <dd/> will have slightly greyer background. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Now it looks like this: http://people.redhat.com/~mkletzan/libvirt-monofont.png docs/generic.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/generic.css b/docs/generic.css index 02383017a91b..a6b2354df07b 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -71,3 +71,15 @@ h6 { margin-top: 0.75em; font-size: 0.8em; } + +code, pre { + font-family: LibvirtOverpassMono; +} + +dd code, p code { + background-color: #eeeeee; +} + +pre { + font-size: 90%; +} -- 2.10.2

2 1

[libvirt] [PATCH 0/4] docs: User Overpass 3.0 as a font
by Martin Kletzander 21 Nov '16

21 Nov '16

I heard Overpass 3.0 was released, so let's update to that. There are some changes that I noticed. There are more font weights than we had before. The one we decided to use is now probably the 'semibold' one. So the regular font is a little thinner, but not as much as the 'light' one. I think this time it is the perfect middle ground between the discussed variants in the previous thread. Also it makes the mono font the same size as the other font. I kinda like that, but if others don't, we can add font-size: 12px; to the style. Here is side-by-side comparison on my screen: http://people.redhat.com/~mkletzan/libvirt-newfonts.png Martin Kletzander (4): docs: Clean-up font definitions docs: Upgrade Overpass fonts to 3.0 docs: Add monospaced Overpass fonts docs: Use Overpass Mono as the monospace font docs/fonts/hinted-Overpass-Bold.woff | Bin 48136 -> 0 bytes docs/fonts/hinted-Overpass-BoldItalic.woff | Bin 51008 -> 0 bytes docs/fonts/hinted-Overpass-Italic.woff | Bin 51908 -> 0 bytes docs/fonts/hinted-Overpass-Light.woff | Bin 49452 -> 0 bytes docs/fonts/hinted-Overpass-LightItalic.woff | Bin 51752 -> 0 bytes docs/fonts/hinted-Overpass-Reg.woff | Bin 48144 -> 0 bytes docs/fonts/overpass-bold-italic.woff | Bin 0 -> 46524 bytes docs/fonts/overpass-bold.woff | Bin 0 -> 43612 bytes docs/fonts/overpass-italic.woff | Bin 0 -> 46744 bytes docs/fonts/overpass-light-italic.woff | Bin 0 -> 45844 bytes docs/fonts/overpass-light.woff | Bin 0 -> 43576 bytes docs/fonts/overpass-regular.woff | Bin 0 -> 44272 bytes docs/fonts/stylesheet.css | 49 ++++++++++++++++------------ docs/generic.css | 4 +++ 14 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 docs/fonts/hinted-Overpass-Bold.woff delete mode 100644 docs/fonts/hinted-Overpass-BoldItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Italic.woff delete mode 100644 docs/fonts/hinted-Overpass-Light.woff delete mode 100644 docs/fonts/hinted-Overpass-LightItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Reg.woff create mode 100644 docs/fonts/overpass-bold-italic.woff create mode 100644 docs/fonts/overpass-bold.woff create mode 100644 docs/fonts/overpass-italic.woff create mode 100644 docs/fonts/overpass-light-italic.woff create mode 100644 docs/fonts/overpass-light.woff create mode 100644 docs/fonts/overpass-regular.woff -- 2.10.2

3 11

[libvirt] [PATCH] tests: Adapt to gluster_debug_level in qemu.conf
by Michal Privoznik 21 Nov '16

21 Nov '16

After a944bd92 we gained support for setting gluster debug level. However, due to stupid space we haven't tested whether augeas file actually works. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu.conf | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 070d37b..2b2bd60 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -664,4 +664,4 @@ # # Defaults to 4 # -# gluster_debug_level = 9 +#gluster_debug_level = 9 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 805fa0e..f586e95 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -90,3 +90,4 @@ module Test_libvirtd_qemu = { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" } } { "stdio_handler" = "logd" } +{ "gluster_debug_level" = "9" } -- 2.8.4

2 1

[libvirt] [PATCH] util: Print pid_t as long long
by Martin Kletzander 20 Nov '16

20 Nov '16

After commit f2bf5fbb0449, MinGW strikes again. Simply print pid as any other place after commit b7d2d4af2bd5. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed under the 'build breaker' rule. src/util/virprocess.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f2993493d2c2..3cacc8978935 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1228,7 +1228,8 @@ virProcessSetScheduler(pid_t pid, struct sched_param param = {0}; int pol = virProcessSchedTranslatePolicy(policy); - VIR_DEBUG("pid=%d, policy=%d, priority=%u", pid, policy, priority); + VIR_DEBUG("pid=%lld, policy=%d, priority=%u", + (long long) pid, policy, priority); if (!policy) return 0; @@ -1270,8 +1271,8 @@ virProcessSetScheduler(pid_t pid, if (sched_setscheduler(pid, pol, &param) < 0) { virReportSystemError(errno, - _("Cannot set scheduler parameters for pid %d"), - pid); + _("Cannot set scheduler parameters for pid %lld"), + (long long) pid); return -1; } -- 2.10.2

1 0

[libvirt] [PATCH] configure: Prefer /usr/bin over /bin for numad
by Guido Günther 19 Nov '16

19 Nov '16

On Debian systems numad gets installed to /usr/bin. However some people use usrmerge[0] which links /bin to /usr/bin. By changing the lookup order we make sure the daemon is always found in /usr/bin (with or without usrmerge installed). This allows packages built on systems with usrmerge to run on systems without usrmerge which would otherwise fail since /bin/numad would be hardcoded into libvirt. Originally-Submitted-By: Guilhem Moulin References: http://bugs.debian.org/843878 [0]: https://packages.debian.org/sid/usrmerge --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3ff4c42..65bcd4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1392,7 +1392,7 @@ AC_ARG_WITH([numad], if test "$with_numad" != "no" ; then fail=0 - AC_PATH_PROG([NUMAD], [numad], [], [/bin:/usr/bin:/usr/sbin]) + AC_PATH_PROG([NUMAD], [numad], [], [/usr/bin:/bin:/usr/sbin]) if test "$with_numad" = "check"; then test "$with_numactl" = "yes" || fail=1 -- 2.10.2

3 7

[libvirt] [PATCH RESEND v3.2 00/10] Implementation of QEMU vhost-scsi
by Eric Farman 18 Nov '16

18 Nov '16

[NOTE: Resending after a week, and rebased to apply to master after last week's application of commit 22d94ca4] This patch series provides a libvirt implementation of the vhost-scsi interface in QEMU. As near as I can see, this was discussed upstream in July 2014[1], and ended in a desire to replace a vhost-scsi controller in favor of a hostdev element instead[2]. Host setup via targetcli (SCSI LUN(s) are already defined to host): # targetcli targetcli shell version 2.1.fb35 Copyright 2011-2013 by Datera, Inc and others. For help on commands, type 'help'. /> backstores/block create name=disk1 write_back=false \ dev=/dev/disk/by-id/dm-name-36005076306ffc7630000000000002211 Created block storage object disk1 using /dev/disk/by-id/dm-name-36005076306ffc7630000000000002211. /> vhost/ create Created target naa.5001405df3e54061. Created TPG 1. /> vhost/naa.5001405df3e54061/tpg1/luns create /backstores/block/disk1 Created LUN 0. /> exit Host Filesystem Example: # ls /sys/kernel/config/target/vhost/ discovery_auth naa.5001405df3e54061 version # ls /sys/kernel/config/target/vhost/naa.5001405df3e54061/tpgt_1/lun/ lun_0 QEMU Example (snippet): -device vhost-scsi-ccw,wwpn=naa.5001405df3e54061,devno=fe.0.1000 Libvirt Example (snippet): <hostdev mode='subsystem' type='scsi_host'> <source protocol='vhost' wwpn='naa.5001405df3e54061'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1000'/> </hostdev> Guest Viewpoint: # lsscsi [1:0:1:0] disk LIO-ORG disk0 4.0 /dev/sda # dmesg | grep 1: [ 6.065735] scsi host1: Virtio SCSI HBA [ 6.093892] scsi 1:0:1:0: Direct-Access LIO-ORG disk0 4.0 PQ: 0 ANSI: 5 [ 6.313615] sd 1:0:1:0: Attached scsi generic sg0 type 0 [ 6.314981] sd 1:0:1:0: [sda] 29360128 512-byte logical blocks: (15.0 GB/14.0 GiB) [ 6.317290] sd 1:0:1:0: [sda] Write Protect is off [ 6.317566] sd 1:0:1:0: [sda] Mode Sense: 43 00 10 08 [ 6.317853] sd 1:0:1:0: [sda] Write cache: enabled, read cache: enabled, supports DPO and FUA [ 6.352722] sd 1:0:1:0: [sda] Attached SCSI disk Changelog: v3.2: - Rebase - Rebased to current master (8 November) - Minor changes to (new file) src/util/virhost.c for make syntax-check v3.1: https://www.redhat.com/archives/libvir-list/2016-October/msg01324.html - Rebase - Rebased to current master (31 October) - Included the prereq patch for the subsystem type in switch statements (oops!) v3: https://www.redhat.com/archives/libvir-list/2016-October/msg01201.html - Rebase - Rebased to current master (26 October) - Comments - Added an early patch to do some additional typecasting in the switch statements of hostdev.subsys.type - Did some reordering of patches, to hopefully flow better - Implemented an activeHostHostdevs list, which is used by the cgroup and security codepaths - doc changes -- s/2.2/2.5/ and s/HBI/HBA/ - Added a "none" protocol type for scsi_host hostdevs (which is invalid) - Restored the apparmor and selinux codepaths that got lost from v1 - Added a proper check for a valid scsi_host protocol, and saving that value within the HostdevDef struct - Fixed a compiler warning with call to virDomainPCIAddressEnsureAddr - Removed the rest of vhostfdSize, since multiple fd's are not allowed by QEMU - Fixed cleanup of vhostfd in error from building -device string - Moved the "conf" chunk from "hotplug" patch to "introduce" patch - Added xml2xml test - Added a proper calculation of "address" in virDomainAuditHostdev - Added a virFileExists check before open(/dev/vhost-scsi) - Addressed a number of lines >80 characters - Things *NOT* done (later?) - Investigation/tie-in with virsh nodedev-list stuff - Implementation of 'num_queues', 'max_sectors', and 'cmd_per_lun' (Need to research these in the virtio space, before figuring out how to apply to vhost-scsi) - Dropping the "naa." prefix of wwn - Split the "tests" patch into earlier patches - Other v2.1: https://www.redhat.com/archives/libvir-list/2016-September/msg00148.html v2: https://www.redhat.com/archives/libvir-list/2016-August/msg01028.html v1: https://www.redhat.com/archives/libvir-list/2016-July/msg01004.html [1] http://www.redhat.com/archives/libvir-list/2014-July/msg01235.html [2] http://www.redhat.com/archives/libvir-list/2014-July/msg01390.html Eric Farman (10): Cleanup switch statements on the hostdev subsystem type qemu: Introduce vhost-scsi capability Introduce a "scsi_host" hostdev type util: Management routines for scsi_host devices qemu: Add vhost-scsi string for -device parameter qemu: Allow hotplug of vhost-scsi device conf: Wire up the vhost-scsi connection from/to XML security: Include vhost-scsi in security labels tests: Introduce basic vhost-scsi test docs: Add vhost-scsi docs/formatdomain.html.in | 24 ++ docs/schemas/domaincommon.rng | 23 ++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 7 + src/conf/domain_conf.c | 102 ++++++- src/conf/domain_conf.h | 18 ++ src/libvirt_private.syms | 19 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 50 +++- src/qemu/qemu_command.c | 79 ++++++ src/qemu/qemu_command.h | 5 + src/qemu/qemu_domain_address.c | 10 + src/qemu/qemu_hostdev.c | 41 +++ src/qemu/qemu_hostdev.h | 8 + src/qemu/qemu_hotplug.c | 160 +++++++++++ src/security/security_apparmor.c | 24 +- src/security/security_dac.c | 46 ++++ src/security/security_selinux.c | 51 +++- src/util/virhost.c | 299 +++++++++++++++++++++ src/util/virhost.h | 72 +++++ src/util/virhostdev.c | 155 +++++++++++ src/util/virhostdev.h | 16 ++ tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemuxml2argv-hostdev-scsi-vhost-scsi.args | 24 ++ .../qemuxml2argv-hostdev-scsi-vhost-scsi.xml | 41 +++ tests/qemuxml2argvmock.c | 9 + tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-hostdev-scsi-vhost-scsi.xml | 1 + tests/qemuxml2xmltest.c | 3 + 42 files changed, 1293 insertions(+), 14 deletions(-) create mode 100644 src/util/virhost.c create mode 100644 src/util/virhost.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi.xml -- 1.9.1

2 35

[libvirt] [PATCH v2 0/3] Gathering network interface statistics with openvswitch
by Mehdi Abaakouk 18 Nov '16

18 Nov '16

Hi, The new code have been moved to virnetdevopenvswitch.c I have also sent the refactoring of virstat.c Regards, Mehdi Abaakouk (3): Gathering vhostuser interface stats with ovs virstat: fix signature of virstat helper Move virstat.c code to virnetdevtap.c src/Makefile.am | 1 - src/libvirt_private.syms | 5 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 3 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_driver.c | 31 +++++-- src/uml/uml_driver.c | 1 - src/util/virnetdevopenvswitch.c | 106 ++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 4 + src/util/virnetdevtap.c | 143 ++++++++++++++++++++++++++++++++ src/util/virnetdevtap.h | 3 + src/util/virstats.c | 178 ---------------------------------------- src/util/virstats.h | 31 ------- src/xen/xen_hypervisor.c | 4 +- 14 files changed, 288 insertions(+), 230 deletions(-) delete mode 100644 src/util/virstats.c delete mode 100644 src/util/virstats.h -- 2.10.2

1 3

[libvirt] [PATCH 00/14] Another round of CPU driver changes
by Jiri Denemark 18 Nov '16

18 Nov '16

This is another step in revisiting all APIs provided by the cpu driver and making them a bit more sane. As with the previous round(s), the updated APIs will gain virCPU prefix so that they can be easily distinguished from the ones that still need some work. Jiri Denemark (14): cpu: Rename cpuGetModels cpu: Rename and document cpuModelIsAllowed cpu: Rename cpuDataParse cpu: Rename cpuDataFormat cputest: Don't use preferred model for minimum match CPUs cputest: Don't use unsupported preferred model cputest: Don't use preferred model with forbidden fallback cputest: Don't use superfluous preferred model cputest: Don't use preferred CPU model at all cpu: Make models array in virCPUTranslate constant cputest: Don't test cpuGuestData cpu: Introduce virCPUConvertLegacy API cpu: Avoid adding <vendor> to custom CPUs cpu: Drop cpuGuestData src/conf/cpu_conf.c | 28 ++++- src/conf/cpu_conf.h | 3 +- src/cpu/cpu.c | 115 +++++++++++---------- src/cpu/cpu.h | 50 ++++----- src/cpu/cpu_arm.c | 12 +-- src/cpu/cpu_ppc64.c | 45 +++----- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 36 ++----- src/libvirt_private.syms | 8 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/test/test_driver.c | 2 +- tests/cputest.c | 104 ++++++++----------- .../ppc64-host+guest,ppc_models-result.xml | 2 - .../ppc64-host+guest-legacy,ppc_models-result.xml | 2 - .../cputestdata/x86-host+guest,model486-result.xml | 16 ++- .../x86-host+guest,models,Penryn-result.xml | 13 --- .../x86-host+guest,models,qemu64-result.xml | 13 --- tests/cputestdata/x86-host+guest,models-result.xml | 16 +-- tests/cputestdata/x86-host+guest-result.xml | 18 ++-- ... => x86-host+host+host-model,models-result.xml} | 3 +- tests/cputestdata/x86-host+min.xml | 1 - tests/cputestdata/x86-host+penryn-force-result.xml | 5 +- tests/cputestdata/x86-host+pentium3.xml | 1 - .../x86-host+strict-force-extra-result.xml | 31 +++--- ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 4 +- ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 2 +- ...86-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 2 +- .../x86-host-better+pentium3,core2duo-result.xml | 21 ---- .../x86-host-better+pentium3,pentium3-result.xml | 30 ------ .../x86-host-better+pentium3-result.xml | 27 +++-- tests/cputestdata/x86-host-worse+guest-result.xml | 18 +++- tests/qemumonitorjsontest.c | 2 +- 34 files changed, 273 insertions(+), 368 deletions(-) delete mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml delete mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml rename tests/cputestdata/{x86-host+host+host-model,models,Penryn-result.xml => x86-host+host+host-model,models-result.xml} (89%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX-result.xml} (64%) delete mode 100644 tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml delete mode 100644 tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml -- 2.10.2

3 17

[libvirt] [PATCH v2 00/19] Redo website layout and branding
by Daniel P. Berrange 18 Nov '16

18 Nov '16

The current libvirt website design dates from 2008 and has not changed significantly since. Compared to contemporary open source project websites it looks pretty dated and cluttered. This series incrementally changes the website to have a completely new layout and branding. Since the original adobe illustrator files are long since lost, this series introduces a newly created variant of the libvirt logo with Inkscape as an SVG file. The libvirt logo used a specific font with angled tops to letters like "l", "b" and "t" - this is the "Overpass" font, made available by Red Hat under an open source font license. The re-branding makes use of webfont support so that we can use this font across the entire libvirt website for a consistent look. The colors of the website CSS now exactly match the colors used in the logo in most places. The bigger change is in the layout, with the huge left hand sitemap nav bar being removed to give more space to the main content. The front page now directly links to the key pages that were shown to be highly visited in the apache web logs. Most of the rest of the links are now available from the "docs.html" page linked from "Learn" in the top nav bar. Another key change is that the download page now covers all language bindings, test suites, docs released by the project, not merely the core C library. Finally a new page "contribute.html" is added as the source of information useful to people wishing to get involved in the libvirt project. View the new site here v2: https://berrange.fedorapeople.org/libvirt-new-website-v2/ v1: https://berrange.fedorapeople.org/libvirt-new-website/ Changed in v2: - Fix use of monospace font for code/pre blocks - Set max page width to 60em, to avoid body content getting really long lines on wide monitors - Extend footer links to include email and irc links on all pages - Use the normal weight Overpass font for body content - Re-create logos to avoid anti-aliasing by inkscape for cripser look - Add some content to the XML format page - Misc typos - Fix hiding of 'home' text in top banner logo - Provide improved SVG files for logo and PNG rendered versions in standard sizes - Replace 'made with libvirt' logo with a new 'libvirt powered' logo on apps.html page Daniel P. Berrange (19): docs: use overpass font for website docs: add master SVG for libvirt logo docs: switch to new website banner docs: redo style of front page docs: provide new style logos for the apps page docs: add footer to all pages docs: simplify style for headers docs: add page describing contribution to libvirt docs: add three core links in the header bar docs: remove todo page docs: remove related links page Revert "syntax-check: Enforce <code> inside <dt> elements" docs: rewrite content on front page to be more useful docs: expand downloads page to cover all modules docs: add some improved styling to contact page docs: fill out docs page with useful links docs: remove navigation sidebar from pages docs: remove outdated or duplicated content docs: add some content to the XML format main page cfg.mk | 20 +- docs/404.html.in | 5 - docs/Makefile.am | 76 ++- docs/apps.html.in | 7 +- docs/archdomain.html.in | 7 - docs/archnetwork.html.in | 54 -- docs/archnode.html.in | 7 - docs/archstorage.html.in | 32 -- docs/contact.html.in | 4 +- docs/contribute.html.in | 140 ++++++ docs/deployment.html.in | 50 -- docs/docs.html.in | 163 ++++++- docs/downloads.html.in | 435 ++++++++++++++--- docs/fonts/LICENSE.md | 90 ++++ docs/fonts/hinted-Overpass-Bold.woff | Bin 0 -> 48136 bytes docs/fonts/hinted-Overpass-BoldItalic.woff | Bin 0 -> 51008 bytes docs/fonts/hinted-Overpass-Italic.woff | Bin 0 -> 51908 bytes docs/fonts/hinted-Overpass-Light.woff | Bin 0 -> 49452 bytes docs/fonts/hinted-Overpass-LightItalic.woff | Bin 0 -> 51752 bytes docs/fonts/hinted-Overpass-Reg.woff | Bin 0 -> 48144 bytes docs/fonts/stylesheet.css | 55 +++ docs/format.html.in | 36 +- docs/formatsnapshot.html.in | 6 +- docs/generic.css | 4 +- docs/hvsupport.pl | 3 - docs/index.html.in | 163 +++---- docs/intro.html.in | 13 - docs/js/jquery-3.1.1.min.js | 4 + docs/js/jquery.rss.min.js | 11 + docs/js/moment.min.js | 7 + docs/libvirt-header-bg.png | Bin 1136 -> 0 bytes docs/libvirt-header-logo.png | Bin 25945 -> 0 bytes docs/libvirt-net-logical.fig | 159 ------ docs/libvirt-net-logical.png | Bin 11243 -> 0 bytes docs/libvirt-net-physical.fig | 139 ------ docs/libvirt-net-physical.png | Bin 11336 -> 0 bytes docs/libvirt.css | 328 ++++++++----- docs/libvirtLogo.png | Bin 33698 -> 0 bytes docs/libvirtLogo404.png | Bin 32442 -> 0 bytes docs/logos/README | 86 ++++ docs/logos/logo-banner-dark-256.png | Bin 0 -> 16093 bytes docs/logos/logo-banner-dark-800.png | Bin 0 -> 64715 bytes docs/logos/logo-banner-dark.svg | 655 +++++++++++++++++++++++++ docs/logos/logo-banner-light-256.png | Bin 0 -> 16106 bytes docs/logos/logo-banner-light-800.png | Bin 0 -> 64942 bytes docs/logos/logo-banner-light.svg | 651 ++++++++++++++++++++++++ docs/logos/logo-base.svg | 698 ++++++++++++++++++++++++++ docs/logos/logo-square-128.png | Bin 0 -> 20074 bytes docs/logos/logo-square-192.png | Bin 0 -> 38361 bytes docs/logos/logo-square-256.png | Bin 0 -> 52107 bytes docs/logos/logo-square-96.png | Bin 0 -> 13749 bytes docs/logos/logo-square-powered-128.png | Bin 0 -> 21521 bytes docs/logos/logo-square-powered-192.png | Bin 0 -> 41246 bytes docs/logos/logo-square-powered-256.png | Bin 0 -> 55839 bytes docs/logos/logo-square-powered-96.png | Bin 0 -> 14683 bytes docs/logos/logo-square-powered.svg | 732 +++++++++++++++++++++++++++ docs/logos/logo-square.svg | 733 ++++++++++++++++++++++++++++ docs/madeWith.png | Bin 4545 -> 0 bytes docs/main.css | 1 + docs/page.xsl | 111 ++--- docs/pending.html.in | 10 - docs/relatedlinks.html.in | 88 ---- docs/remote.html.in | 2 +- docs/search.php.in | 2 - docs/sitemap.html.in | 490 ------------------- docs/todo.cfg-example | 26 - docs/todo.pl | 125 ----- 67 files changed, 4788 insertions(+), 1640 deletions(-) delete mode 100644 docs/archdomain.html.in delete mode 100644 docs/archnetwork.html.in delete mode 100644 docs/archnode.html.in delete mode 100644 docs/archstorage.html.in create mode 100644 docs/contribute.html.in delete mode 100644 docs/deployment.html.in create mode 100644 docs/fonts/LICENSE.md create mode 100644 docs/fonts/hinted-Overpass-Bold.woff create mode 100644 docs/fonts/hinted-Overpass-BoldItalic.woff create mode 100644 docs/fonts/hinted-Overpass-Italic.woff create mode 100644 docs/fonts/hinted-Overpass-Light.woff create mode 100644 docs/fonts/hinted-Overpass-LightItalic.woff create mode 100644 docs/fonts/hinted-Overpass-Reg.woff create mode 100644 docs/fonts/stylesheet.css delete mode 100644 docs/intro.html.in create mode 100644 docs/js/jquery-3.1.1.min.js create mode 100644 docs/js/jquery.rss.min.js create mode 100644 docs/js/moment.min.js delete mode 100644 docs/libvirt-header-bg.png delete mode 100644 docs/libvirt-header-logo.png delete mode 100644 docs/libvirt-net-logical.fig delete mode 100644 docs/libvirt-net-logical.png delete mode 100644 docs/libvirt-net-physical.fig delete mode 100644 docs/libvirt-net-physical.png delete mode 100644 docs/libvirtLogo.png delete mode 100644 docs/libvirtLogo404.png create mode 100644 docs/logos/README create mode 100644 docs/logos/logo-banner-dark-256.png create mode 100644 docs/logos/logo-banner-dark-800.png create mode 100644 docs/logos/logo-banner-dark.svg create mode 100644 docs/logos/logo-banner-light-256.png create mode 100644 docs/logos/logo-banner-light-800.png create mode 100644 docs/logos/logo-banner-light.svg create mode 100644 docs/logos/logo-base.svg create mode 100644 docs/logos/logo-square-128.png create mode 100644 docs/logos/logo-square-192.png create mode 100644 docs/logos/logo-square-256.png create mode 100644 docs/logos/logo-square-96.png create mode 100644 docs/logos/logo-square-powered-128.png create mode 100644 docs/logos/logo-square-powered-192.png create mode 100644 docs/logos/logo-square-powered-256.png create mode 100644 docs/logos/logo-square-powered-96.png create mode 100644 docs/logos/logo-square-powered.svg create mode 100644 docs/logos/logo-square.svg delete mode 100644 docs/madeWith.png delete mode 100644 docs/pending.html.in delete mode 100644 docs/relatedlinks.html.in delete mode 100644 docs/sitemap.html.in delete mode 100644 docs/todo.cfg-example delete mode 100755 docs/todo.pl -- 2.9.3

6 41

[libvirt] [PATCH] qemu: Redefine the "unlimited" memory limits one more time
by Viktor Mihajlovski 18 Nov '16

18 Nov '16

With kernel 3.18 (since commit 3e32cb2e0a12b6915056ff04601cf1bb9b44f967) the "unlimited" value for cgroup memory limits has changed once again as its byte value is now computed from a page counter. The new "unlimited" value reported by the cgroup fs is therefore 2**51-1 pages which is (VIR_DOMAIN_MEMORY_PARAM_UNLIMITED - 3072). This results e.g. in virsh memtune displaying 9007199254740988 instead of unlimited for the limits. This patch deals with the rounding issue by scaling the byte values reported by the kernel and the PARAM_UNLIMITED value to page size and comparing those. See also libvirt commit 231656bbeb9e4d3bedc44362784c35eee21cf0f4 for the history for kernel 3.12 and before. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/vircgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 24917e7..df92ec6 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2542,7 +2542,7 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) goto cleanup; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >> 4 >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED >> 4) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret = 0; @@ -2604,7 +2604,7 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) goto cleanup; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >> 4 >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED >> 4) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret = 0; @@ -2666,7 +2666,7 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) goto cleanup; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >> 4 >= VIR_DOMAIN_MEMORY_PARAM_UNLIMITED >> 4) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; ret = 0; -- 1.9.1

1 0

[libvirt] [PATCH 0/4] qemu: Assign static slot numbers for memory devices and fix alias generator
by Peter Krempa 18 Nov '16

18 Nov '16

See patch 4 for explanation of the bug. Peter Krempa (4): conf: Allow specifying only the slot number for hotpluggable memory qemu: process: detect if dimm aliases are broken on reconnect qemu: Assign slots to memory devices prior to usage qemu: Generate memory device aliases according to slot number src/conf/domain_conf.c | 18 +++-- src/qemu/qemu_alias.c | 27 +++++-- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_domain_address.c | 91 ++++++++++++++++++++++ src/qemu/qemu_domain_address.h | 4 + src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 25 ++++++ .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 2 + .../qemuxml2argv-memory-hotplug-dimm-addr.xml | 11 ++- .../qemuxml2argv-memory-hotplug-dimm.args | 4 +- .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 4 +- tests/qemuxml2argvtest.c | 2 +- .../qemuxml2xmlout-memory-hotplug-dimm.xml | 2 + 16 files changed, 184 insertions(+), 24 deletions(-) -- 2.10.2

3 14

[libvirt] [PATCH v2 00/15] qemu: Add QMP introspection and gluster debug support
by Peter Krempa 18 Nov '16

18 Nov '16

Now that the release is out, I fixed the few things pointed out. Andrea Bolognani (5): tests: qemucaps: Update ppc64 replies for qemu 2.6.0 release tests: qemucaps: Update aarch64 gicv2 replies for qemu 2.6.0 release tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on ppc64le tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv2 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv3 Pavel Hrdina (3): tests: qemucaps: Add QMP introspection data for qemu 2.5.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.7.0 on x86 Peter Krempa (4): util: json: add helper to iterate and steal members of json array qemu: monitor: Add code to retrieve and store QMP schema data tests: qemucaps: Temporarily remove 'query-qmp-schema' from test data qemu: capabilities: Add support for QMP schema introspection Prasanna Kumar Kalever (3): qemu: capabilities: Detect support for gluster debug setting qemu: conf: add option for tuning debug logging level qemu: command: Add debug option for gluster volumes src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 20 + src/qemu/qemu_capabilities.c | 193 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 19 +- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 3 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 67 + src/qemu/qemu_monitor_json.h | 3 + src/util/virjson.c | 54 + src/util/virjson.h | 6 + .../qemuargv2xml-disk-drive-network-gluster.args | 7 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 7545 ++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.replies | 8036 ++++++++++++++++++- .../caps_2.6.0-gicv2.aarch64.xml | 3 +- .../caps_2.6.0-gicv3.aarch64.replies | 8007 ++++++++++++++++++- .../caps_2.6.0-gicv3.aarch64.xml | 1 + .../caps_2.6.0.ppc64le.replies | 8026 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 5 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 8005 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 8356 ++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + .../qemuxml2argv-disk-drive-network-gluster.args | 12 +- tests/qemuxml2argvtest.c | 3 +- 31 files changed, 48356 insertions(+), 48 deletions(-) -- 2.10.2

3 19

[libvirt] [PATCH v4 0/6] Newer ivshmem models
by Martin Kletzander 18 Nov '16

18 Nov '16

v4: - Incorporated John's review v3: - https://www.redhat.com/archives/libvir-list/2016-September/msg01232.html Martin Kletzander (6): conf, qemu: Add support for shmem model conf, qemu: Add newer shmem models qemu: Add capabilities for ivshmem-{plain,doorbell} qemu: Save various defaults for shmem qemu: Support newer ivshmem device variants qemu: Add support for hot/cold-(un)plug of shmem devices docs/formatdomain.html.in | 12 + docs/schemas/domaincommon.rng | 11 + src/conf/domain_conf.c | 46 +++- src/conf/domain_conf.h | 10 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 111 ++++++++- src/qemu/qemu_command.h | 10 + src/qemu/qemu_domain.c | 54 +++++ src/qemu/qemu_driver.c | 39 +++- src/qemu/qemu_hotplug.c | 248 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + .../caps_2.6.0-gicv2.aarch64.xml | 2 + .../caps_2.6.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 21 ++ .../qemuhotplug-ivshmem-doorbell-detach.xml | 7 + .../qemuhotplug-ivshmem-doorbell.xml | 4 + .../qemuhotplug-ivshmem-plain-detach.xml | 6 + .../qemuhotplug-ivshmem-plain.xml | 3 + ...muhotplug-base-live+ivshmem-doorbell-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-doorbell.xml | 65 ++++++ .../qemuhotplug-base-live+ivshmem-plain-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 58 +++++ .../qemuxml2argv-shmem-plain-doorbell.args | 43 ++++ ...m.xml => qemuxml2argv-shmem-plain-doorbell.xml} | 16 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + tests/qemuxml2argvtest.c | 3 + ...xml => qemuxml2xmlout-shmem-plain-doorbell.xml} | 18 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 9 + tests/qemuxml2xmltest.c | 1 + 35 files changed, 798 insertions(+), 30 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args copy tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => qemuxml2argv-shmem-plain-doorbell.xml} (80%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem.xml => qemuxml2xmlout-shmem-plain-doorbell.xml} (82%) -- 2.10.1

3 15

[libvirt] [PATCH] Fix scheduler support check
by Martin Kletzander 18 Nov '16

18 Nov '16

Commit 94cc577807ba tried fixing build on systems that did not have SCHED_BATCH or SCHED_IDLE defined. But instead of changing it to conditional support, it rather completely disabled the support for setting any scheduler. Since then, such old systems are not supported, but rather than reverting that commit, let's change that to the conditional support. That way any addition to the list of schedulers can follow the same style so that we're consistent in the future. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Of course there are various ways how to address that, I went with case. Also defining undefined SCHED_* to -1 makes some gnulib syntax-check go haywire. src/util/virprocess.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 718c4a2664e1..39d6b30c40f2 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1183,7 +1183,7 @@ virProcessExitWithStatus(int status) exit(value); } -#if HAVE_SCHED_SETSCHEDULER && defined(SCHED_BATCH) && defined(SCHED_IDLE) +#if HAVE_SCHED_SETSCHEDULER static int virProcessSchedTranslatePolicy(virProcessSchedPolicy policy) @@ -1196,10 +1196,18 @@ virProcessSchedTranslatePolicy(virProcessSchedPolicy policy) return SCHED_BATCH; case VIR_PROC_POLICY_IDLE: +# ifdef SCHED_IDLE return SCHED_IDLE; +# else + return -1; +# endif case VIR_PROC_POLICY_FIFO: +# ifdef SCHED_FIFO return SCHED_FIFO; +# else + return -1; +# endif case VIR_PROC_POLICY_RR: return SCHED_RR; @@ -1225,6 +1233,13 @@ virProcessSetScheduler(pid_t pid, if (!policy) return 0; + if (pol < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Scheduler '%s' is not supported on this platform"), + virProcessSchedPolicyTypeToString(policy)); + return -1; + } + if (pol == SCHED_FIFO || pol == SCHED_RR) { int min = 0; int max = 0; -- 2.10.2

2 2

[libvirt] [PATCH] Gathering network interface statistics with openvswitch
by Mehdi Abaakouk 18 Nov '16

18 Nov '16

Hi, To follow up, my question about vhostuser/ovs interfaces statistics. This is my porposal to implement this feature. Regards, Mehdi Abaakouk (1): virstats: Gathering net interface stats with ovs src/util/virstats.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-) -- 2.10.2

2 2

[libvirt] [PATCH RFC 0/7] Run qemu under its own namespace
by Michal Privoznik 17 Nov '16

17 Nov '16

This is just an proof of concept of what has been agreed on here: https://www.redhat.com/archives/libvir-list/2016-November/msg00285.html There is still a lot of to be done: - set up seclabels - implement hot(un-)plug - implement other devices, not just disks I'm sending these in a hope that somebody will at least take a quick look. I'm not looking for a code cleanliness (but if you find some issues feel free to raise them), more than design confirmation. If I'm going in wrong direction I'd rather stop now before digging any deeper. Michal Privoznik (7): virprocess: Introduce virProcessSetupPrivateNS virfile: Introduce virFilePopulateDevices virfile: Introduce virFileSetupDev virfile: Introduce virFileSetupDevPTS virfile: Introduce virFileBindMountDevice qemu: Spawn qemu under mount namespace qemu: Prepare disks when starting a domain src/libvirt_private.syms | 5 + src/lxc/lxc_container.c | 20 +--- src/lxc/lxc_controller.c | 82 +++---------- src/qemu/qemu_domain.c | 306 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 12 ++ src/qemu/qemu_process.c | 13 ++ src/util/virfile.c | 116 ++++++++++++++++++ src/util/virfile.h | 21 ++++ src/util/virprocess.c | 24 ++++ src/util/virprocess.h | 2 + 10 files changed, 517 insertions(+), 84 deletions(-) -- 2.8.4

2 15

[libvirt] [PATCH v1] RFC Generating Qemu parameter -cpu features
by Collin L. Walling 17 Nov '16

17 Nov '16

I'm working on the CPU model checking support in libvirt for s390x and I've found when generating the -cpu +feature,-feature command, Qemu does not like the ± syntax when adding cpu features for s390x machines and expects us to use key=value pairs (e.g. feature=on,feature=off). Since x86 Qemu code supports both the ± and key=value methods of enabling CPU features, could we switch to just using key=value syntax in libvirt or do we need to maintain the ± format as well? I assume we could do something more sophisticated than wrapping the check in an if cpu->arch == VIR_ARCH_S390X? Another option would be to just change Qemu to support both formats, but I suspect we would get push back as key=value seems to be the preferred interface. Thanks for your time. - Collin Collin L. Walling (1): qemu: command: rework cpu feature argument support src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4

4 9

[libvirt] vhostuser and openvswitch interface statistics
by Mehdi Abaakouk 17 Nov '16

17 Nov '16

Hi, I'm looking for interface statistics for a vhostuser network interface (that uses ovs-dpdk on the other socket side). The "virsh domifstat <domain> <ifname>" obviously don't works because it looks at "/proc/net/dev" for statistics. When we use vhostuser, we don't create network interface on the host but a socket. Many tools currently rely on the domainInterfaceStats() API to retrieve this kind of information. So I would like to known if their is a plan to support ovs as network interface statistics source (with something like "ovs-vsctl get Interface <ifname> statistics") ? I have started to write a PoC code that fallback to OVS in virNetInterfaceStats() when we don't found the interface in /proc/net/dev. Does this kind of contribution is welcome/match your plan ? Regards, -- Mehdi Abaakouk mail: sileht(a)sileht.net irc: sileht

2 1

[libvirt] [PATCH for-2.9] qmp: Report QOM type name on query-cpu-definitions
by Eduardo Habkost 17 Nov '16

17 Nov '16

The new typename attribute on query-cpu-definitions will be used to help management software use device-list-properties to check which properties can be set using -cpu or -global for the CPU model. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- qapi-schema.json | 4 +++- target-arm/helper.c | 1 + target-i386/cpu.c | 1 + target-ppc/translate_init.c | 1 + target-s390x/cpu_models.c | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index b0b4bf6..9a3bdd4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3216,6 +3216,8 @@ # @unavailable-features: #optional List of properties that prevent # the CPU model from running in the current # host. (since 2.8) +# @typename: Type name that can be used as argument to @device-list-properties, +# to introspect properties configurable using -cpu or -global. # # @unavailable-features is a list of QOM property names that # represent CPU model attributes that prevent the CPU from running. @@ -3237,7 +3239,7 @@ ## { 'struct': 'CpuDefinitionInfo', 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool', - '*unavailable-features': [ 'str' ] } } + '*unavailable-features': [ 'str' ], 'typename': 'str' } } ## # @query-cpu-definitions: diff --git a/target-arm/helper.c b/target-arm/helper.c index b5b65ca..3fc01b5 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5207,6 +5207,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data) info = g_malloc0(sizeof(*info)); info->name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU)); + info->q_typename = g_strdup(typename); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6eec5dc..725f6cb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2239,6 +2239,7 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) info->name = x86_cpu_class_get_model_name(cc); x86_cpu_class_check_missing_features(cc, &info->unavailable_features); info->has_unavailable_features = true; + info->q_typename = g_strdup(object_class_get_name(oc)); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 208fa1e..42b9274 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10305,6 +10305,7 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) info = g_malloc0(sizeof(*info)); info->name = g_strdup(alias->alias); + info->q_typename = g_strdup(object_class_get_name(oc)); entry = g_malloc0(sizeof(*entry)); entry->value = info; diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c index c1e729d..5b66d33 100644 --- a/target-s390x/cpu_models.c +++ b/target-s390x/cpu_models.c @@ -290,6 +290,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) info->has_migration_safe = true; info->migration_safe = scc->is_migration_safe; info->q_static = scc->is_static; + info->q_typename = g_strdup(object_class_get_name(klass)); entry = g_malloc0(sizeof(*entry)); -- 2.7.4

3 4

[libvirt] fix for recent gnutls behavior change
by Christian Ehrhardt 17 Nov '16

17 Nov '16

TL;DR: please think if more needs to be changed to follow new gnutls behavior Hi, I found that recently our builds broke with these errors: TEST: virnettlssessiontest [...] 10) TLS Session servercertreq.filename + clientcertreq.filename ... FAILED 11) TLS Session servercertreq.filename + clientcertreq.filename ... FAILED 12) TLS Session servercertreq.filename + clientcertreq.filename ... OK 13) TLS Session servercertreq.filename + clientcertreq.filename ... FAILED 14) TLS Session servercertreq.filename + clientcertreq.filename ... FAILED 15) TLS Session servercertlevel3areq.filename + clientcertlevel2breq.filename ... OK FAIL virnettlssessiontest (exit status: 1) I was able to track that down to a change in gnutls which can be read at https://gitlab.com/gnutls/gnutls/issues/111 which changed the behavior of dname en- and decoding to follow RFC4514. More details on the debugging - if anyone want to reproduce - can be found on https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1641615 But the primary purpose of the cover letter is a call to everybody to think if that change could imply the need for more changes in libvirt than just to make the tests work again. Christian Ehrhardt (1): tests: adapt to gnutls change in dname en-/decoding tests/virnettlssessiontest.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) -- 2.7.4

2 3

[libvirt] [PATCH v3 00/18] Use mode PCIe less legacy PCI
by Laine Stump 16 Nov '16

16 Nov '16

(this time with auto-root-port-add goodness!) Last month I posted a short patch series that attempted to auto-assign addresses on PCI Express controllers to devices that were PCI Express devices. https://www.redhat.com/archives/libvir-list/2016-August/msg00732.html In particular, it would assign PCI virtio-1.0 devices, e1000e network devices, and nec-usb-xhci devices to hotpluggable PCIe express ports *if any were available*. However, a basic PCIe machine doesn't have any hotpluggable PCIe ports, and the patchset I sent had no provision for automatically adding any. This new patchset takes care of that limitation by automatically adding pci-root-ports as they are needed, and also automatically adds a dmi-to-pci-bridge device (to create a legacy PCI bus hierarchy) when needed so that we can do away with the code that *always* adds one (and there is a patch that *does* do away with that code :-). Once all of that was done, it turned out that virt-manager could create an *almost* legacy-PCI-free Q35 domain config - the only legacy PCI device was the sound device. Since the ich9 sound device is integrated into the Intel ich9 chip (which is part of real Q35 hardware), as a curiousity I made an RFC patch that attempts to place any ich9 audio device at 00:1B.0, which is the address where real Q35 hardware puts this device. With that patch in place, all you have to do to get a legacy-free Q35 config out of virt-manager is switch the sound device model from ich6 to ich9. (I don't expect that patch will be pushed, but it's nice to see this result). Although Andrea had ACKed most of the patches in the last patchset, I hadn't wanted to push them without accompanying patches to auto-add the pcie-root-ports (since doing so would render virt-manager + new libvirt unusable for Q35 domains). Since then I've decided on a cleaner manner for setting device connectFlags, so all but Patch 1 of the last set was discarded and re-written from scratch. Although there are still a couple more things I'd like to do, these patches can be pushed without a serious regression in functionality for Q35 domains: 1) currently I put each new pcie-root-port on its own slot, rather than putting 8 of them on the different functions of a single slot. This means you can only get ~30 devices before you have to start manually adding pcie controllers. That will be remedied soon. 2) I don't have a patch yet to read a PCI device's capabilities to see whether or not it is an Express device and change the connectFlags accordingly. In the meantime if you want to plug in a vfio assigned device, you'll either need to manually address it to a PCIe port, or you'll need to manually add a pci-bridge device to the config. 3) I don't do anything to assure there are any unused pcie-root-ports available for hotplug. We need to fix that, but I'm not sure how many to "reserve". Suggestions I've heard have been "1", "2", "4", and "just add pcie-root-ports 8 at a time and you'll have 'something between 1 and 8' available". Laine Stump (18): conf: restrict what type of buses will accept a pci-bridge qemu: replace a lot of "def->controllers[i]" with equivalent "cont" qemu: new functions qemuDomainMachineHasPCI[e]Root() qemu: new functions qemuDomainDeviceConnectFlags*() conf: new function virDomainPCIAddressReserveNextAddr() qemu: use virDomainPCIAddressReserveNextAddr in qemuDomainAssignDevicePCISlots conf: make virDomainPCIAddressGetNextSlot() a local static function qemu: replace calls to virDomainPCIAddressReserveNext*() with static function qemu: set/use info->pciConnectFlags during qemuDomainAssignDevicePCISlots qemu: set/use proper pciConnectFlags during hotplug qemu: assign virtio devices to PCIe slot when appropriate qemu: assign e1000e network devices to PCIe slots when appropriate qemu: assign nec-xhci (USB3) controller to a PCIe address when appropriate qemu: only force an available legacy-PCI slot on domains with pci-root qemu: auto-add pcie-root-port/dmi-to-pci-bridge controllers as needed qemu: don't force-add a dmi-to-pci-bridge just on principle qemu: add a USB3 controller to Q35 domains by default [RFC] qemu: try to put ich9 sound device at 00:1B.0 src/conf/device_conf.h | 5 + src/conf/domain_addr.c | 180 ++++- src/conf/domain_addr.h | 15 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 50 +- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_domain_address.c | 802 +++++++++++++++------ src/qemu/qemu_domain_address.h | 4 + src/qemu/qemu_hotplug.c | 25 +- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- .../qemuxml2argv-q35-default-devices-only.args | 22 + .../qemuxml2argv-q35-default-devices-only.xml | 18 + .../qemuxml2argv-q35-pcie-autoadd.args | 56 ++ .../qemuxml2argv-q35-pcie-autoadd.xml | 51 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args | 58 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml | 67 ++ .../qemuxml2argv-q35-virt-manager-basic.args | 56 ++ .../qemuxml2argv-q35-virt-manager-basic.xml | 76 ++ .../qemuxml2argv-q35-virtio-pci.args | 58 ++ .../qemuxml2argv-q35-virtio-pci.xml | 1 + tests/qemuxml2argvtest.c | 123 ++++ .../qemuxml2xmlout-autoindex.xml | 10 +- .../qemuxml2xmlout-pcie-root.xml | 4 - .../qemuxml2xmlout-q35-default-devices-only.xml | 40 + .../qemuxml2xmlout-q35-pcie-autoadd.xml | 143 ++++ .../qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml | 152 ++++ .../qemuxml2xmlout-q35-virt-manager-basic.xml | 116 +++ .../qemuxml2xmlout-q35-virtio-pci.xml | 152 ++++ tests/qemuxml2xmltest.c | 108 +++ 30 files changed, 2117 insertions(+), 292 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml -- 2.7.4

6 67

[libvirt] [PATCH v2] logical: Check for existing vgname before building
by John Ferlan 16 Nov '16

16 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1373711 Add a check for an existing volume group name before trying to build the volume group. Since the process of building a vg involves wiping the first 512 bytes and using pvcreate on each source device path before creating the vg - we could conceivably overwrite something that we shouldn't be. Also, once a pv is part of a vg, the pvcreate would fail unless we chose to overwrite the volume. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Difference w/ v2 is that I'm taking a different approach - disallow the second pool-build since the vg already exists. NB: libvirt has no API to extend an existing vg - that's left to an admin anyway. src/storage/storage_backend_logical.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ca05fe1..b241495 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -682,14 +682,31 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, unsigned int flags) { - virCommandPtr vgcmd; + virCommandPtr vgcmd = NULL; int fd; char zeros[PV_BLANK_SECTOR_SIZE]; int ret = -1; size_t i; + virStoragePoolSourceList sourceList; virCheckFlags(0, -1); + /* Let's make sure the about to be created vg doesn't already exist */ + memset(&sourceList, 0, sizeof(sourceList)); + sourceList.type = VIR_STORAGE_POOL_LOGICAL; + + if (virStorageBackendLogicalGetPoolSources(&sourceList) < 0) + return -1; + + for (i = 0; i < sourceList.nsources; i++) { + if (STREQ(sourceList.sources[i].name, pool->def->source.name)) { + virReportError(VIR_ERR_STORAGE_POOL_BUILT, + _("volume group with name '%s' already exists"), + pool->def->source.name); + goto cleanup; + } + } + memset(zeros, 0, sizeof(zeros)); vgcmd = virCommandNewArgList(VGCREATE, pool->def->source.name, NULL); @@ -751,6 +768,9 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; cleanup: + for (i = 0; i < sourceList.nsources; i++) + virStoragePoolSourceClear(&sourceList.sources[i]); + VIR_FREE(sourceList.sources); virCommandFree(vgcmd); return ret; } -- 2.7.4

2 2

[libvirt] [PATCH] logical: Allow [no]overwrite option for poolBuild
by John Ferlan 16 Nov '16

16 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1373711 When using pool-create --build or pool-define and pool-build to create/define and build/initialize the logical pool, the 'pvcreate' command could fail if some previous attempt had been used on the source path previously. So add support for the --override option in order to force usage of the magic override option "-ff" and the option "-y" in order to force creation and answer any questions with yes. NB: Although the reality is part of the process of building the logical pool involves wiping out the first 512 bytes of the disk block to be added (e.g. the partition table) because pvcreate requires that. So, to a degree the device being added is already altered. I suspect the knowlege of whether the disk was in a vg already could be contained outside the range of the first 512 bytes. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ca05fe1..9c76156 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -682,13 +682,18 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, unsigned int flags) { - virCommandPtr vgcmd; + virCommandPtr vgcmd = NULL; int fd; char zeros[PV_BLANK_SECTOR_SIZE]; int ret = -1; size_t i; - virCheckFlags(0, -1); + virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret); + + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_STORAGE_POOL_BUILD_OVERWRITE, + VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, + cleanup); memset(zeros, 0, sizeof(zeros)); @@ -731,10 +736,21 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, /* * Initialize the physical volume because vgcreate is not * clever enough todo this for us :-( + * + * If this API is called twice for the same device, then because + * vgcmd adds the device to the volume group, the pvcreate will + * fail since the pv is already part of the vg. Allow use of the + * override option inorder to overrule! */ - pvcmd = virCommandNewArgList(PVCREATE, - pool->def->source.devices[i].path, - NULL); + if (flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) + pvcmd = virCommandNewArgList(PVCREATE, + "-ff", "-y", + pool->def->source.devices[i].path, + NULL); + else + pvcmd = virCommandNewArgList(PVCREATE, + pool->def->source.devices[i].path, + NULL); if (virCommandRun(pvcmd, NULL) < 0) { virCommandFree(pvcmd); goto cleanup; -- 2.7.4

2 3

[libvirt] [PATCH RFC] Rework existing code for scsi hostdev scsi_host protocol
by Eric Farman 16 Nov '16

16 Nov '16

In review feedback for my vhost-scsi series[1], we encountered a conflict where existing structs/functions are named "...SCSIHost..." to represent a hostdev type='scsi' protocol='scsi_host' element. This is somewhat of an abbreviation, but jives well with the other elements for this hostdev. Specifically, a hostdev type='scsi' protocol='iscsi' uses structs and functions named "...SCSIiSCSI..." As my series is intending to add a hostdev type='scsi_host', the phrase "SCSIHost" had to be avoided to prevent conflicts with existing code, which means the abbreviation gets propogated in new and unplesant ways. Let's remove this abbreviation and change the existing code from "SCSIHost" to "SCSISCSIHost" so that a new hostdev type can be added without conflict. The intention being "<type><protocol>" being used going forward. [1] End of https://www.redhat.com/archives/libvir-list/2016-November/msg00738.html Signed-off-by: Eric Farman <farman(a)linux.vnet.ibm.com> --- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 20 ++++++++--------- src/conf/domain_conf.h | 8 +++---- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 6 ++--- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 ++-- src/security/security_selinux.c | 4 ++-- src/util/virhostdev.c | 47 ++++++++++++++++++++++------------------ 11 files changed, 53 insertions(+), 48 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2decf02..164debb 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -432,7 +432,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, */ goto cleanup; } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; if (virAsprintfQuiet(&address, "%s:%u:%u:%llu", scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e008e2..c985e21 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5907,14 +5907,14 @@ virDomainStorageHostParse(xmlNodePtr node, } static int -virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode, - virDomainHostdevSubsysSCSIPtr scsisrc) +virDomainHostdevSubsysSCSISCSIHostDefParseXML(xmlNodePtr sourcenode, + virDomainHostdevSubsysSCSIPtr scsisrc) { int ret = -1; bool got_address = false, got_adapter = false; xmlNodePtr cur; char *bus = NULL, *target = NULL, *unit = NULL; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; cur = sourcenode->children; while (cur != NULL) { @@ -6081,7 +6081,7 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) ret = virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc); else - ret = virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc); + ret = virDomainHostdevSubsysSCSISCSIHostDefParseXML(sourcenode, scsisrc); cleanup: VIR_FREE(protocol); @@ -13846,12 +13846,12 @@ virDomainHostdevMatchSubsysPCI(virDomainHostdevDefPtr first, } static int -virDomainHostdevMatchSubsysSCSIHost(virDomainHostdevDefPtr first, - virDomainHostdevDefPtr second) +virDomainHostdevMatchSubsysSCSISCSIHost(virDomainHostdevDefPtr first, + virDomainHostdevDefPtr second) { - virDomainHostdevSubsysSCSIHostPtr first_scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr first_scsihostsrc = &first->source.subsys.u.scsi.u.host; - virDomainHostdevSubsysSCSIHostPtr second_scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr second_scsihostsrc = &second->source.subsys.u.scsi.u.host; if (STREQ(first_scsihostsrc->adapter, second_scsihostsrc->adapter) && @@ -13898,7 +13898,7 @@ virDomainHostdevMatchSubsys(virDomainHostdevDefPtr a, VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) return virDomainHostdevMatchSubsysSCSIiSCSI(a, b); else - return virDomainHostdevMatchSubsysSCSIHost(a, b); + return virDomainHostdevMatchSubsysSCSISCSIHost(a, b); case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: return 0; } @@ -20808,7 +20808,7 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf, virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; virDomainHostdevSubsysPCIPtr pcisrc = &def->source.subsys.u.pci; virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 541b600..4303d0e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -338,9 +338,9 @@ struct _virDomainHostdevSubsysPCI { int backend; /* enum virDomainHostdevSubsysPCIBackendType */ }; -typedef struct _virDomainHostdevSubsysSCSIHost virDomainHostdevSubsysSCSIHost; -typedef virDomainHostdevSubsysSCSIHost *virDomainHostdevSubsysSCSIHostPtr; -struct _virDomainHostdevSubsysSCSIHost { +typedef struct _virDomainHostdevSubsysSCSISCSIHost virDomainHostdevSubsysSCSISCSIHost; +typedef virDomainHostdevSubsysSCSISCSIHost *virDomainHostdevSubsysSCSISCSIHostPtr; +struct _virDomainHostdevSubsysSCSISCSIHost { char *adapter; unsigned bus; unsigned target; @@ -363,7 +363,7 @@ struct _virDomainHostdevSubsysSCSI { int sgio; /* enum virDomainDeviceSGIO */ int rawio; /* enum virTristateBool */ union { - virDomainHostdevSubsysSCSIHost host; + virDomainHostdevSubsysSCSISCSIHost host; virDomainHostdevSubsysSCSIiSCSI iscsi; } u; }; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 1443f7e..462f74d 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -357,7 +357,7 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, VIR_DEBUG("Not updating cgroups for hostdev iSCSI path '%s'", iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; if ((scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a5fce3..37ce596 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4706,10 +4706,10 @@ qemuBuildHubCommandLine(virCommandPtr cmd, static char * -qemuBuildSCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev) +qemuBuildSCSISCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev) { virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; return virSCSIDeviceGetSgName(NULL, scsihostsrc->adapter, @@ -4754,7 +4754,7 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev) goto error; virBufferAsprintf(&buf, "file=%s,if=none,format=raw", source); } else { - if (!(source = qemuBuildSCSIHostHostdevDrvStr(dev))) + if (!(source = qemuBuildSCSISCSIHostHostdevDrvStr(dev))) goto error; virBufferAsprintf(&buf, "file=/dev/%s,if=none", source); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0ed88f5..169467f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1198,7 +1198,7 @@ static char * qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; char *dev_name = NULL; char *dev_path = NULL; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6b3a068..a3acda6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2355,7 +2355,7 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, _("Unable to prepare scsi hostdev for iSCSI: %s"), iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to prepare scsi hostdev: %s:%u:%u:%llu"), scsihostsrc->adapter, scsihostsrc->bus, @@ -4583,7 +4583,7 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, _("host scsi iSCSI path %s not found"), iscsisrc->path); } else { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virReportError(VIR_ERR_OPERATION_FAILED, _("host scsi device %s:%u:%u.%llu not found"), diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index beddf6d..521df8e 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -893,7 +893,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index fd74e8b..e3a01ae 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -658,7 +658,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, @@ -789,7 +789,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 89c93dc..c916028 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1479,7 +1479,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, @@ -1684,7 +1684,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = virSCSIDeviceNew(NULL, scsihostsrc->adapter, scsihostsrc->bus, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9c2262e..13ee522 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1044,13 +1044,13 @@ virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr, } static int -virHostdevUpdateActiveSCSIHostDevices(virHostdevManagerPtr mgr, - virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - const char *drv_name, - const char *dom_name) +virHostdevUpdateActiveSCSISCSIHostDevices(virHostdevManagerPtr mgr, + virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + const char *drv_name, + const char *dom_name) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi = NULL; virSCSIDevicePtr tmp = NULL; int ret = -1; @@ -1107,8 +1107,11 @@ virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { continue; /* Not supported for iSCSI */ } else { - if (virHostdevUpdateActiveSCSIHostDevices(mgr, hostdev, scsisrc, - drv_name, dom_name) < 0) + if (virHostdevUpdateActiveSCSISCSIHostDevices(mgr, + hostdev, + scsisrc, + drv_name, + dom_name) < 0) goto cleanup; } } @@ -1340,11 +1343,11 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr, } static int -virHostdevPrepareSCSIHostDevices(virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - virSCSIDeviceListPtr list) +virHostdevPrepareSCSISCSIHostDevices(virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + virSCSIDeviceListPtr list) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi; int ret = -1; @@ -1406,7 +1409,9 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { continue; /* Not supported for iSCSI */ } else { - if (virHostdevPrepareSCSIHostDevices(hostdev, scsisrc, list) < 0) + if (virHostdevPrepareSCSISCSIHostDevices(hostdev, + scsisrc, + list) < 0) goto cleanup; } } @@ -1533,13 +1538,13 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr mgr, } static void -virHostdevReAttachSCSIHostDevices(virHostdevManagerPtr mgr, - virDomainHostdevDefPtr hostdev, - virDomainHostdevSubsysSCSIPtr scsisrc, - const char *drv_name, - const char *dom_name) +virHostdevReAttachSCSISCSIHostDevices(virHostdevManagerPtr mgr, + virDomainHostdevDefPtr hostdev, + virDomainHostdevSubsysSCSIPtr scsisrc, + const char *drv_name, + const char *dom_name) { - virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; + virDomainHostdevSubsysSCSISCSIHostPtr scsihostsrc = &scsisrc->u.host; virSCSIDevicePtr scsi; virSCSIDevicePtr tmp; @@ -1598,8 +1603,8 @@ virHostdevReAttachSCSIDevices(virHostdevManagerPtr mgr, if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) continue; /* Not supported for iSCSI */ else - virHostdevReAttachSCSIHostDevices(mgr, hostdev, scsisrc, - drv_name, dom_name); + virHostdevReAttachSCSISCSIHostDevices(mgr, hostdev, scsisrc, + drv_name, dom_name); } virObjectUnlock(mgr->activeSCSIHostdevs); } -- 1.9.1

1 0

[libvirt] [PATCH] fs: Add proper switch to create filesystem with overwrite
by John Ferlan 16 Nov '16

16 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1366460 When using the --overwrite switch on a pool-build or pool-create, the The mkfs.ext{2|3|4} commands use mke2fs which requires using the '-F' switch in order to force overwriting the current filesystem on the whole disk. Likewise, the mkfs.vfat command uses mkfs.fat which requires using the '-I' switch in order to force overwriting the current filesystem on the whole disk. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 6c8bae2..de0e8d5 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -712,9 +712,17 @@ virStorageBackendExecuteMKFS(const char *device, cmd = virCommandNewArgList(MKFS, "-t", format, NULL); - /* use the force, otherwise mkfs.xfs won't overwrite existing fs */ + /* use the force, otherwise mkfs.xfs won't overwrite existing fs. + * Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F + * and mkfs.vfat uses -I */ if (STREQ(format, "xfs")) virCommandAddArg(cmd, "-f"); + else if (STREQ(format, "ext2") || + STREQ(format, "ext3") || + STREQ(format, "ext4")) + virCommandAddArg(cmd, "-F"); + else if (STREQ(format, "vfat")) + virCommandAddArg(cmd, "-I"); virCommandAddArg(cmd, device); -- 2.7.4

2 3

[libvirt] [PATCH 0/2] Detect misconfiguration between disk bus and disk address
by Marc Hartmayer 16 Nov '16

16 Nov '16

This patch series adds the functionality to detect a misconfiguration between disk bus type and disk address type for disks that are using the address type virDomainDeviceDriveAddress. It also adds a test for it. A check for other bus types may be needed. This may require a driver specific function, as it is already implemented in virDomainDeviceDefPostParse(), for example. Marc Hartmayer (2): conf: Detect misconfiguration between disk bus and disk address tests: Add tests for disk configuration validation src/conf/domain_conf.c | 46 ++++++++++++++++++++++ .../qemuxml2argv-disk-fdc-incompatible-address.xml | 22 +++++++++++ .../qemuxml2argv-disk-ide-incompatible-address.xml | 23 +++++++++++ ...qemuxml2argv-disk-sata-incompatible-address.xml | 23 +++++++++++ ...qemuxml2argv-disk-scsi-incompatible-address.xml | 24 +++++++++++ tests/qemuxml2argvtest.c | 8 ++++ 6 files changed, 146 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-fdc-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-sata-incompatible-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-incompatible-address.xml -- 2.5.5

2 4

[libvirt] [PATCH] Avoid compiler warnings in virCPUDefStealModel
by Jiri Denemark 16 Nov '16

16 Nov '16

Old GCC on CentOS 6 thinks vendor and vendor_id might be used uninitialized in virCPUDefStealModel. The compiler is wrong, though. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build breaker. src/conf/cpu_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 9eb69c9..1bcceed 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -144,8 +144,8 @@ virCPUDefStealModel(virCPUDefPtr dst, virCPUDefPtr src, bool keepVendor) { - char *vendor; - char *vendor_id; + char *vendor = NULL; + char *vendor_id = NULL; if (keepVendor) { VIR_STEAL_PTR(vendor, dst->vendor); -- 2.10.2

1 0

[libvirt] [PATCH v2 0/9] Add group_name support for <iotune>
by John Ferlan 15 Nov '16

15 Nov '16

v1: http://www.redhat.com/archives/libvir-list/2016-October/msg01336.html Changes from v1: Patches 3-5 are new to address review comments Other adjustments as listed in responses to v1: - Addressed leak in qemuDomainSetBlockIoTune from setting "group_name" defaults - Test adjustment for separate validate routine - Use of Escape function (patches 7 and 8) - Use of vshCommandOptStringReq in patch 9 John Ferlan (9): include: Add new "group_name" definition for iotune throttling caps: Add new capability for the iotune group name qemu: Adjust maxparams logic for qemuDomainGetBlockIoTune qemu: Alter qemuMonitorJSONSetBlockIoThrottle command logic qemu: Adjust various bool BlockIoTune set_ values into mask qemu: Add support for parsing iotune group setting conf: Add support for blkiotune group_name option qemu: Add the group name option to the iotune command line virsh: Add group name to blkdeviotune output docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 5 + include/libvirt/libvirt-domain.h | 15 ++ src/conf/domain_conf.c | 10 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++ src/qemu/qemu_driver.c | 177 +++++++++++++-------- src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 97 ++++++----- src/qemu/qemu_monitor_json.h | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 88 +++++++--- .../qemuxml2argv-blkdeviotune-group-num.args | 32 ++++ .../qemuxml2argv-blkdeviotune-group-num.xml | 61 +++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-blkdeviotune-group-num.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 17 ++ tools/virsh.pod | 5 +- 28 files changed, 428 insertions(+), 124 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml -- 2.7.4

1 11

[libvirt] [PATCH v3 0/2] bhyve: add e1000 nic support
by Roman Bogorodskiy 15 Nov '16

15 Nov '16

Changes since v2: - Include missing Fabian's probes patch Changes since v1: - Fix indentation - Don't leak nic_model in bhyveBuildNetArgStr, and actually convert it to use 'goto out' to the clean up routine instead of explicit calls to VIR_FREE for every case - Add support for e1000 for argv2xml code, along with tests Fabian Freyer (1): bhyve: Separate out checks from virBhyveProbeCaps Roman Bogorodskiy (1): bhyve: add e1000 nic support src/bhyve/bhyve_capabilities.c | 58 ++++++++++++++--- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 74 ++++++++++++++-------- src/bhyve/bhyve_parse_command.c | 9 ++- tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args | 8 +++ tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml | 28 ++++++++ .../bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 2 + .../bhyveargv2xml-virtio-net4.xml | 1 + tests/bhyveargv2xmltest.c | 1 + .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.args | 9 +++ .../bhyvexml2argv-net-e1000.ldargs | 3 + .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml | 22 +++++++ tests/bhyvexml2argvtest.c | 7 +- 13 files changed, 184 insertions(+), 39 deletions(-) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml -- 2.9.2

2 7

[libvirt] [PATCH] bhyve: fix memory leaks in bhyvexml2argvtest
by Roman Bogorodskiy 15 Nov '16

15 Nov '16

* virNetDevTapCreateInBridgePort() mock: free '*ifname' before strdupping a hardoded value to it * testCompareXMLToArgvFiles(): unref 'conn' object in cleanup * testCompareXMLToArgvHelper(): free 'ldargs' and 'dmargs' in cleanup --- tests/bhyvexml2argvmock.c | 2 ++ tests/bhyvexml2argvtest.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 41058ca..a851632 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -1,5 +1,6 @@ #include <config.h> +#include "viralloc.h" #include "virstring.h" #include "virnetdev.h" #include "virnetdevtap.h" @@ -29,6 +30,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, virNetDevVlanPtr virtVlan ATTRIBUTE_UNUSED, unsigned int fakeflags ATTRIBUTE_UNUSED) { + VIR_FREE(*ifname); if (VIR_STRDUP(*ifname, "vnet0") < 0) return -1; return 0; diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index b85439b..22a902c 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -86,6 +86,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandFree(cmd); virCommandFree(ldcmd); virDomainDefFree(vmdef); + virObjectUnref(conn); return ret; } @@ -117,6 +118,8 @@ testCompareXMLToArgvHelper(const void *data) cleanup: VIR_FREE(xml); VIR_FREE(args); + VIR_FREE(ldargs); + VIR_FREE(dmargs); return ret; } -- 2.9.2

2 2

[libvirt] [PATCH v3] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- v1-v2: don't output halted cpu info if it wasn't rathered v2-v3: syntax-check recommendation src/qemu/qemu_driver.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..05a88c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -19005,10 +19005,16 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && - VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } else if (VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) { + goto cleanup; + } + } if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), @@ -19462,7 +19468,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

2 2

[libvirt] [PATCH v2] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..55b9566 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18978,7 +18978,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -19005,10 +19005,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && - VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } else if (VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) + goto cleanup; + } if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), @@ -19462,7 +19467,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

1 1

[libvirt] [PATCH] qemu: fix libvirtd crash when querying halted cpus info
by Maxim Nestratov 15 Nov '16

15 Nov '16

It was introduced by commit 7a51d9ebb, which started to use monitor commands without job acquiring, which is unsafe and leads to simultaneous access to vm->mon structure by different threads. Crash backtrace is the following (shortened): Program received signal SIGSEGV, Segmentation fault. qemuMonitorSend (mon=mon@entry=0x7f4ef4000d20, msg=msg@entry=0x7f4f18e78640) at qemu/qemu_monitor.c:1011 1011 while (!mon->msg->finished) { 0 qemuMonitorSend () at qemu/qemu_monitor.c:1011 1 0x00007f691abdc720 in qemuMonitorJSONCommandWithFd () at qemu/qemu_monitor_json.c:298 2 0x00007f691abde64a in qemuMonitorJSONCommand at qemu/qemu_monitor_json.c:328 3 qemuMonitorJSONQueryCPUs at qemu/qemu_monitor_json.c:1408 4 0x00007f691abcaebd in qemuMonitorGetCPUInfo g@entry=false) at qemu/qemu_monitor.c:1931 5 0x00007f691ab96863 in qemuDomainRefreshVcpuHalted at qemu/qemu_domain.c:6309 6 0x00007f691ac0af99 in qemuDomainGetStatsVcpu at qemu/qemu_driver.c:18945 7 0x00007f691abef921 in qemuDomainGetStats at qemu/qemu_driver.c:19469 8 qemuConnectGetAllDomainStats at qemu/qemu_driver.c:19559 9 0x00007f693382e806 in virConnectGetAllDomainStats at libvirt-domain.c:11546 10 0x00007f6934470c40 in remoteDispatchConnectGetAllDomainStats at remote.c:6267 (gdb) p mon->msg $1 = (qemuMonitorMessagePtr) 0x0 This change fixes it by calling qemuDomainRefreshVcpuHalted only when job is acquired. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dd1907b..43a546d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18915,7 +18915,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virDomainStatsRecordPtr record, int *maxparams, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags) { size_t i; int ret = -1; @@ -18939,14 +18939,20 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, return -1; if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0 || - VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) - goto cleanup; - - if (qemuDomainRefreshVcpuHalted(driver, dom, - QEMU_ASYNC_JOB_NONE) == 0 && + VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0 || VIR_ALLOC_N(cpuhalted, virDomainDefGetVcpus(dom->def)) < 0) goto cleanup; + if (HAVE_JOB(privflags) && virDomainObjIsActive(dom)) { + + if (qemuDomainRefreshVcpuHalted(driver, dom, + QEMU_ASYNC_JOB_NONE) < 0) { + /* it's ok to be silent and go ahead, because halted vcpu info + * wasn't here from the beginning */ + virResetLastError(); + } + } + if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, virDomainDefGetVcpus(dom->def), NULL, 0, cpuhalted) < 0) { @@ -19399,7 +19405,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = { { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, false }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, -- 2.4.11

3 7

[libvirt] [RFC] why netcf/libvirt lists/dumpxml only unslaved/unsubordinated interfaces?
by Nikolay Shirokovskiy 15 Nov '16

15 Nov '16

It could be useful to dumpxml of slaves/subordinates too to introspect host interfaces tree in dephts. Now it is not possible: 'Interface eth0 does not exist or is not a toplevel interface'. Has it some deeper meaning or netcf can be enhanced? (and *libvirt* as well). Nikolay

2 3

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 14 Nov '16

14 Nov '16

In particular, this is a quick gnulib fix for a mingw compile error. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll be pushing this soon, as a fix for a build-breaker. * .gnulib 5ddd9d7...0602cfd (5): > strerror_r-posix: Another fix, for HAVE_DECL_STRERROR_R on mingw > strptime: fix compile error in recent change > gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license. > strftime: tune %q > Merge strftime.c changes from glibc .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 5ddd9d7..0602cfd 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98 +Subproject commit 0602cfd486655d5b5f0ebdf92f19280f6b6e984c -- 2.7.4

1 0

[libvirt] [PATCH v2 0/3] libvirtd: fix crashes on termination
by Nikolay Shirokovskiy 14 Nov '16

14 Nov '16

diff from v1 ============ 1. drop patches 1-2 of v1. As to "event loop" patch seems nobody has "production" problems due to leaks on termination. Turning freeing callback objects registered in event loop on after it is finished has an impact that is hard to predict. Different parts of libvirt use event loop and the patch can trigger paths that were not passed before. Let's wait for real issue) "Breaking cyclic dependency" patch will not reach its target without "event loop patch" anyway - daemon object will still leak in certain situation so let's drop it too. 2. add code commenting patch It documents another reason why we should not free callback object synchronously in remove handle/timeout function besides Dan's objection: https://www.redhat.com/archives/libvir-list/2016-September/msg01005.html Reproducing: ============ Crash situation of patches 1-2 can easily be simulated, just patch libvirt: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 30a2830..f6b71d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4515,6 +4515,8 @@ processMonitorEOFEvent(virQEMUDriverPtr driver, unsigned int stopFlags = 0; virObjectEventPtr event = NULL; + sleep(3); + if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY, true) < 0) return; then when it is up and running and there is also a qemu domain running: kill -9 $QEMU_DOMAIN && pkill libvirtd By the way there should be no admin connection at the moment or crash will not happen due to leaks. Nikolay Shirokovskiy (3): daemon: keep daemon until all hypervisors drivers are cleaned up qemu: first wait all workers finish on state cleanup util: event loop: document another reason to defer deletion daemon/libvirtd.c | 4 +++- src/qemu/qemu_driver.c | 2 +- src/util/vireventpoll.c | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 14 Nov '16

14 Nov '16

In particular, pull in gnulib's fix for the broken SIZE_MAX on s390. * .gnulib: Update to latest. * bootstrap: Resync to upstream. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A buildbot on an s390 platform was complaining: CC util/libvirt_setuid_rpc_client_la-virconf.lo util/virconf.c: In function 'virConfGetValueSizeT': util/virconf.c:1220:9: error: format '%zu' expects argument of type 'size_t', but argument 9 has type 'unsigned int' [-Werror=format=] virReportError(VIR_ERR_INTERNAL_ERROR, ^ This gnulib update should fix it; since we're between releases, I'm pushing this under the gnulib maintenance rule. * .gnulib e89b4a7...5ddd9d7 (73): > strerror_r-posix: Fix override of AC_FUNC_STRERROR_R > Fix gnulib C++ namespace support and std::frexp > GNULIB_NAMESPACE::func need not pull in rpl_func > manywarnings: fix -Wno-missing-field-initializers detection > non-recursive-gnulib-prefix-hack: revert use of parameterized 'lib' dir > strftime,strptime: support %q to represent the quarter > autoupdate > bootstrap: Fix get_version() for AIX 5.3 > intprops: port to older XL C > autoupdate > backupfile: initialize default suffix within the implementation > futimens: remove FIXME for old Linux kernels > utimensat: remove FIXME for old Linux kernels > maint: update how to make web pages > qsort_r: Fix macrology for platforms that lack the function. > sys_types: fix Texinfo typos > getprogname: port to HP-UX > Update doc about target platforms. > opendir, readdir, closedir: Relicense under LGPLv2+. > Fix conflict between strerror_r-posix module and AC_FUNC_STRERROR_R. > Make the 'argp' module work without the 'error' module. > diffseq: restore TOO_EXPENSIVE heuristic > non-recursive-gnulib-prefix-hack: Don't make assumptions about gnulib-tool's --source-base option value. > iconv: Avoid compilation error when bootstrapping GNU libiconv. > Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'. > system-quote tests: Avoid compiler warning on AIX. > Fix some "gcc -Wall" warnings. > gnulib-tool: Make --create-testdir on all modules work again. > libunistring: change the maintainer to 'all' > Simplify "configure: checking ..." messages. > Simplify "configure: checking ..." messages. > quotearg-tests: pacify gcc -Wall > canonicalize-lgpl: fix for missing SIZE_MAX on older systems > printf.m4: fix a bug in detecting printf %j support > sched: substitute HAVE_SYS_CDEFS_H too > quotearg: never write beyond the returned length > getprogname tests: Avoid failure in packages that use libtool. > getprogname: Fix test failure on Cygwin. Comments. > Make sure the libunistring detection rejects older versions with a known bug. > sh-quote, system-quote: revert regression of unit test. > quotearg: fix stale tests > non-recursive-gnulib-prefix-hack: fix inconsequential typo > Fix a test crash. > test-limits-h: suppress -Woverlength-strings > gettime, timespec, utimens: Relicense under LGPL. > canonicalize-lgpl: Support the case path_max > INT_MAX. > getprogname: IBM z/OS: avoid NULL-dereference > test-stdint: use _GL_VERIFY rather than "verify" for some tests > Add missing ChangeLog entry > stdint: port SIZE_MAX to glibc s390 > getprogname: port to IBM z/OS > maint: remove stray space after "." in AC_DEFINE comment. > long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough > utimecmp: avoid new GCC 7 warning from -Wbool-operation > dfa: save memory for states > wchar, wctype-h: fix for MinGW 3.22.2 > long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough > utimecmp: avoid new GCC 7 warning from -Wbool-operation > autoupdate > quotearg: minimize shell quoting using double quotes > vasnprintf.c: avoid spurious warning from GCC 7 > getprogname: correct the test for a __progname variable > u8-uctomb-aux.c: build: placate GCC 7's new -Wimplicit-fallthrough > dfa: build: avoid warning from GCC 7's new -Wimplicit-fallthrough > getprogname: avoid __progname vs program_invocation_short_name pitfall > getprogname: port to OpenBSD 5.1 > sched: port to GCC 6.2.1 on macOS Sierra > tests/init.sh: port Alpine fix to AIX 7.1 > nl_langinfo: pacify GCC > stdint: also set GL_GENERATE_LIMITS_H > limits-h, stdint: Don't assume extensions, fix typo > getprogname: port to AIX > update from texinfo .gnulib | 2 +- bootstrap | 38 ++++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gnulib b/.gnulib index e89b4a7..5ddd9d7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e89b4a7aefce9cb02963920712ba7cdd13641644 +Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98 diff --git a/bootstrap b/bootstrap index f060bab..5d3c289 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2016-01-24.06; # UTC +scriptversion=2016-11-03.18; # UTC # Bootstrap this package from checked-out sources. @@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available done } +get_version_sed=' +# Move version to start of line. +s/.*[v ]$[0-9]$/\1/ + +# Skip lines that do not start with version. +/^[0-9]/!d + +# Remove characters after the version. +s/[^.a-z0-9-].*// + +# The first component must be digits only. +s/^$[0-9]*$[a-z-].*/\1/ + +#the following essentially does s/5.005/5.5/ +s/\.0*$[1-9]$/.\1/g +p +q' + get_version() { app=$1 $app --version >/dev/null 2>&1 || { $app --version; return 1; } - $app --version 2>&1 | - sed -n '# Move version to start of line. - s/.*[v ]$[0-9]$/\1/ - - # Skip lines that do not start with version. - /^[0-9]/!d - - # Remove characters after the version. - s/[^.a-z0-9-].*// - - # The first component must be digits only. - s/^$[0-9]*$[a-z-].*/\1/ - - #the following essentially does s/5.005/5.5/ - s/\.0*$[1-9]$/.\1/g - p - q' + $app --version 2>&1 | sed -n "$get_version_sed" } check_versions() { -- 2.7.4

3 3

[libvirt] [PATCH v6 00/17] Use more PCIe less legacy PCI
by Laine Stump 14 Nov '16

14 Nov '16

This is a rebase of v5 (, with the addition of patches 16 & 17, which detect the type of VFIO assigned devices and assign them to either an Express or a legacy PCI slot as appropriate, Laine Stump (17): qemu: new functions qemuDomainMachineHasPCI[e]Root() qemu: new functions to calculate/set device pciConnectFlags qemu: set/use info->pciConnectFlags when validating/assigning PCI addresses qemu: set/use proper pciConnectFlags during hotplug qemu: set pciConnectFlags to 0 instead of PCI|HOTPLUGGABLE if device isn't PCI qemu: assign virtio devices to PCIe slot when appropriate qemu: assign e1000e network devices to PCIe slots when appropriate qemu: assign nec-xhci (USB3) controller to a PCIe address when appropriate qemu: only force an available legacy-PCI slot on domains with pci-root qemu: auto-add pcie-root-port/dmi-to-pci-bridge controllers as needed [RFC] qemu: if pci-bridge is in PCIe config w/o dmi-to-pci-bridge, add it qemu: don't force-add a dmi-to-pci-bridge just on principle qemu: add a USB3 controller to Q35 domains by default qemu: try to put ich9 sound device at 00:1B.0 qemu: initially reserve one open pcie-root-port for hotplug qemu: propagate virQEMUDriver object to qemuDomainDeviceCalculatePCIConnectFlags qemu: assign vfio devices to PCIe addresses when appropriate src/conf/device_conf.h | 5 + src/conf/domain_addr.c | 112 ++- src/conf/domain_addr.h | 3 +- src/qemu/qemu_domain.c | 54 +- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_domain_address.c | 880 +++++++++++++++++---- src/qemu/qemu_domain_address.h | 9 +- src/qemu/qemu_hotplug.c | 28 +- src/qemu/qemu_process.c | 13 +- tests/qemuhotplugtest.c | 4 +- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 10 +- .../qemuxml2argv-bios-nvram-secure.args | 1 + .../qemuxml2argv-machine-smm-opt.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- .../qemuxml2argv-q35-default-devices-only.args | 23 + .../qemuxml2argv-q35-default-devices-only.xml | 18 + .../qemuxml2argv-q35-pcie-autoadd.args | 57 ++ .../qemuxml2argv-q35-pcie-autoadd.xml | 51 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args | 58 ++ tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml | 67 ++ .../qemuxml2argv-q35-pm-disable-fallback.args | 1 + .../qemuxml2argv-q35-pm-disable.args | 1 + .../qemuxml2argv-q35-virt-manager-basic.args | 56 ++ .../qemuxml2argv-q35-virt-manager-basic.xml | 76 ++ .../qemuxml2argv-q35-virtio-pci.args | 58 ++ .../qemuxml2argv-q35-virtio-pci.xml | 1 + tests/qemuxml2argvtest.c | 164 +++- .../qemuxml2xmlout-autoindex.xml | 10 +- .../qemuxml2xmlout-pcie-root.xml | 4 - .../qemuxml2xmlout-q35-default-devices-only.xml | 45 ++ .../qemuxml2xmlout-q35-pcie-autoadd.xml | 148 ++++ .../qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml | 152 ++++ .../qemuxml2xmlout-q35-virt-manager-basic.xml | 121 +++ .../qemuxml2xmlout-q35-virtio-pci.xml | 152 ++++ tests/qemuxml2xmltest.c | 136 +++- 35 files changed, 2285 insertions(+), 239 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-default-devices-only.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie-autoadd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pcie.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virtio-pci.xml -- 2.7.4

3 46

[libvirt] [PATCH] conf: Use UNIT_MAX for checking max value of unsigned int
by Nitesh Konkar 14 Nov '16

14 Nov '16

In the current scenario the controller parsing fails when no index is specified .As the docs point out that specifying index is optional, libvirt is expected to fill the index without erroring out. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Before the Patch: cat controller.xml <controller model="virtio-scsi" type="scsi" /> virsh attach-device vm1 controller.xml --persistent error: Failed to attach device from controller.xml error: internal error: Cannot parse controller index -1 After the patch: virsh attach-device vm1 controller.xml --persistent Device attached successfully --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e008e2..c52e67f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8374,7 +8374,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (idx) { unsigned int idxVal; if (virStrToLong_ui(idx, NULL, 10, &idxVal) < 0 || - idxVal > INT_MAX) { + idxVal > UINT_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse controller index %s"), idx); goto error; -- 2.1.0

3 3

[libvirt] [PATCH 0/2] Replace some leftover vshPrint calls with vshPrintExtra
by Erik Skultety 14 Nov '16

14 Nov '16

Erik Skultety (2): tools: use vshError rather than vshPrint on failure tools: Replace vshPrint with vshPrintExtra on places we forgot about tools/virsh-domain.c | 73 +++++++++++++++++++++++++------------------------ tools/virsh-edit.c | 4 +-- tools/virsh-interface.c | 28 +++++++++---------- tools/virsh-network.c | 37 +++++++++++++------------ tools/virsh-nwfilter.c | 6 ++-- tools/virsh-pool.c | 21 +++++++------- tools/virsh-snapshot.c | 20 +++++++------- tools/virsh-volume.c | 14 +++++----- tools/virt-admin.c | 4 +-- tools/vsh.c | 4 +-- 10 files changed, 107 insertions(+), 104 deletions(-) -- 2.5.5

2 6