- Devel - libvirt List Archives

[libvirt] [PATCH] Replacing for (; ; ) with while (1) for better code.
by Nitesh Konkar 23 Sep '16

23 Sep '16

As mentioned in https://libvirt.org/hacking.html, using while (1) is better than for (;;). --- src/libvirt-stream.c | 4 ++-- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetclient.c | 6 +++--- src/security/security_selinux.c | 2 +- src/util/vircgroup.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdbus.c | 4 ++-- src/util/virfile.c | 2 +- tests/commandhelper.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 8384b37..41daaa1 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -349,7 +349,7 @@ virStreamSendAll(virStreamPtr stream, if (VIR_ALLOC_N(bytes, want) < 0) goto cleanup; - for (;;) { + while (1) { int got, offset = 0; got = (handler)(stream, bytes, want, opaque); if (got < 0) { @@ -443,7 +443,7 @@ virStreamRecvAll(virStreamPtr stream, if (VIR_ALLOC_N(bytes, want) < 0) goto cleanup; - for (;;) { + while (1) { int got, offset = 0; got = virStreamRecv(stream, bytes, want); if (got < 0) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 3dd8927..50cf1ae 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -187,7 +187,7 @@ phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status, if (rc != 0) goto err; - for (;;) { + while (1) { /* loop until we block */ do { rc = libssh2_channel_read(channel, buffer, buffer_size); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8a220d9..bc7d268 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4398,7 +4398,7 @@ static void qemuMigrationIOFunc(void *arg) fds[0].fd = data->sock; fds[1].fd = data->wakeupRecvFD; - for (;;) { + while (1) { int ret; fds[0].events = fds[1].events = POLLIN; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 3b8b796..b0c4440 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4055,7 +4055,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* Loop-the-loop... * Even if the server has completed, the client must *always* do at least one step * in this loop to verify the server isn't lying about something. Mutual auth */ - for (;;) { + while (1) { if ((err = virNetSASLSessionClientStep(sasl, serverin, serverinlen, diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 361dc1a..f3457be 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -777,7 +777,7 @@ int virNetClientSetTLSSession(virNetClientPtr client, virNetSocketSetTLSSession(client->sock, client->tls); - for (;;) { + while (1) { ret = virNetTLSSessionHandshake(client->tls); if (ret < 0) @@ -1258,7 +1258,7 @@ virNetClientIOHandleInput(virNetClientPtr client) /* Read as much data as is available, until we get * EAGAIN */ - for (;;) { + while (1) { ssize_t ret; if (client->msg.nfds == 0) { @@ -1463,7 +1463,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, fds[0].fd = virNetSocketGetFD(client->sock); fds[1].fd = client->wakeupReadFD; - for (;;) { + while (1) { char ignore; sigset_t oldmask, blockedsigs; int timeout = -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 4be946d..153e6e9 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -137,7 +137,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, VIR_DEBUG("Using sensitivity level '%s' cat min %d max %d range %d", sens, catMin, catMax, catRange); - for (;;) { + while (1) { int c1 = virRandomInt(catRange); int c2 = virRandomInt(catRange); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8b52816..cc83cf7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1587,7 +1587,7 @@ virCgroupNewMachineSystemd(const char *name, goto cleanup; - for (;;) { + while (1) { virCgroupPtr tmp; char *t = strchr(offset + 1, '/'); if (t) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 2a59bd1..bfc130d 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2033,7 +2033,7 @@ virCommandProcessIO(virCommandPtr cmd) goto cleanup; ret = -1; - for (;;) { + while (1) { size_t i; struct pollfd fds[3]; int nfds = 0; diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 3f4dbe3..413229c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -627,7 +627,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, narray = (size_t)-1; nstruct = strlen(types); - for (;;) { + while (1) { const char *t; VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu types='%s'", @@ -904,7 +904,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, narray = (size_t)-1; nstruct = strlen(types); - for (;;) { + while (1) { const char *t; bool advanceiter = true; diff --git a/src/util/virfile.c b/src/util/virfile.c index a45279a..f246b29 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1269,7 +1269,7 @@ saferead_lim(int fd, size_t max_len, size_t *length) size_t size = 0; int save_errno; - for (;;) { + while (1) { int count; int requested; diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 015efda..5a77108 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -138,7 +138,7 @@ int main(int argc, char **argv) { fprintf(stderr, "BEGIN STDERR\n"); fflush(stderr); - for (;;) { + while (1) { got = read(STDIN_FILENO, buf, sizeof(buf)); if (got < 0) goto cleanup; -- 2.1.0

2 2

[libvirt] [PATCH 0/9] Couple of vhost-user fixes and cleanups
by Michal Privoznik 23 Sep '16

23 Sep '16

While working on this, I've discovered a qemu crasher [1], so there are not tested properly. If you have pointers how to test vhost-user without need to install openvswitch, I'm all ears. 1: http://lists.nongnu.org/archive/html/qemu-devel/2016-08/msg02933.html Michal Privoznik (9): qemuDomainAttachNetDevice: Explicitly list allowed types for hotplug qemuDomain{Attach,Remove}NetDevice: Prefer qemuDomainSupportsNetdev qemuBuildChrChardevStr: Introduce @nowait argument qemuBuildVhostuserCommandLine: Reuse qemuBuildChrChardevStr qemuBuildHostNetStr: Realign qemuBuildHostNetStr: Explicitly enumerate net types qemuBuildVhostuserCommandLine: Unify -netdev creation qemuBuildHostNetStr: Support VIR_DOMAIN_NET_TYPE_VHOSTUSER qemu_hotplug: Support interface type of vhost-user hotplug src/qemu/qemu_command.c | 169 ++++++++++++--------- src/qemu/qemu_hotplug.c | 83 ++++++++-- .../qemuxml2argv-net-vhostuser-multiq.args | 6 +- .../qemuxml2argv-net-vhostuser.args | 4 +- 4 files changed, 176 insertions(+), 86 deletions(-) -- 2.8.4

4 25

[libvirt] [PATCH] virsh: send-process-signal: add support for '-NUM' style of signal nums
by Chen Hanxiao 23 Sep '16

23 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As kill(1), add support for sending signal in form of "9" as well as "-9". Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7194153..b96b8fd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8254,9 +8254,14 @@ static int getSignalNumber(vshControl *ctl, const char *signame) for (i = 0; signame[i]; i++) lower[i] = c_tolower(signame[i]); + if (STRPREFIX(lower, "-")) + lower += 1; + if (virStrToLong_i(lower, NULL, 10, &signum) >= 0) goto cleanup; + lower = tmp; + if (STRPREFIX(lower, "sig_")) lower += 4; else if (STRPREFIX(lower, "sig")) -- 1.8.3.1

2 1

[libvirt] qemu - how add -object when no numa topology
by Safka, JaroslavX 23 Sep '16

23 Sep '16

Hi guys, I’m trying to figure out how to generate this arg line: “-object memory-backend-file,id=ram,mem-path=/var/lib/libvirt/qemu/,share=yes,size=14336 -numa node, memdev=ram” without numa. I see there are two functions which are capable of building backends: “qemuBuildNumaArgStr” and “qemuBuildMemoryDeviceCommandLine” The “qemuBuildNumaArgStr” I’m already using for creating backend+object when numa is enabled. But I’m not sure how to “activate” code inside “qemuBuildMemoryDeviceCommandLine” when numa is disabled. I found there must be (in xml) record “devices/memory” to create record def->mems. But I do not know if I should add this element into xml or I should allocate this structure by myself. Or create duplicated function, and create arg string with “-object …” inside on my own. This all is needed for new feature and new xml elements: (hugepages will not be used) <memoryBacking> <source type='file' path='/path/to/qemu'/> <access mode='shared'/> <allocation mode='immediate'/> </memoryBacking> Many thanks for any tips or help ☺ Best regards Jarek PS: I’m quite new in the libvirt code/community -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

1 0

[libvirt] [PATCH 0/8] cleanup and regenerate data for qemuhelptest
by Pavel Hrdina 23 Sep '16

23 Sep '16

Pavel Hrdina (8): qemuhelptest: remove downstream test data qemuhelptest: regenerate data for qemu-0.12.1 qemuhelptest: regenerate data for qemu-1.0 qemuhelptest: regenerate data for qemu-1.1.0 qemuhelptest: regenerate data for qemu-1.2.0 qemuhelptest: regenerate data for qemu-kvm-0.12.3 qemuhelptest: regenerate data for qemu-kvm-0.13.0 qemuhelptest: regenerate data for qemu-kvm-1.2.0 tests/qemuhelpdata/qemu-0.12.1 | 7 +- tests/qemuhelpdata/qemu-0.12.1-device | 62 ++++++ tests/qemuhelpdata/qemu-1.0 | 1 + tests/qemuhelpdata/qemu-1.0-device | 146 ++++++------- tests/qemuhelpdata/qemu-1.1.0 | 1 + tests/qemuhelpdata/qemu-1.1.0-device | 20 +- tests/qemuhelpdata/qemu-1.2.0 | 1 + tests/qemuhelpdata/qemu-1.2.0-device | 226 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60 | 227 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device | 57 ----- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 | 229 -------------------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device | 99 --------- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta | 230 --------------------- .../qemu-kvm-0.12.1.2-rhel62-beta-device | 120 ----------- tests/qemuhelpdata/qemu-kvm-0.12.3 | 7 +- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 ++++++ tests/qemuhelpdata/qemu-kvm-0.13.0 | 1 - tests/qemuhelpdata/qemu-kvm-0.13.0-device | 4 +- tests/qemuhelpdata/qemu-kvm-1.2.0 | 1 + tests/qemuhelptest.c | 150 ++------------ 20 files changed, 234 insertions(+), 1418 deletions(-) delete mode 100644 tests/qemuhelpdata/qemu-1.2.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device -- 2.10.0

2 16

[libvirt] [PATCH v2 0/3] pass the path of compress prog directly
by Chen Hanxiao 23 Sep '16

23 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This series will pass the path of compress programe directly to functions such as doCoreDump, qemuDomainSaveInternal, etc. this can avoid one extra virFindFileInPath call in during virExec. Also reduce code duplication by macros. Chen Hanxiao (3): qemu_driver: pass path of compress prog directly qemu_driver: simplify compress prog check by macros qemu_driver: pass path of compress prog directly to doCoreDump src/qemu/qemu_driver.c | 242 ++++++++++++++++++++++++++----------------------- 1 file changed, 128 insertions(+), 114 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH 0/7] Pass the path of compress program (redo)
by John Ferlan 23 Sep '16

23 Sep '16

Rather than try to describe what I was thinking about for the passing the compress program directly series from Chen Hanxiao: http://www.redhat.com/archives/libvir-list/2016-September/msg00677.html and http://www.redhat.com/archives/libvir-list/2016-August/msg01237.html I took the liberty of creating my own set of patches which should end in the more or less same result. The primary benefit is not calling virFileInPath twice since we already get it at least once for the various compressed program callers, let's pass what we originally found. John Ferlan (7): qemu: Move getCompressionType qemu: Adjust doCoreDump to call getCompressionType qemu: Introduce helper qemuGetCompressionProgram qemu: Remove getCompressionType qemu: Use qemuGetCompressionProgram for error paths qemu: Remove qemuCompressProgramAvailable qemu: Get/return compressedpath program src/qemu/qemu_driver.c | 235 +++++++++++++++++++++++-------------------------- 1 file changed, 111 insertions(+), 124 deletions(-) -- 2.7.4

2 10

[libvirt] ANNOUNCE: ruby-libvirt 0.7.0
by Chris Lalancette 22 Sep '16

22 Sep '16

I'm pleased to release ruby-libvirt 0.7.0. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.6.0 and 0.7.0 is: * Fix network lease API to allow arguments that libvirt allows * Implement VIRT_STORAGE_POOL_CREATE flags * Implement more VIR_STORAGE_VOL flags * Implement VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN * Implement virDomainDefineXMLFlags * Implement virDomainRename * Implement virDomainSetUserPassword * Implement VIR_DOMAIN_TIME_SYNC * Fix the return value from virStreamSourceFunc so volume upload works Version 0.7.0 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.7.0.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.7.0.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt Packages for it are also built for Fedora, and will be released shortly. As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette at gmail.com) and the libvirt mailing list. Thanks to those who contributed to this release.

1 0

[libvirt] [PATCH] qemu: Fix improper indention
by John Ferlan 22 Sep '16

22 Sep '16

Commit id 'ce61c164' indented wrong - not sure how I did that... Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under the trivial rule src/qemu/qemu_command.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f6d26b0..1ac0fa1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5041,20 +5041,20 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, telnet ? ",telnet" : "", dev->data.tcp.listen ? ",server,nowait" : ""); - if (cfg->chardevTLS) { - char *objalias = NULL; + if (cfg->chardevTLS) { + char *objalias = NULL; - if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, - dev->data.tcp.listen, - cfg->chardevTLSx509verify, - alias, qemuCaps) < 0) - goto error; + if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir, + dev->data.tcp.listen, + cfg->chardevTLSx509verify, + alias, qemuCaps) < 0) + goto error; - if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias))) - goto error; - virBufferAsprintf(&buf, ",tls-creds=%s", objalias); - VIR_FREE(objalias); - } + if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias))) + goto error; + virBufferAsprintf(&buf, ",tls-creds=%s", objalias); + VIR_FREE(objalias); + } break; case VIR_DOMAIN_CHR_TYPE_UNIX: -- 2.7.4

1 0

[libvirt] [PATCH] Fix Multiple Typos
by Nitesh Konkar 22 Sep '16

22 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/conf/storage_conf.c | 2 +- src/esx/esx_driver.c | 4 ++-- src/interface/interface_backend_udev.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5fede3d..dd34cec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14165,7 +14165,7 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, virDomainControllerDefPtr controller) { int idx; - /* Tenatively plan to insert controller at the end. */ + /* Tentatively plan to insert controller at the end. */ int insertAt = -1; virDomainControllerDefPtr current = NULL; @@ -19847,7 +19847,7 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, /* virDomainSourceDefFormatSeclabel: * - * This function automaticaly closes the <source> element and formats any + * This function automatically closes the <source> element and formats any * possible seclabels. */ static void diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d4a84c3..ce90c27 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -300,7 +300,7 @@ typedef enum { /* the backend driver used for PCI hostdev devices */ typedef enum { - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, /* detect automaticaly, prefer VFIO */ + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, /* detect automatically, prefer VFIO */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM, /* force legacy kvm style */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO, /* force vfio */ VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN, /* force legacy xen style, use pciback */ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 05a1a49..7e7bb72 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2476,7 +2476,7 @@ virStoragePoolSourceFindDuplicate(virConnectPtr conn, if (def->type != pool->def->type) continue; - /* Don't mach against ourself if re-defining existing pool ! */ + /* Don't match against ourself if re-defining existing pool ! */ if (STREQ(pool->def->name, def->name)) continue; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3d90b69..5ce98b3 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -78,7 +78,7 @@ esxFreePrivate(esxPrivate **priv) /* * Parse a file name from a .vmx file and convert it to datastore path format - * if possbile. A .vmx file can contain file names in various formats: + * if possible. A .vmx file can contain file names in various formats: * * - A single name referencing a file in the same directory as the .vmx file: * @@ -969,7 +969,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, STRNEQ(vCenterIPAddress, potentialVCenterIPAddress)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("This host is managed by a vCenter with IP " - "address %s, but a mismachting vCenter '%s' " + "address %s, but a mismatching vCenter '%s' " "(%s) has been specified"), potentialVCenterIPAddress, priv->parsedUri->vCenter, vCenterIPAddress); diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 27a772d..5d0fc64 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -884,7 +884,7 @@ udevGetIfaceDefBridge(struct udev *udev, goto error; ifacedef->data.bridge.nbItf = member_count; - /* Get the interface defintions for each member of the bridge */ + /* Get the interface definitions for each member of the bridge */ for (i = 0; i < member_count; i++) { ifacedef->data.bridge.itf[i] = udevGetIfaceDef(udev, member_list[i]->d_name); -- 2.1.0

2 1

[libvirt] [PATCH v2] qemu: enable user-defined cache bypassing while invoking
by fuweiwei 22 Sep '16

22 Sep '16

in the previous version, I mentioned the scenario of long-term pause while writing external memory checkpoints: v1: https://www.redhat.com/archives/libvir-list/2016-August/msg01194.html Daniel suggested not to hardcode the flag, but wire this upto the API. When the user invokes the snapshot they can request the VIR_DOMAIN_SAVE_BYPASS_CACHE flag explicitly. So in this version I introduce the --bypass-cache option in libvirt snapshot API. When invoking an external VM snapshots, we may use the command like this: virsh snapshot-create-as VM snap --memspec /path/to/memsnap --live --bypass-cache The VM snapshot can be done with inapparent VM suspend now. Without "--bypass-cache" flag, one may experience long-term VM suspend (so that the implication of "--live" option is not significant), provided that the VM has a large amount of dirty pages to save. Signed-off-by: fuweiwei <fuweiwei2(a)huawei.com> --- include/libvirt/libvirt-domain-snapshot.h | 3 +++ src/qemu/qemu_driver.c | 20 ++++++++++++++++++-- tools/virsh-snapshot.c | 12 ++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 0f73f24..aeff665 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -70,6 +70,9 @@ typedef enum { VIR_DOMAIN_SNAPSHOT_CREATE_LIVE = (1 << 8), /* create the snapshot while the guest is running */ + VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE = (1 << 9), i/* Bypass cache + while writing external + checkpoint files. */ } virDomainSnapshotCreateFlags; /* Take a snapshot of the current VM state */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2089359..d5f441f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14036,6 +14036,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + unsigned int save_memory_flag = 0; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. @@ -14116,8 +14117,12 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) goto cleanup; + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE) + save_memory_flag |= VIR_DOMAIN_SAVE_BYPASS_CACHE; + if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, compressed, resume, 0, + xml, compressed, resume, + save_memory_flag, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto cleanup; @@ -14224,7 +14229,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT | VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE | VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC | - VIR_DOMAIN_SNAPSHOT_CREATE_LIVE, NULL); + VIR_DOMAIN_SNAPSHOT_CREATE_LIVE | + VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE, NULL); VIR_REQUIRE_FLAG_RET(VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE, VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY, @@ -14297,6 +14303,16 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; } + /* the option of bypass cache is only supported for external checkpoints */ + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE && + (def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL || + redefine)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("only external memory snapshots support " + "cache bypass.")); + goto cleanup; + } + /* allow snapshots only in certain states */ switch ((virDomainState) vm->state.state) { /* valid states */ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index f879e7a..0627baf 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -160,6 +160,10 @@ static const vshCmdOptDef opts_snapshot_create[] = { .type = VSH_OT_BOOL, .help = N_("require atomic operation") }, + {.name = "bypass-cache", + .type = VSH_OT_BOOL, + .help = N_("bypass system cache while writing external checkpoints") + }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), {.name = NULL} }; @@ -191,6 +195,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "bypass-cache")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) goto cleanup; @@ -358,6 +364,10 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { .type = VSH_OT_BOOL, .help = N_("require atomic operation") }, + {.name = "bypass-cache", + .type = VSH_OT_BOOL, + .help = N_("bypass system cache while writing external checkpoints") + }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), {.name = "memspec", .type = VSH_OT_STRING, @@ -404,6 +414,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "bypass-cache")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BYPASS_CACHE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 1.9.5.msysgit.1

3 2

[libvirt] [PATCH 0/9] Couple of migration fixes
by Michal Privoznik 22 Sep '16

22 Sep '16

Looks like nobody tried migrations lately. I just did and found interesting bug. On the destination qemu binary was at different path. So I've dumped domain XML I was trying ti migrate and just changed the emulator path. All of a sudden I observed plenty of errors. Problem is that whilst parsing the user provided migration XML (and doing other operations on it), because of parse callbacks we need qemuCaps for the binary. However, we just take the def->emulator and expect it to exist. Well, it doesn't. Michal Privoznik (9): conf: Introduce virDomainDefPostParseOpaque conf: Introduce virDomainDefParseStringOpaque qemuDomainDefPostParse: Fetch qemuCaps from domain object conf: Extend virDomainDeviceDefPostParse for parseOpaque qemuDomainDeviceDefPostParse: Fetch caps from domain object conf: Extend virDomainDefAssignAddressesCallback for parseOpaque qemuDomainDefAssignAddresses: Fetch caps from domain object domain_conf: Introduce VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE conf: Skip post parse callbacks when creating copy src/bhyve/bhyve_domain.c | 6 ++-- src/conf/domain_conf.c | 80 +++++++++++++++++++++++++++++++++++++--------- src/conf/domain_conf.h | 43 +++++++++++++++++++++---- src/libvirt_private.syms | 3 ++ src/libxl/libxl_domain.c | 6 ++-- src/lxc/lxc_domain.c | 6 ++-- src/openvz/openvz_driver.c | 6 ++-- src/phyp/phyp_driver.c | 6 ++-- src/qemu/qemu_domain.c | 50 ++++++++++++++++++++++------- src/qemu/qemu_migration.c | 6 ++-- src/uml/uml_driver.c | 6 ++-- src/vbox/vbox_common.c | 6 ++-- src/vmware/vmware_driver.c | 6 ++-- src/vmx/vmx.c | 6 ++-- src/vz/vz_driver.c | 6 ++-- src/xen/xen_driver.c | 6 ++-- src/xenapi/xenapi_driver.c | 6 ++-- 17 files changed, 195 insertions(+), 59 deletions(-) -- 2.8.4

2 11

[libvirt] [PATCH v2 00/45] Enhance guest CPU configuration code
by Jiri Denemark 22 Sep '16

22 Sep '16

Version 2: - review comments addressed; see individual patches for details This patch series does several things: - fixes tests to avoid relying on bugs in our code - adds support for advertising supported CPU modes and models in domain capabilities - starts adding better and higher level APIs to our cpu driver (the old low level APIs will be removed once this process is over) - prepares qemu driver for asking QEMU what a host CPU looks like and what CPU models can be run on it - makes QEMU CPU command line builder build command line and nothing else The added part of domain capabilities XML looks like this: <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> <model fallback='allow'>Broadwell</model> <vendor>Intel</vendor> <feature policy='disable' name='aes'/> <feature policy='require' name='vmx'/> </mode> <mode name='custom' supported='yes'> <model usable='no'>Broadwell</model> <model usable='yes'>Broadwell-noTSX</model> ... </mode> </cpu> and host-passthrough is only advertised as supported for KVM domains, host-model is only supported when guest architecture is compatible with host and overall it should just work the way one would expect (in contrast to the current state of the code). Jiri Denemark (45): cpuGetModels: Switch to virArch domcaps: Add support for listing supported CPU models qemu: Use virDomainCapsCPUModels for cpuDefinitions qemuxml2argvtest: Rename extraFlags as qemuCaps qemuxml2argvtest: Rename "out" labels as "cleanup" qemuxml2argvtest: Get rid of testCompareXMLToArgvHelper qemuxml2argvtest: Reorder functions qemuxml2argvtest: Update qemuCaps after parsing domain XML qemuxml2argvtest: Properly initialize qemuCaps->arch testutilsqemu: Helpers for changing host CPU and arch testutilsqemu: Add default CPU for PPC64 architectures qemu: Separate guest CPU validation from command line creation qemuxml2argvtest: Properly setup CPU models in qemuCaps qemuxml2argvtest: Set correct architecture for KVM guests qemuxml2argvtest: Reorder CPU features qemu: Introduce virQEMUCapsGuestIsNative qemu: Fill in CPU domain capabilities cpu: Special case models == NULL in cpuGetModels cpu: Don't overwrite errors in cpuGetModels domcaps: Show only CPU models supported by libvirt domcaps: Add CPU usable flag schema: Separate CPU related definitions into cputypes.rng qemu: Propagate virCapsPtr to virQEMUCapsNewForBinaryInternal conf: Introduce virCPUDefCopyWithoutModel conf: Introduce virCPUDefStealModel conf: Introduce virCPUDefCopyModelFilter qemu: Store host-model CPU in qemu capabilities cpu: Drop false support for ARM cpu-model Show host model in domain capabilities qemu: Introduce virQEMUCapsGetHostModel qemu: Introduce virQEMUCapsIsCPUModeSupported cpu: Make x86ModelFromCPU easier to read cpu: Make x86ModelFromCPU a bit smarter cpu: Report error for unknown features in x86HasFeature cpu: Add x86FeatureInData cpu: Rework cpuUpdate cpu: Set nfeatures_max correctly in x86Decode cpu: Introduce virCPUTranslate cpu: Rename cpuHasFeature to virCPUDataCheckFeature cpu: Rework virCPUDataCheckFeature cpu: Introduce virCPUCheckFeature cpu: Document missing parameters for cpuCompare* cpu: Rework cpuCompare* APIs qemu: Update guest CPU def in live XML Move CMT feature filtering to QEMU driver docs/formatdomaincaps.html.in | 65 +++ docs/schemas/cputypes.rng | 135 ++++++ docs/schemas/domaincaps.rng | 60 +++ docs/schemas/domaincommon.rng | 129 +----- po/POTFILES.in | 1 + src/conf/cpu_conf.c | 64 ++- src/conf/cpu_conf.h | 21 + src/conf/domain_capabilities.c | 198 +++++++++ src/conf/domain_capabilities.h | 47 +++ src/cpu/cpu.c | 264 +++++++++--- src/cpu/cpu.h | 72 +++- src/cpu/cpu_arm.c | 79 ++-- src/cpu/cpu_ppc64.c | 48 ++- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 463 +++++++++++++-------- src/driver-hypervisor.h | 2 +- src/libvirt-host.c | 3 +- src/libvirt_private.syms | 20 +- src/libxl/libxl_driver.c | 14 +- src/qemu/qemu_capabilities.c | 394 +++++++++++++----- src/qemu/qemu_capabilities.h | 24 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 216 +++------- src/qemu/qemu_domain.c | 37 +- src/qemu/qemu_driver.c | 41 +- src/qemu/qemu_monitor.c | 12 +- src/qemu/qemu_monitor.h | 10 +- src/qemu/qemu_monitor_json.c | 24 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 95 ++++- src/test/test_driver.c | 12 +- src/vmware/vmware_conf.c | 6 +- tests/cputest.c | 24 +- .../cputestdata/x86-host+host-model-nofallback.xml | 2 +- tests/cputestdata/x86-host+host-model.xml | 2 +- .../x86-host+host-passthrough-features.xml | 4 + tests/cputestdata/x86-host+host-passthrough.xml | 19 +- tests/cputestdata/x86-host+min.xml | 27 +- tests/cputestdata/x86-host+pentium3.xml | 39 +- tests/cputestdata/x86-host-invtsc+host-model.xml | 2 +- .../cputestdata/x86-host-passthrough-features.xml | 4 + tests/domaincapsschemadata/basic.xml | 5 + tests/domaincapsschemadata/full.xml | 12 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenfv.xml | 5 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 5 + tests/domaincapsschemadata/libxl-xenpv.xml | 5 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 32 ++ .../qemu_2.6.0-gicv2-virt.aarch64.xml | 36 ++ .../qemu_2.6.0-gicv3-virt.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 36 ++ tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 10 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 36 ++ tests/domaincapstest.c | 78 +++- tests/qemucapabilitiestest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumonitorjsontest.c | 8 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 12 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.xml | 14 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 14 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-cmt.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 6 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 20 +- .../qemuxml2argv-graphics-spice-timeout.xml | 24 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.xml | 2 +- tests/qemuxml2argvtest.c | 312 +++++++------- .../qemuxml2xmlout-graphics-spice-timeout.xml | 24 +- tests/testutilsqemu.c | 128 ++++-- tests/testutilsqemu.h | 11 +- tools/virsh-host.c | 10 +- 80 files changed, 2473 insertions(+), 1137 deletions(-) create mode 100644 docs/schemas/cputypes.rng create mode 100644 tests/cputestdata/x86-host+host-passthrough-features.xml create mode 100644 tests/cputestdata/x86-host-passthrough-features.xml -- 2.10.0

2 48

[libvirt] [libvirt-php][PATCH 0/2] Couple of example fixes
by Michal Privoznik 22 Sep '16

22 Sep '16

Pushed under "I'm the PHP master" rule. Michal Privoznik (2): examples: Sort domains examples: Die early if getting a screenshot fails examples/index.php | 2 +- examples/libvirt.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.8.4

2 3

[libvirt] [PATCH] qemu: fix libvirtd crash in migration after vm shutdown
by weifuqiang 22 Sep '16

22 Sep '16

[PATCH] qemu: fix libvirtd crash in migration after vm shutdown If we shutdown a guest, then migrate it without the arg XML, libvirtd will get crashed. The reason is that: 1 during shutdown callback, qemuProcessStop() , it points vm->def to vm->newDef 2 during migration, it frees persistentDef, which points to vm->newDef when the arg XML is NULL. However, because vm->newDef is now vm->def, what we IN FACT freed is vm->def. 3 it will refer to vm->def after step2, thus invalid read/write causes libvirtd crash We needn't to free persistentDef if persist_xml is NULL, because no extra def was alloced if persistent_xml is NULL. --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6a683f7..3636c93 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4915,7 +4915,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, VIR_WARN("Unable to encode migration cookie"); } - if (persistDef != vm->newDef) + if (persist_xml && persistDef) virDomainDefFree(persistDef); qemuMigrationCookieFree(mig); -- 1.9.5.msysgit.1

3 3

[libvirt] [PATCH 0/7] IVSHMEM round two, this time with cookies
by Martin Kletzander 22 Sep '16

22 Sep '16

Actually just migration cookie flag. Also this version dropped the role and model to make everything more sunshine-n-unicorns. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1347049 Martin Kletzander (7): conf: Fix virDomainShmemDefFind qemu: Add capabilities for ivshmem-{plain,doorbell} qemu: Save various defaults for shmem qemu: Add qemuDomainSupportsNonLegacyShmem qemu: Disable migration with legacy ivshmem qemu: Support newer ivshmem device variants qemu: Add support for hot/cold-(un)plug of shmem devices docs/formatdomain.html.in | 6 +- src/conf/domain_conf.c | 4 +- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 109 +++++++++- src/qemu/qemu_command.h | 10 + src/qemu/qemu_domain.c | 24 +++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 39 +++- src/qemu/qemu_hotplug.c | 231 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 27 ++- .../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 | 6 + .../qemuhotplug-ivshmem-doorbell.xml | 3 + .../qemuhotplug-ivshmem-plain-detach.xml | 5 + .../qemuhotplug-ivshmem-plain.xml | 1 + ...muhotplug-base-live+ivshmem-doorbell-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-doorbell.xml | 63 ++++++ .../qemuhotplug-base-live+ivshmem-plain-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 57 +++++ .../qemuxml2argv-shmem-plain-doorbell.args | 46 ++++ .../qemuxml2argv-shmem-plain-doorbell.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 18 +- tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 10 +- 31 files changed, 685 insertions(+), 26 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 create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml -- 2.10.0

2 12

[libvirt] [PATCH 0/7] Fix some typos.
by Nitesh Konkar 22 Sep '16

22 Sep '16

*** BLURB HERE *** Nitesh Konkar (7): domain_conf.c:fix a typo domain_conf.h:fix a typo domain_conf.c:fix a typo storage_conf.c:fix a typo interface_backend_udev.c:fix a typo esx_driver.c:fix a typo esx_driver.c:fix a typo src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 2 +- src/conf/storage_conf.c | 2 +- src/esx/esx_driver.c | 4 ++-- src/interface/interface_backend_udev.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH 0/4] fix some libvirtd cleanup leaks and crashes
by Nikolay Shirokovskiy 22 Sep '16

22 Sep '16

Crash situation of last 2 patches can easily 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 && kill libvirtd If first 2 patches are not applied yet then make sure there is no admin server clients present. Nikolay Shirokovskiy (4): daemon: break cyclic deps between admin clients and daemon daemon: call free callbacks synchronously in event loop impl daemon: keep daemon until all hypervisors drivers are cleaned up qemu: first wait all workers finish on state cleanup daemon/libvirtd.c | 7 ++++- src/qemu/qemu_driver.c | 2 +- src/rpc/virnetdaemon.c | 1 + src/rpc/virnetsocket.c | 70 ++++++++++++++++++++++--------------------------- src/util/vireventpoll.c | 24 +++++++---------- 5 files changed, 50 insertions(+), 54 deletions(-) -- 1.8.3.1

2 6

Re: [libvirt] [RFC v2] libvirt vGPU QEMU integration
by Tian, Kevin 22 Sep '16

22 Sep '16

> From: Tian, Kevin > Sent: Thursday, September 22, 2016 10:33 AM > > > > > > Another example is class-specific attributes such > > > as 'resolution', etc. which you listed under 'display class'. All those > > > attributes should be moved to mdev directory. Only class ID is > > > required under each type. > > > > Can you elaborate on what you're proposing here? If we don't have > > attributes like 'resolution' under the type-id then we can't describe > > to the user the features of the mdev before we create it. I don't > > think anybody wants a 'create it and find out' type of interface. > > Thanks, > > > > I think such way would be racy. What about two clients creating mdev > devices simultaneously? How to guarantee their configuration of class > specific attributes not mutual-impacted since before creation any such > configuration would be global under that type? > > My feeling is that we'd better keep create simple - just write a UUID > to "type-id/create". Any class-specific attribute, if we really want to > support, should be able to be individually configured with required > resource allocated incrementally on top of basic resources allocated > at create stage. Then libvirt can set those attributes between create > and open a mdev device. If this direction is accepted, then naturally > such attributes should be put under mdev directory. Possibly we > don't need a class description under type-id. libvirt just checks directly > whether any known class represented in each mdev directory (vendor > driver will expose it on demand), and then operate attributes under > that class. > Have a better understanding of your concern now. User needs to know and set a list of attributes before requesting to create a new mdev device. From this angle all attributes should be enumerated per type-id. But as I explained above, writing multiple sysfs nodes to create a mdev device is racy. We either need a way to guarantee transactional operations on those nodes, or having type-id directory to only expose supported attributes while programming those attributes has to be through per-mdev directory after mdev device is created... Thanks Kevin

1 0

[libvirt] [PATCHv2] qemu: agent: Fix QEMU guest agent is not available due to an error
by Xiubo Li 22 Sep '16

22 Sep '16

These days, we experienced one qemu guest agent is not available error. Then the guest agent couldn't be used forever before rebooting the libvirtd daemon or reboot the qemu-guest-agent in the VM(you can also reboot the VM) to clear the priv->agentError. This is one bug for a long time in many verisons of libvirtd: https://bugzilla.redhat.com/show_bug.cgi?id=1090551 And there is one python script to reproduce this bug from the bugzilla: https://github.com/aspirer/study/blob/master/qemu-guest-agent/test2.py Just set the timeout to 0 at Line26, you can reproduce it very quickly: rsp = libvirt_qemu.qemuAgentCommand(dom, cmd, 1, 0) // 1 -> 0 The reason why this could happen is that: In case we received something like {"return": {}} for example, it is likely that somebody: 1) Started GA thread which sent one "guest-ping" command with seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) makes this function return immediately without waiting, but after updating the events, it will sleep in virCondWait() or virCondWaitUntil(). 2) While in AgentIO thread the "guest-ping" command is sent successfully, with updating the events it will wait for reply. 3) Then the GA thread is woken up and the mon->msg is set to NULL and exit. 4) At last the AgentIO thread receives the reply of "guest-ping" command with the mon->msg == NULL. This case could be adapt to all the GA commands, including guest-sync, etc. This patch will check if this is the case and don't report an error but return silently. Signed-off-by: Xiubo Li <lixiubo(a)cmss.chinamobile.com> Signed-off-by: Zhuoyu Zhang <zhangzhuoyu(a)cmss.chinamobile.com> Signed-off-by: Wei Tang <tangwei(a)cmss.chinamobile.com> Signed-off-by: Yaowei Bai <baiyaowei(a)cmss.chinamobile.com> Signed-off-by: Qide Chen <chenqide(a)cmss.chinamobile.com> --- Changes in V2: - check value type instead of object type. src/qemu/qemu_agent.c | 37 ++++++++++++++++++++++++++++--------- src/util/virjson.h | 7 +++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..f5408cc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -308,7 +308,6 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; - unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -333,16 +332,36 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { - /* If we've received something like: - * {"return": 1234} - * it is likely that somebody started GA - * which is now processing our previous - * guest-sync commands. Check if this is - * the case and don't report an error but + virJSONValuePtr val; + + /* In case we received something like: + * {"return": {}} for example, + * it is likely that somebody: + * + * 1) Started GA thread which sent one "guest-ping" command + * with seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) + * makes this function return immediately without waiting, but + * after updating the events, it will sleep in virCondWait() or + * virCondWaitUntil(). + * + * 2) While in AgentIO thread the "guest-ping" command is sent + * successfully, with updating the events it will wait for reply. + * + * 3) Then the GA thread is woken up and the mon->msg is set + * to NULL and exit. + * + * 4) At last the AgentIO thread receives the reply of "guest-ping" + * command with the mon->msg == NULL. + * + * This case could be adapt to all the GA commands, including + * guest-sync, etc. + * + * Check if this is the case and don't report an error but * return silently. */ - if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { - VIR_DEBUG("Ignoring delayed reply to guest-sync: %llu", id); + val = virJSONValueObjectGet(obj, "return"); + if (val && virJSONValueTypeIsValid(val)) { + VIR_DEBUG("Ignoring delayed command reply"); ret = 0; goto cleanup; } diff --git a/src/util/virjson.h b/src/util/virjson.h index 66ed48a..cb1d973 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -80,6 +80,13 @@ struct _virJSONValue { } data; }; +static inline bool +virJSONValueTypeIsValid(virJSONValuePtr value) +{ + return ((value->type >= VIR_JSON_TYPE_OBJECT) && + (value->type <= VIR_JSON_TYPE_BOOLEAN)); +} + void virJSONValueFree(virJSONValuePtr value); int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) -- 1.8.3.1

3 2

[libvirt] [PATCH] libxl: support VIR_MIGRATE_PERSIST_DEST migration flag
by Jim Fehlig 21 Sep '16

21 Sep '16

By default, virt-manager (and likely other libvirt-based apps) sets the VIR_MIGRATE_PERSIST_DEST flag when invoking the migrate API, which fails in a Xen setup since the libxl driver does not support the flag. Persisting a domain is a trivial task in the grand scheme of migration, so be nice to libvirt apps and add support for VIR_MIGRATE_PERSIST_DEST in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_migration.c | 23 +++++++++++++++++++++++ src/libxl/libxl_migration.h | 1 + 2 files changed, 24 insertions(+) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index f1da251..3b0dc74 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1021,6 +1021,29 @@ libxlDomainMigrationFinish(virConnectPtr dconn, event = NULL; } + if (flags & VIR_MIGRATE_PERSIST_DEST) { + unsigned int oldPersist = vm->persistent; + virDomainDefPtr vmdef; + + vm->persistent = 1; + if (!(vmdef = virDomainObjGetPersistentDef(cfg->caps, + driver->xmlopt, vm))) + goto cleanup; + + if (virDomainSaveConfig(cfg->configDir, cfg->caps, vmdef) < 0) + goto cleanup; + + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + oldPersist ? + VIR_DOMAIN_EVENT_DEFINED_UPDATED : + VIR_DOMAIN_EVENT_DEFINED_ADDED); + if (event) { + libxlDomainEventQueue(driver, event); + event = NULL; + } + } + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, cfg->caps) < 0) goto cleanup; diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index c02026d..8a074a0 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_PERSIST_DEST | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ VIR_MIGRATE_PAUSED) -- 2.1.4

2 2

[libvirt] [PATCH] qemu_process: show shutoff reasons when debug log disabled
by Chen Hanxiao 21 Sep '16

21 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We have a few of senarios that libvirtd would invoke qemuProcessStop and leave a "shutting down" in /var/log/libvirt/qemu/$DOMAIN.log. The shutoff reason showing in debug log is also very important for us to know why VM shutting down in domain log, as we seldom enable debug log of libvirtd. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b10b053..73e9271 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5803,7 +5803,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainObjBroadcast(vm); if ((timestamp = virTimeStringNow()) != NULL) { - qemuDomainLogAppendMessage(driver, vm, "%s: shutting down\n", timestamp); + qemuDomainLogAppendMessage(driver, vm, "%s: shutting down, reason=%s\n", + timestamp, + virDomainShutoffReasonTypeToString(reason)); VIR_FREE(timestamp); } -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu_process: move graphics validation into separate function
by Pavel Hrdina 21 Sep '16

21 Sep '16

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_process.c | 56 +++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1f56883..b360f6b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4409,6 +4409,38 @@ qemuProcessStartWarnShmem(virDomainObjPtr vm) } } + +static int +qemuProcessStartValidateGraphics(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->ngraphics; i++) { + virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; + + switch (graphics->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (graphics->nListens > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("QEMU does not support multiple listens for " + "one graphics device.")); + return -1; + } + break; + + case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + case VIR_DOMAIN_GRAPHICS_TYPE_RDP: + case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + break; + } + } + + return 0; +} + + static int qemuProcessStartValidateXML(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -4456,8 +4488,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, virCapsPtr caps, unsigned int flags) { - size_t i; - if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) { if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) { VIR_DEBUG("Checking for KVM availability"); @@ -4484,27 +4514,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, qemuProcessStartWarnShmem(vm); - for (i = 0; i < vm->def->ngraphics; i++) { - virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; - - switch (graphics->type) { - case VIR_DOMAIN_GRAPHICS_TYPE_VNC: - case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: - if (graphics->nListens > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("QEMU does not support multiple listens for " - "one graphics device.")); - return -1; - } - break; - - case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - case VIR_DOMAIN_GRAPHICS_TYPE_RDP: - case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; - } - } + qemuProcessStartValidateGraphics(vm); return 0; } -- 2.10.0

2 2

[libvirt] [PATCH 0/2] bhyve: add e1000 nic support
by Roman Bogorodskiy 21 Sep '16

21 Sep '16

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 | 32 ++++++++++-- .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.args | 9 ++++ .../bhyvexml2argv-net-e1000.ldargs | 3 ++ .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml | 22 ++++++++ tests/bhyvexml2argvtest.c | 7 ++- 7 files changed, 118 insertions(+), 14 deletions(-) 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 4

[libvirt] [PATCH] libvirt-nodedev.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-nodedev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index e4e9836..59f020b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -595,7 +595,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, * virNodeDeviceReAttach: * @dev: pointer to the node device * - * Re-attach a previously dettached node device to the node so that it + * Re-attach a previously detached node device to the node so that it * may be used by the node again. * * Depending on the hypervisor, this may involve operations such -- 2.1.0

2 1