- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Pass file descriptor when using TPM passthrough
by Stefan Berger 09 Sep '14

09 Sep '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Pass the TPM file descriptor to QEMU via command line. Instead of passing /dev/tpm0 we now pass /dev/fdset/10 and the additional parameters -add-fd set=10,fd=20. This addresses the use case when QEMU is started with non-root privileges and QEMU cannot open /dev/tpm0 for example. One problem is that for the passing of the file descriptor set to work, virCommandReorderFDs must not be called on the virCommand. This is prevented by setting a flag in the virCommandPassFDGetFDIndex that is checked to be clear when virCommandReorderFDs is run. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 132 ++++++++++++++++++++++++++++++++++++++++++++--- src/util/vircommand.c | 33 ++++++++++++ src/util/vircommand.h | 3 ++ 4 files changed, 162 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 10ebd12..b203398 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1149,6 +1149,7 @@ virCommandNewArgList; virCommandNewArgs; virCommandNonblockingFDs; virCommandPassFD; +virCommandPassFDGetFDIndex; virCommandPassListenFDs; virCommandRawStatus; virCommandRequireHandshake; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7b87a31..950d212 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -157,6 +157,58 @@ VIR_ENUM_IMPL(qemuNumaPolicy, VIR_DOMAIN_NUMATUNE_MEM_LAST, "interleave"); /** + * qemuVirCommandGetFDSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU -add-fd command line option + * for the given file descriptor. The file descriptor must previously + * have been 'transferred' in a virCommandPassFD() call. + * This function for example returns "set=10,fd=20". + */ +static char * +qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "set=%d,fd=%d", idx, fd) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + + return result; +} + +/** + * qemuVirCommandGetDevSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the QEMU path= parameter where a file + * descriptor is accessed via a file descriptor set, for example + * /dev/fdset/10. The file descriptor must previously have been + * 'transferred' in a virCommandPassFD() call. + */ +static char * +qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandPassFDGetFDIndex(cmd, fd); + + if (idx >= 0) { + ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx) < 0); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + return result; +} + + +/** * qemuPhysIfaceConnect: * @def: the definition of the VM (needed by 802.1Qbh and audit) * @driver: pointer to the driver instance @@ -5779,14 +5831,20 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, static char *qemuBuildTPMBackendStr(const virDomainDef *def, + virCommandPtr cmd, virQEMUCapsPtr qemuCaps, - const char *emulator) + const char *emulator, + int *tpmfd, int *cancelfd) { const virDomainTPMDef *tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = virDomainTPMBackendTypeToString(tpm->type); - char *cancel_path; + char *cancel_path = NULL; const char *tpmdev; + char *devset = NULL, *cancel_devset = NULL; + + *tpmfd = -1; + *cancelfd = -1; virBufferAsprintf(&buf, "%s,id=tpm-%s", type, tpm->info.alias); @@ -5799,11 +5857,47 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) goto error; - virBufferAddLit(&buf, ",path="); - virBufferEscape(&buf, ',', ",", "%s", tpmdev); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { + *tpmfd = open(tpmdev, O_RDWR); + if (*tpmfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device %s"), tpmdev); + goto error; + } + + virCommandPassFD(cmd, *tpmfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + devset = qemuVirCommandGetDevSet(cmd, *tpmfd); + if (devset == NULL) + goto error; + + *cancelfd = open(cancel_path, O_WRONLY); + if (*cancelfd < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not open TPM device's cancel path " + "%s"), cancel_path); + goto error; + } + + virCommandPassFD(cmd, *cancelfd, + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + cancel_devset = qemuVirCommandGetDevSet(cmd, *cancelfd); + if (cancel_devset == NULL) + goto error; + + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", devset); - virBufferAddLit(&buf, ",cancel-path="); - virBufferEscape(&buf, ',', ",", "%s", cancel_path); + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_devset); + } else { + /* all test cases will use this path */ + virBufferAddLit(&buf, ",path="); + virBufferEscape(&buf, ',', ",", "%s", tpmdev); + + virBufferAddLit(&buf, ",cancel-path="); + virBufferEscape(&buf, ',', ",", "%s", cancel_path); + } VIR_FREE(cancel_path); break; @@ -5823,6 +5917,10 @@ static char *qemuBuildTPMBackendStr(const virDomainDef *def, emulator, type); error: + VIR_FREE(devset); + VIR_FREE(cancel_devset); + VIR_FREE(cancel_path); + virBufferFreeAndReset(&buf); return NULL; } @@ -8770,13 +8868,33 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->tpm) { char *optstr; + int tpmfd = -1; + int cancelfd = -1; + char *fdset; - if (!(optstr = qemuBuildTPMBackendStr(def, qemuCaps, emulator))) + if (!(optstr = qemuBuildTPMBackendStr(def, cmd, qemuCaps, emulator, + &tpmfd, &cancelfd))) goto error; virCommandAddArgList(cmd, "-tpmdev", optstr, NULL); VIR_FREE(optstr); + if (tpmfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, tpmfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + } + + if (cancelfd >= 0) { + fdset = qemuVirCommandGetFDSet(cmd, cancelfd); + if (!fdset) + goto error; + + virCommandAddArgList(cmd, "-add-fd", fdset, NULL); + } + if (!(optstr = qemuBuildTPMDevStr(def, qemuCaps, emulator))) goto error; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index cbe94f8..fd70e78 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -67,6 +67,7 @@ enum { VIR_EXEC_RUN_SYNC = (1 << 3), VIR_EXEC_ASYNC_IO = (1 << 4), VIR_EXEC_LISTEN_FDS = (1 << 5), + VIR_EXEC_FIXED_FDS = (1 << 6), }; typedef struct _virCommandFD virCommandFD; @@ -214,6 +215,12 @@ virCommandReorderFDs(virCommandPtr cmd) if (!cmd || cmd->has_error || !cmd->npassfd) return; + if ((cmd->flags & VIR_EXEC_FIXED_FDS)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("The fds are fixed and cannot be reordered")); + goto error; + } + for (i = 0; i < cmd->npassfd; i++) maxfd = MAX(cmd->passfd[i].fd, maxfd); @@ -1020,6 +1027,32 @@ virCommandPassListenFDs(virCommandPtr cmd) cmd->flags |= VIR_EXEC_LISTEN_FDS; } +/* + * virCommandPassFDGetFDIndex: + * @cmd: pointer to virCommand + * @fd: FD to get index of + * + * Determine the index of the FD in the transfer set. + * + * Returns index >= 0 if @set contains @fd, + * -1 otherwise. + */ +int +virCommandPassFDGetFDIndex(virCommandPtr cmd, int fd) +{ + size_t i = 0; + + while (i < cmd->npassfd) { + if (cmd->passfd[i].fd == fd) { + cmd->flags |= VIR_EXEC_FIXED_FDS; + return i; + } + i++; + } + + return -1; +} + /** * virCommandSetPidFile: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index bf65de4..198da2f 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -62,6 +62,9 @@ void virCommandPassFD(virCommandPtr cmd, void virCommandPassListenFDs(virCommandPtr cmd); +int virCommandPassFDGetFDIndex(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2); -- 1.9.3

1 0

[libvirt] [PATCH] network: check for invalid forward delay time
by Erik Skultety 09 Sep '14

09 Sep '14

When spanning tree protocol is allowed in bridge settings, forward delay value is set as well (default is 0 if omitted). Until now, there was no check for delay value validity. Delay makes sense only as a positive numerical value. Note: However, even if you provide positive numerical value, brctl utility only uses values from range <2,30>, so the number provided can be modified (kernel most likely) to fall within this range. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1125764 --- docs/schemas/network.rng | 2 +- src/conf/network_conf.c | 18 +++++++++++++----- src/util/virxml.c | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 0e7da89..ab41814 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -62,7 +62,7 @@ <optional> <attribute name="delay"> - <data type="integer"/> + <data type="unsignedLong"/> </attribute> </optional> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 9571ee1..4d6db8c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2016,6 +2016,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) xmlNodePtr save = ctxt->node; xmlNodePtr bandwidthNode = NULL; xmlNodePtr vlanNode; + int ret = 0; if (VIR_ALLOC(def) < 0) return NULL; @@ -2078,8 +2079,15 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) stp = virXPathString("string(./bridge[1]/@stp)", ctxt); def->stp = (stp && STREQ(stp, "off")) ? false : true; - if (virXPathULong("string(./bridge[1]/@delay)", ctxt, &def->delay) < 0) - def->delay = 0; + ret = virXPathULong("string(./bridge[1]/@delay)", ctxt, &def->delay); + if (ret == -2) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid delay value in network '%s'"), + def->name); + goto error; + } else if (ret < 0) { + def->delay = 0; + } tmp = virXPathString("string(./mac[1]/@address)", ctxt); if (tmp) { @@ -2126,7 +2134,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; /* parse each portgroup */ for (i = 0; i < nPortGroups; i++) { - int ret = virNetworkPortGroupParseXML(&def->portGroups[i], + ret = virNetworkPortGroupParseXML(&def->portGroups[i], portGroupNodes[i], ctxt); if (ret < 0) goto error; @@ -2147,7 +2155,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; /* parse each addr */ for (i = 0; i < nIps; i++) { - int ret = virNetworkIPDefParseXML(def->name, ipNodes[i], + ret = virNetworkIPDefParseXML(def->name, ipNodes[i], ctxt, &def->ips[i]); if (ret < 0) goto error; @@ -2168,7 +2176,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; /* parse each definition */ for (i = 0; i < nRoutes; i++) { - int ret = virNetworkRouteDefParseXML(def->name, routeNodes[i], + ret = virNetworkRouteDefParseXML(def->name, routeNodes[i], ctxt, &def->routes[i]); if (ret < 0) goto error; diff --git a/src/util/virxml.c b/src/util/virxml.c index cc4a85c..f730f5e 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -286,7 +286,7 @@ virXPathULongBase(const char *xpath, ctxt->node = relnode; if ((obj != NULL) && (obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0)) { - if (virStrToLong_ul((char *) obj->stringval, NULL, base, value) < 0) + if (virStrToLong_ulp((char *) obj->stringval, NULL, base, value) < 0) ret = -2; } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { -- 1.9.3

2 2

[libvirt] [PATCH 0/6] Add support for fetching statistics of completed jobs
by Jiri Denemark 09 Sep '14

09 Sep '14

Using virDomainGetJobStats, we can monitor running jobs but sometimes it may be useful to get statistics about a job that already finished, for example, to get the final amount of data transferred during migration or to get an idea about total downtime. This is what the following patches are about. Jiri Denemark (6): Refactor job statistics Add support for fetching statistics of completed jobs virsh: Add support for completed job stats qemu: Transfer migration statistics to destination qemu: Recompute downtime and total time when migration completes qemu: Transfer recomputed stats back to source include/libvirt/libvirt.h.in | 11 ++ src/libvirt.c | 11 +- src/qemu/qemu_domain.c | 186 +++++++++++++++++++++++++- src/qemu/qemu_domain.h | 27 +++- src/qemu/qemu_driver.c | 130 ++++-------------- src/qemu/qemu_migration.c | 304 ++++++++++++++++++++++++++++++++++++------- src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_process.c | 9 +- tools/virsh-domain.c | 27 +++- tools/virsh.pod | 8 +- 10 files changed, 545 insertions(+), 171 deletions(-) -- 2.1.0

2 16

Re: [libvirt] [Xen-devel] [libvirt bisection] complete build-armhf-libvirt
by Ian Campbell 09 Sep '14

09 Sep '14

Xen's automated testing of libvirt against newer Xen's has found a build issue which it has bisected down to "blockcopy: expose new API in virsh". An instance of the failure can be found in flight 30154: http://lists.xen.org/archives/html/xen-devel/2014-09/msg01063.html links to the logs => http://www.chiark.greenend.org.uk/~xensrcts/logs/30154/ click the header of a failing column => http://www.chiark.greenend.org.uk/~xensrcts/logs/30154/build-armhf-libvirt/… click the failing step => http://www.chiark.greenend.org.uk/~xensrcts/logs/30154/build-armhf-libvirt/… virsh-domain.c: In function 'cmdBlockCopy': virsh-domain.c:2003:17: error: comparison is always false due to limited range of data type [-Werror=type-limits] cc1: all warnings being treated as errors It seems to be failing similarly on i386 and I suppose most 32-bit arches. Cheers, Ian. On Mon, 2014-09-08 at 19:30 +0100, xen.org wrote: > branch xen-unstable > xen branch xen-unstable > job build-armhf-libvirt > test libvirt-build > > Tree: gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > Tree: libvirt git://libvirt.org/libvirt.git > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > Tree: xen git://xenbits.xen.org/xen.git > > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > Bug introduced: c1d75deea228e7f4a7462aef143e18c456b2a82c > Bug not present: 0e8bed817705664764db408c93ba54277ef85157 > > > commit c1d75deea228e7f4a7462aef143e18c456b2a82c > Author: Eric Blake <eblake(a)redhat.com> > Date: Fri Aug 29 15:47:28 2014 -0600 > > blockcopy: expose new API in virsh > > Expose the new power of virDomainBlockCopy through virsh (well, > all but the finer-grained bandwidth, as that is its own can of > worms for a later patch). Continue to use the older API where > possible, for maximum compatibility. > > The command now requires either --dest (with optional --format > and --blockdev), to directly describe the file destination, or > --xml, to name a file that contains an XML description such as: > > <disk type='network'> > <driver type='raw'/> > <source protocol='gluster' name='vol1/img'> > <host name='red'/> > </source> > </disk> > > [well, it may be a while before the qemu driver is actually patched > to act on that particular xml beyond just parsing it, but the virsh > interface won't need changing at that time] > > Non-zero option parameters are converted into virTypedParameters, > and if anything requires the new API, the command can synthesize > appropriate XML even if the --dest option was used instead of --xml. > > The existing --raw flag remains for back-compat, but the preferred > spelling is now --format=raw, since the new API now allows us > to specify all formats rather than just a boolean raw to suppress > probing. > > I hope I did justice in describing the effects of granularity and > buf-size on how they get passed through to qemu. > > * tools/virsh-domain.c (cmdBlockCopy): Add new options --xml, > --granularity, --buf-size, --format. Make --raw an alias for > --format=raw. Call new API if new parameters are in use. > * tools/virsh.pod (blockcopy): Document new options. > > Signed-off-by: Eric Blake <eblake(a)redhat.com> > > > For bisection revision-tuple graph see: > http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.libvirt.build-ar… > Revision IDs in each graph node refer, respectively, to the Trees above. > > ---------------------------------------- > Searching for failure / basis pass: > 30154 fail [host=marilith-n4] / 30147 ok. > Failure / basis pass flights: 30154 / 30147 > Tree: gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > Tree: libvirt git://libvirt.org/libvirt.git > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > Tree: xen git://xenbits.xen.org/xen.git > Latest 2bf7326e10fae4abef536486aa9819331596c379 a48362cdfeb5c948218a2e4bf7cc9354082fc1b6 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > Basis pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0eaad0a39c67bdddc56d608ff28fcb490c12b8b3 ea772ca487e219e5d5b82d50da460c4145238038 c33fe5459732fc85c2c279c5e8ed316b8601c58c > Generating revisions with ./adhoc-revtuple-generator git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… git://libvirt.org/libvirt.git#0eaad0a39c67bdddc56d608ff28fcb490c12b8b3-a483… git://xenbits.xen.org/staging/qemu-upstream-unstable.git#ea772ca487e219e5d5… git://xenbits.xen.org/xen.git#c33fe5459732fc85c2c279c5e8ed316b8601c58c-93d5… > + exec > + sh -xe > + cd /export/home/osstest/repos/gnulib > + git remote set-url origin git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/xen > + git remote set-url origin git://drall.uk.xensource.com:9419/git://xenbits.xen.org/xen.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/gnulib > + git remote set-url origin git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/xen > + git remote set-url origin git://drall.uk.xensource.com:9419/git://xenbits.xen.org/xen.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > Loaded 3001 nodes in revision graph > Searching for test results: > 30147 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0eaad0a39c67bdddc56d608ff28fcb490c12b8b3 ea772ca487e219e5d5b82d50da460c4145238038 c33fe5459732fc85c2c279c5e8ed316b8601c58c > 30162 fail 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d c1d75deea228e7f4a7462aef143e18c456b2a82c ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30159 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0eaad0a39c67bdddc56d608ff28fcb490c12b8b3 ea772ca487e219e5d5b82d50da460c4145238038 c33fe5459732fc85c2c279c5e8ed316b8601c58c > 30167 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0e8bed817705664764db408c93ba54277ef85157 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30154 fail 2bf7326e10fae4abef536486aa9819331596c379 a48362cdfeb5c948218a2e4bf7cc9354082fc1b6 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30161 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0eaad0a39c67bdddc56d608ff28fcb490c12b8b3 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30160 fail 2bf7326e10fae4abef536486aa9819331596c379 a48362cdfeb5c948218a2e4bf7cc9354082fc1b6 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30163 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0e8bed817705664764db408c93ba54277ef85157 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30165 pass 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0e8bed817705664764db408c93ba54277ef85157 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30164 fail 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d c1d75deea228e7f4a7462aef143e18c456b2a82c ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30166 fail 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d c1d75deea228e7f4a7462aef143e18c456b2a82c ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > 30168 fail 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d c1d75deea228e7f4a7462aef143e18c456b2a82c ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > Searching for interesting versions > Result found: flight 30147 (pass), for basis pass > Result found: flight 30154 (fail), for basis failure > Repro found: flight 30159 (pass), for basis pass > Repro found: flight 30160 (fail), for basis failure > 0 revisions at 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d 0e8bed817705664764db408c93ba54277ef85157 ea772ca487e219e5d5b82d50da460c4145238038 93d5f192d4903953baa8c2115534d23140236176 > No revisions left to test, checking graph state. > Result found: flight 30163 (pass), for last pass > Result found: flight 30164 (fail), for first failure > Repro found: flight 30165 (pass), for last pass > Repro found: flight 30166 (fail), for first failure > Repro found: flight 30167 (pass), for last pass > Repro found: flight 30168 (fail), for first failure > > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > Bug introduced: c1d75deea228e7f4a7462aef143e18c456b2a82c > Bug not present: 0e8bed817705664764db408c93ba54277ef85157 > > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > > commit c1d75deea228e7f4a7462aef143e18c456b2a82c > Author: Eric Blake <eblake(a)redhat.com> > Date: Fri Aug 29 15:47:28 2014 -0600 > > blockcopy: expose new API in virsh > > Expose the new power of virDomainBlockCopy through virsh (well, > all but the finer-grained bandwidth, as that is its own can of > worms for a later patch). Continue to use the older API where > possible, for maximum compatibility. > > The command now requires either --dest (with optional --format > and --blockdev), to directly describe the file destination, or > --xml, to name a file that contains an XML description such as: > > <disk type='network'> > <driver type='raw'/> > <source protocol='gluster' name='vol1/img'> > <host name='red'/> > </source> > </disk> > > [well, it may be a while before the qemu driver is actually patched > to act on that particular xml beyond just parsing it, but the virsh > interface won't need changing at that time] > > Non-zero option parameters are converted into virTypedParameters, > and if anything requires the new API, the command can synthesize > appropriate XML even if the --dest option was used instead of --xml. > > The existing --raw flag remains for back-compat, but the preferred > spelling is now --format=raw, since the new API now allows us > to specify all formats rather than just a boolean raw to suppress > probing. > > I hope I did justice in describing the effects of granularity and > buf-size on how they get passed through to qemu. > > * tools/virsh-domain.c (cmdBlockCopy): Add new options --xml, > --granularity, --buf-size, --format. Make --raw an alias for > --format=raw. Call new API if new parameters are in use. > * tools/virsh.pod (blockcopy): Document new options. > > Signed-off-by: Eric Blake <eblake(a)redhat.com> > > Revision graph left in /home/xc_osstest/results/bisect.libvirt.build-armhf-libvirt.libvirt-build.{dot,ps,png,html}. > ---------------------------------------- > 30168: tolerable ALL FAIL > > flight 30168 libvirt real-bisect [real] > http://www.chiark.greenend.org.uk/~xensrcts/logs/30168/ > > Failures :-/ but no regressions. > > Tests which did not succeed, > including tests which could not be run: > build-armhf-libvirt 5 libvirt-build fail baseline untested > > > jobs: > build-armhf-libvirt fail > > > ------------------------------------------------------------ > sg-report-flight on osstest.cam.xci-test.com > logs: /home/xc_osstest/logs > images: /home/xc_osstest/images > > Logs, config files, etc. are available at > http://www.chiark.greenend.org.uk/~xensrcts/logs > > Test harness code can be found at > http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary > > > _______________________________________________ > Xen-devel mailing list > Xen-devel(a)lists.xen.org > http://lists.xen.org/xen-devel

3 3

[libvirt] [PATCH v3 00/18] Implement virDomainBlockCopy
by Eric Blake 09 Sep '14

09 Sep '14

Took me longer than I wanted to get v3 posted. There's lots of new patches in this version, based on feedback on v2. Among other things, the bandwidth of virDomainBlockCopy is in bytes/s, and all the remaining interfaces are updated to use a flags value to decide whether to use bytes/s instead of the back-compat MiB/s. I really want patch 1 in 1.2.8; pasth 2-17 would be nice but it may be better to delay to later, and I still don't have virsh updated to cover the changed proposed in patch 18 so that one should probably wait. Eric Blake (18): blockcopy: allow larger buf-size blockjob: shuffle block rebase code blockjob: split out block info driver handling blockjob: split out block info monitor handling blockjob: hoist bandwidth scaling out of monitor code blockjob: allow finer bandwidth tuning for query blockjob: split up virsh blockjob info blockjob: add new --raw flag to virsh blockjob blockjob: add new --bytes flag to virsh blockjob blockcopy: allow block device destination blockcopy: split out virsh implementation blockcopy: expose new API in virsh blockcopy: remote implementation for new API blockcopy: tweak how rebase calls into copy blockcopy: add a way to parse disk source blockcopy: add qemu implementation of new API blockcopy: add qemu implementation of new tunables blockjob: allow finer bandwidth tuning for set speed include/libvirt/libvirt.h.in | 77 +++-- src/conf/domain_conf.c | 107 ++++-- src/conf/domain_conf.h | 4 + src/libvirt.c | 99 ++++-- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 382 ++++++++++++++++----- src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_monitor.c | 108 +++--- src/qemu/qemu_monitor.h | 16 +- src/qemu/qemu_monitor_json.c | 80 +++-- src/qemu/qemu_monitor_json.h | 9 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 +- src/remote_protocol-structs | 11 + tests/qemumonitorjsontest.c | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 +- tools/virsh-domain.c | 336 ++++++++++++++---- tools/virsh.c | 2 + tools/virsh.h | 2 + tools/virsh.pod | 65 ++-- 20 files changed, 975 insertions(+), 359 deletions(-) -- 1.9.3

3 59

[libvirt] ANNOUNCE: libvirt 1.1.3.6 maintenance release
by Cole Robinson 08 Sep '14

08 Sep '14

libvirt 1.1.3.6 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.6.tar.gz Changes in this version: * fix api changes in xen restore * maint: fix typo in previous patch * maint: cleanup detection of const'ness of selinux ctx * build: fix build with libselinux 2.3 * virerror: Fix an error message typo * storage: Report error from VolOpen by default * storage: Rename VolOpenCheckMode to VolOpen * storage: move block format lookup to shared UpdateVolInfo * storage: Rename UpdateVolInfoFlags to UpdateVolInfo * LXC: fix the problem that libvirt lxc fail to start on latest kernel * Fix pci bus naming for PPC * libxl: Check for control_d string to decide about dom0 * Free ifname in testDomainGenerateIfnames * Don't include @LIBS@ in libvirt.pc.in file * qemu: copy: Accept 'format' parameter when copying to a non-existing img * build: fix 'make check' with newer git * docs: publish correct enum values * qemu: blockcopy: Don't remove existing disk mirror info * LSN-2014-0003: Don't expand entities when parsing XML * libxl: fix framebuffer port setting for HVM domains For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] blockjob: avoid 32-bit compilation warning
by Eric Blake 08 Sep '14

08 Sep '14

Commit c1d75de caused this warning on 32-bit platforms (fatal when -Werror is enabled): virsh-domain.c: In function 'cmdBlockCopy': virsh-domain.c:2003:17: error: comparison is always false due to limited range of data type [-Werror=type-limits] Forcing the left side of the < to be ull instead of ul shuts up the 32-bit compiler while still protecting 64-bit code from overflow. * tools/virsh-domain.c (cmdBlockCopy): Add type coercion. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 39ff798..ed2e3ea 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2000,7 +2000,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (bandwidth) { /* bandwidth is ulong MiB/s, but the typed parameter is * ullong bytes/s; make sure we don't overflow */ - if (bandwidth > ULLONG_MAX >> 20) { + if (bandwidth + 0ULL > ULLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX >> 20); -- 1.9.3

2 2

[libvirt] [PATCH] util: let virSetSockReuseAddr report unified error message
by Martin Kletzander 08 Sep '14

08 Sep '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/rpc/virnetsocket.c | 7 ++----- src/util/virportallocator.c | 5 +---- src/util/virutil.c | 13 ++++++++++--- src/util/virutil.h | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 586a0d7..2192dc8 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -278,10 +278,8 @@ int virNetSocketNewListenTCP(const char *nodename, goto error; } - if (virSetSockReuseAddr(fd) < 0) { - virReportSystemError(errno, "%s", _("Unable to enable port reuse")); + if (virSetSockReuseAddr(fd, true) < 0) goto error; - } #ifdef IPV6_V6ONLY if (runp->ai_family == PF_INET6) { @@ -493,9 +491,8 @@ int virNetSocketNewConnectTCP(const char *nodename, goto error; } - if (virSetSockReuseAddr(fd) < 0) { + if (virSetSockReuseAddr(fd, false) < 0) VIR_WARN("Unable to enable port reuse"); - } if (connect(fd, runp->ai_addr, runp->ai_addrlen) >= 0) break; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index ff5691a..f1dade3 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -142,11 +142,8 @@ static int virPortAllocatorBindToPort(bool *used, goto cleanup; } - if (virSetSockReuseAddr(fd) < 0) { - virReportSystemError(errno, "%s", - _("Unable to set socket reuse addr flag")); + if (virSetSockReuseAddr(fd, true) < 0) goto cleanup; - } if (ipv6 && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&v6only, sizeof(v6only)) < 0) { diff --git a/src/util/virutil.c b/src/util/virutil.c index 04113bb..8d2f62a 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -148,7 +148,7 @@ int virSetCloseExec(int fd) } #ifdef WIN32 -int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED) +int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED, bool fatal ATTRIBUTE_UNUSED) { /* * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT @@ -163,10 +163,17 @@ int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED) return 0; } #else -int virSetSockReuseAddr(int fd) +int virSetSockReuseAddr(int fd, bool fatal) { int opt = 1; - return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + int ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + + if (ret < 0 && fatal) { + virReportSystemError(errno, "%s", + _("Unable to set socket reuse addr flag")); + } + + return ret; } #endif diff --git a/src/util/virutil.h b/src/util/virutil.h index 89b7923..54f1148 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -43,7 +43,7 @@ int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; int virSetInherit(int fd, bool inherit) ATTRIBUTE_RETURN_CHECK; int virSetCloseExec(int fd) ATTRIBUTE_RETURN_CHECK; -int virSetSockReuseAddr(int fd) ATTRIBUTE_RETURN_CHECK; +int virSetSockReuseAddr(int fd, bool fatal) ATTRIBUTE_RETURN_CHECK; int virPipeReadUntilEOF(int outfd, int errfd, char **outbuf, char **errbuf); -- 2.1.0

2 1

[libvirt] [PATCH v3] esx: Add the actual product version to the error message.
by Richard W.M. Jones 08 Sep '14

08 Sep '14

v3: - Split the long lines. Rich.

1 1

[libvirt] [PATCH v2] esx: Add the actual product version to the error message.
by Richard W.M. Jones 08 Sep '14

08 Sep '14

Ugh, printing the wrong field in the second error message. Try again with that fixed. Rich.

2 2