- Devel - libvirt List Archives

[libvirt] [PATCH] Remove a redundant line in src/qemu/qemu_driver.c
by Tang Chen 21 Sep '12

21 Sep '12

Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12ac15c..2f58eca 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4050,7 +4050,6 @@ qemudDomainPinEmulator(virDomainPtr dom, if (VIR_ALLOC(newVcpuPin) < 0) { virReportOOMError(); goto cleanup; - newVcpuPinNum = 0; } if (virDomainVcpuPinAdd(&newVcpuPin, &newVcpuPinNum, cpumap, maplen, -1) < 0) { -- 1.7.10.1

2 1

[libvirt] [PATCH 0/2] network: virNetworkUpdate section backends
by Laine Stump 21 Sep '12

21 Sep '12

These patches are the backends for ip-dhcp-range and portgroups. Since virsh, the bridge driver, and the toplevel of the NetworkObj function of virNetworkUpdate already support all sections, only the lowest level routine in network_conf.c needs to be modified (an "unsupported" error log is replaced with real functionality). These functions are self-contained (each updates the contents of a single static function) and only used by the new virNetworkUpdate API; no other code is touched by the patches, so they are fairly safe to add.

2 4

[libvirt] [PATCH] simplify xenXMDomainPinVcpu function
by liguang 21 Sep '12

21 Sep '12

supersede tedious statements getting cpu bitmap from parameter cpumap by virBitmapNewData function Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/xen/xm_internal.c | 38 +++----------------------------------- 1 files changed, 3 insertions(+), 35 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a4dec62..97c19ef 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -827,12 +827,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain, xenUnifiedPrivatePtr priv; const char *filename; xenXMConfCachePtr entry; - virBuffer mapbuf = VIR_BUFFER_INITIALIZER; - char *mapstr = NULL, *mapsave = NULL; - int i, j, n, comma = 0; int ret = -1; - virBitmapPtr cpuset = NULL; - int maxcpu = XEN_MAX_PHYSICAL_CPU; if (domain == NULL || domain->conn == NULL || domain->name == NULL || cpumap == NULL || maplen < 1 || maplen > (int)sizeof(cpumap_t)) { @@ -863,43 +858,16 @@ int xenXMDomainPinVcpu(virDomainPtr domain, goto cleanup; } - /* from bit map, build character string of mapped CPU numbers */ - for (i = 0; i < maplen; i++) - for (j = 0; j < 8; j++) - if ((cpumap[i] & (1 << j))) { - n = i*8 + j; - - if (comma) - virBufferAddLit (&mapbuf, ","); - comma = 1; - - virBufferAsprintf (&mapbuf, "%d", n); - } - - if (virBufferError(&mapbuf)) { - virBufferFreeAndReset(&mapbuf); - virReportOOMError(); - goto cleanup; - } - - mapstr = virBufferContentAndReset(&mapbuf); - mapsave = mapstr; - - if (virBitmapParse(mapstr, 0, &cpuset, maxcpu) < 0) - goto cleanup; - virBitmapFree(entry->def->cpumask); - entry->def->cpumask = cpuset; - cpuset = NULL; - + entry->def->cpumask = virBitmapNewData(cpumap, maplen); + if (!entry->def->cpumask) + goto cleanup; if (xenXMConfigSaveFile(domain->conn, entry->filename, entry->def) < 0) goto cleanup; ret = 0; cleanup: - VIR_FREE(mapsave); - VIR_FREE(cpuset); xenUnifiedUnlock(priv); return ret; } -- 1.7.2.5

2 2

[libvirt] [PATCHv2 0/2] two different possibilities for virsh net-update command
by Laine Stump 21 Sep '12

21 Sep '12

The two following patches are alternate approaches that each have a slightly different commandline syntax. In V1 of the net-update patch, I tried having a single string option that could contain either an xml string, or the name of a file containing an xml string, then two options that would be used to make the decision of file vs. xml: net-update netname add ip-dhcp-host --xml "<host mac='xx..' .../>" net-update netname add ip-dhcp-host /tmp/myfile.xml (or 'net-update netname add ip-dhcp-host --file /tmp/myfile.xml') (the trick here is that "--xml" is a boolean option, *not* a string option that gets set to "<host...", and the string itself goes into a generic, usually unnamed option called xmldata. Likewise, the filename is being put into xmldata, and if the "--xml" boolean option isn't given on the commandline, it's assumed that it is a file. The ability to specifically say it is a file was just added for completeness, but really is semantically useless.) The problem with this is that someone looking at the syntax in the help might come up with a confusing commandline like this: net-update netname add --xmldata /tmp/myfile.xml --file \ --section ip-dhcp-host --live or net-update netname add --xmldata "<host mac='x:x...'/>" --xml \ --section ip-dhcp-host --live or even worse, they would specify "--xmldata", but leave out --xml, and virsh would attempt to interpret the text as a filename. On the other hand, if I named the string option "file" and the boolean option --xmldata, that would make things confusing even in the case that the command was *correct*: net-update netname add --file "<host mac='x:x...'/>" --xmldata \ --section ip-dhcp-host --live Of course, in any of those cases, if the user followed the "normal" command specification, it would look just fine, but it seems like there is a lot of room to cause confusion. So, for V2, I'm trying two different approaches: PATCHv2 1/2: Have a single required "xml" arg, and "auto-detect" whether it is xml text or a filename by looking at the first character - if the first character is "<", interpret it as an xml element. If not, interpret it as a filename. This leads to the simplest commandlines, since you *never* need to specify "--file" or "--xml" (unless you really want to): net-update netname add ip-dhcp-host "<host mac='xx..' .../>" net-update netname add ip-dhcp-host /tmp/myfile.xml (The ambiguous case of a filename starting with "<" can be avoided by specifying the filename as "./<....") There may be some circumstance I'm not aware of where a fully formed XML element doesn't necessarily start with a "<" though, or someone may be 100% against auto-disambiguating the string type, so I'm also sending a different version: PATCHv2 2/2: Have two separate optional string args, "file" and "xml". Manually check in the code that only one of them has been specified. Since both are optional, you must *always* provide the option name on the commandline ("--file" or "--xml"). In this case, the commandlines look like this: net-update netname add ip-dhcp-host --xml "<host mac='xx..' .../>" net-update netname add ip-dhcp-host --file /tmp/myfile.xml I'm (as usual) completely undecided about which of these versions to go with (including the first, which should still be considered, although I don't really like the possibility of creating confusing commandlines that it creates), so all votes/opinions/etc are welcome!

2 4

[libvirt] [PATCH] docs: fix typo in filesystem docs
by Eric Blake 21 Sep '12

21 Sep '12

Noticed this by reading the page. It would be so much nicer if our tools could automatically flag things like this as part of 'make'. * docs/formatdomain.html.in: Remove extra '>'. --- Pushing under the trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f05350e..04de870 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1772,7 +1772,7 @@ which gives the memory usage limit in kibibytes. Only used by LXC driver. <span class="since"> (since 0.9.13)</span></dd> - <dt><code>type='bind'></code></dt> + <dt><code>type='bind'</code></dt> <dd> A directory inside the guest will be bound to another directory inside the guest. Only used by LXC driver -- 1.7.11.4

1 0

[libvirt] [PATCH] maint: fix up copyright notice inconsistencies
by Eric Blake 21 Sep '12

21 Sep '12

1 0

[libvirt] [PATCH] doc: include article about libvirt+audit in relatedlinks.html
by Marcelo Cerri 20 Sep '12

20 Sep '12

This patch adds to relatedlinks.html a link to an article about libvirt describing how the Linux audit subsystem can be used to track qemu guest's life-cycle. --- This is an article that I wrote sometime ago that I think that can be useful for many people that make use of libvirt. docs/relatedlinks.html.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/relatedlinks.html.in b/docs/relatedlinks.html.in index f5357c5..9e96f66 100644 --- a/docs/relatedlinks.html.in +++ b/docs/relatedlinks.html.in @@ -59,6 +59,9 @@ <li> <a href="http://en.wikipedia.org/wiki/Virtualization">Wikipedia Virtualization</a> </li> + <li> + <a href="http://www.ibm.com/developerworks/linux/library/l-kvm-libvirt-audit/index.h…">IBM developerworks article about libvirt and audit.</a> + </li> </ul> <h2>Blogs and Podcasts</h2> -- 1.7.12

2 1

[libvirt] [PATCH] security: also parse user/group names instead of just IDs for DAC labels
by Marcelo Cerri 20 Sep '12

20 Sep '12

The DAC driver is missing parsing of group and user names for DAC labels and currently just parses uid and gid. This patch extends it to support names, so the following security label definition is now valid: <seclabel type='static' model='dac' relabel='yes'> <label>qemu:qemu</label> <imagelabel>qemu:qemu</imagelabel> </seclabel> --- src/security/security_dac.c | 49 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index be65d6e..7e11e31 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -66,28 +66,59 @@ void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr, } static +int parseId(const char *str, unsigned int *id) +{ + char *endptr = NULL; + + if (str == NULL || id == NULL) + return -1; + + if (virStrToLong_ui(str, &endptr, 10, id) || endptr != NULL) + return -1; + + return 0; +} + +static int parseIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) { + int rc = -1; unsigned int theuid; unsigned int thegid; - char *endptr = NULL; + char *sep = NULL; + char *tmp_label = NULL; if (label == NULL) - return -1; + goto done; - if (virStrToLong_ui(label, &endptr, 10, &theuid) || - endptr == NULL || *endptr != ':') { - return -1; - } + tmp_label = strdup(label); + if (tmp_label == NULL) + goto done; - if (virStrToLong_ui(endptr + 1, NULL, 10, &thegid)) - return -1; + sep = strchr(tmp_label, ':'); + if (sep == NULL) + goto done; + *sep = '\0'; + + if (virGetUserID(tmp_label, &theuid) < 0 && + parseId(tmp_label, &theuid) < 0) + goto done; + + if (virGetGroupID(sep + 1, &thegid) < 0 && + parseId(sep + 1, &thegid) < 0) + goto done; if (uidPtr) *uidPtr = theuid; if (gidPtr) *gidPtr = thegid; - return 0; + + rc = 0; + +done: + VIR_FREE(tmp_label); + + return rc; } /* returns 1 if label isn't found, 0 on success, -1 on error */ -- 1.7.12

4 9

[libvirt] [PATCH v2 0/3] Support for limiting guest coredumps
by Martin Kletzander 20 Sep '12

20 Sep '12

Even though I got a sparse ACK on v1, it's been some time, all the things should be fixed. Also the QEMU patch is already upstream. This series applies on the disable_s3/s4 series [1] and works with qemu patch [2] (upstream already). Basically qemu supports marking guest memory as (not)dumpable using madvise(2) system call and in case the guest memory is not desired the option can reduce the coredump by a reasonable size. [1] https://www.redhat.com/archives/libvir-list/2012-August/msg00572.html [2] http://lists.nongnu.org/archive/html/qemu-devel/2012-08/msg00554.html Martin Kletzander (3): Add support for limiting guest coredump qemu: add support for dump-guest-core option tests: Add tests for dump-core option docs/formatdomain.html.in | 12 +++- docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 25 ++++++- src/conf/domain_conf.h | 10 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 81 +++++++++++++++++++--- tests/qemuargv2xmltest.c | 2 + tests/qemuhelptest.c | 3 +- .../qemuxml2argv-machine-core-off.args | 5 ++ .../qemuxml2argv-machine-core-off.xml | 26 +++++++ .../qemuxml2argv-machine-core-on.args | 5 ++ .../qemuxml2argv-machine-core-on.xml | 26 +++++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 16 files changed, 201 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.xml -- 1.7.12

3 13

[libvirt] [PATCH v2 0/3] Add support for reboot-timeout
by Martin Kletzander 20 Sep '12

20 Sep '12

This series introduces simple reboot timeout support. That means what should be done in case all boot options fail, reboot or not. And if yes, then how long the machine should wait. Before adding the support for that into XML parser, builder, and qemu, I felt the need to cleanup the boot parsing and enums (I couldn't look at that), so that's the first patch. Most of it is mechanical, the rest should be pretty straight-forward. --- v2: - modified according to mprivozn and danpb - ACK'd patch not sent Martin Kletzander (3): Add support for reboot-timeout qemu: Add support for reboot-timeout QEMU Tests for reboot-timeout docs/formatdomain.html.in | 11 +++++-- docs/schemas/domaincommon.rng | 24 +++++++++++---- src/conf/domain_conf.c | 34 ++++++++++++++++++---- src/conf/domain_conf.h | 3 ++ src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 ++++++++++++++++++ tests/qemuargv2xmltest.c | 4 +++ .../qemuxml2argv-reboot-timeout-disabled.args | 3 ++ .../qemuxml2argv-reboot-timeout-disabled.xml | 21 +++++++++++++ .../qemuxml2argv-reboot-timeout-enabled.args | 3 ++ .../qemuxml2argv-reboot-timeout-enabled.xml | 21 +++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ tests/qemuxml2xmltest.c | 4 +++ 14 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml -- 1.7.12

2 11

[libvirt] [PATCHv3] security: Don't ignore errors when parsing DAC security labels
by Peter Krempa 20 Sep '12

20 Sep '12

The DAC security driver silently ignored errors when parsing the DAC label and used default values instead. With a domain containing the following label definition: <seclabel type='static' model='dac' relabel='yes'> <label>sdfklsdjlfjklsdjkl</label> </seclabel> the domain would start normaly but the disk images would be still owned by root and no error was displayed. This patch changes the behavior if the parsing of the label fails (note that a not present label is not a failure and in this case the default label should be used) the error isn't masked but is raised that causes the domain start to fail with a descriptive error message: virsh # start tr error: Failed to start domain tr error: internal error invalid argument: failed to parse DAC label 'sdfklsdjlfjklsdjkl' for domain 'tr' I also changed the error code to "invalid argument" from "internal error" and tweaked the various error messages to contain correct and useful information. --- Diff to v2: - Fixed all error reporting paths to contain useful messages - Tweaked error messages to contain more information - Fixed printing of seclabel->label instead of seclabel->imagelabel in the imagelabel parsing func. src/security/security_dac.c | 95 +++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 34 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 211fb37..be65d6e 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -90,6 +90,7 @@ int parseIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) return 0; } +/* returns 1 if label isn't found, 0 on success, -1 on error */ static int virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) { @@ -98,20 +99,18 @@ int virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) virSecurityLabelDefPtr seclabel; if (def == NULL) - return -1; + return 1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); if (seclabel == NULL || seclabel->label == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("security label for DAC not found in domain %s"), - def->name); - return -1; + VIR_DEBUG("DAC seclabel for domain '%s' wasn't found", def->name); + return 1; } if (seclabel->label && parseIds(seclabel->label, &uid, &gid)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse uid and gid for DAC " - "security driver: %s"), seclabel->label); + virReportError(VIR_ERR_INVALID_ARG, + _("failed to parse DAC label '%s' for domain '%s'"), + seclabel->label, def->name); return -1; } @@ -127,19 +126,35 @@ static int virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr) { - if (virSecurityDACParseIds(def, uidPtr, gidPtr) == 0) - return 0; + int ret; - if (priv) { - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; - return 0; + if (!def && !priv) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to determine default DAC label " + "for an unknown object")); + return -1; } - return -1; + + if ((ret = virSecurityDACParseIds(def, uidPtr, gidPtr)) <= 0) + return ret; + + if (!priv) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("DAC security label couldn't be determined " + "for domain '%s'"), def->name); + return -1; + } + + if (uidPtr) + *uidPtr = priv->user; + if (gidPtr) + *gidPtr = priv->group; + + return 0; } + +/* returns 1 if label isn't found, 0 on success, -1 on error */ static int virSecurityDACParseImageIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) @@ -149,21 +164,19 @@ int virSecurityDACParseImageIds(virDomainDefPtr def, virSecurityLabelDefPtr seclabel; if (def == NULL) - return -1; + return 1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); if (seclabel == NULL || seclabel->imagelabel == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("security label for DAC not found in domain %s"), - def->name); - return -1; + VIR_DEBUG("DAC imagelabel for domain '%s' wasn't found", def->name); + return 1; } if (seclabel->imagelabel && parseIds(seclabel->imagelabel, &uid, &gid)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse uid and gid for DAC " - "security driver: %s"), seclabel->label); + virReportError(VIR_ERR_INVALID_ARG, + _("failed to parse DAC imagelabel '%s' for domain '%s'"), + seclabel->imagelabel, def->name); return -1; } @@ -179,17 +192,31 @@ static int virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr) { - if (virSecurityDACParseImageIds(def, uidPtr, gidPtr) == 0) - return 0; + int ret; - if (priv) { - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; - return 0; + if (!def && !priv) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to determine default DAC imagelabel " + "for an unknown object")); + return -1; + } + + if ((ret = virSecurityDACParseImageIds(def, uidPtr, gidPtr)) <= 0) + return ret; + + if (!priv) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("DAC security imagelabel couldn't be determined " + "for domain '%s'"), def->name); + return -1; } - return -1; + + if (uidPtr) + *uidPtr = priv->user; + if (gidPtr) + *gidPtr = priv->group; + + return 0; } -- 1.7.12

2 2

[libvirt] [PATCH WIP] build: add a warning when configure is executed with -Werror
by Marcelo Cerri 20 Sep '12

20 Sep '12

Some tests performed by configure to check what is supported can be broken if -Werror is defined in CFLAGS variable when configure is executed. This patch checks if CFLAGS contains -Werror and shows a warning for user recommending to use --enable-compile-warnings=error instead. --- Please, note that this is a work in progress patch and suggestions are welcome. configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index 3e90672..38d6263 100644 --- a/configure.ac +++ b/configure.ac @@ -3232,3 +3232,10 @@ AC_MSG_NOTICE([Privileges]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ QEMU: $QEMU_USER:$QEMU_GROUP]) AC_MSG_NOTICE([]) + +# -Werror can break some configure tests +if echo "$CFLAGS" | sed -e 's/\s\+/\n/g' | grep -E '^-Werror$' >/dev/null 2>&1; then + AC_MSG_WARN([CFLAGS contains -Werror flag. This might break some tests performed by]) + AC_MSG_WARN([configure and cause some compilation errors.]) + AC_MSG_WARN([Please use --enable-compile-warnings=error instead.]) +fi -- 1.7.12

3 2

[libvirt] [PATCH] virsh: new net-update command
by Laine Stump 20 Sep '12

20 Sep '12

This new virsh command uses the new virNetworkUpdate() API to modify an existing network definition, and optionally have those modifications take effect immediately without restarting the network. An example usage: virsh net-update add-last ip-dhcp-host \ --xml "<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \ --live --config If you like, you can instead put the xml into a file, and call like this: virsh net-update add-last ip-dhcp-host \ --file "<host mac='00:11:22:33:44:55' ip='192.168.122.45'/>" \ --live --config (or just leave out the "--file", since that is the default). --live, --config, and --current options - if you specify --live, only the live state of the network will be updated. If you also specify --config, then the persistent configuration will also be updated; these two commands can be given separately, or both together. If you don't specify either (you can optionally specify "--current" for the same effect), then the "current" config will be updated (i.e. if the network is active, then only its live config is affected, but if the network is inactive, only the persistent config is affected). A --parent-index option is also available (to give the index within a list of parent objects, e.g. the index of the parent <ip> element when updating ip-dhcp-host elements), but is optional and at least for now will probably be used rarely. --- tools/virsh-network.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 2c32a78..64be260 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -737,6 +737,163 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) } /* + * "net-update" command + */ +static const vshCmdInfo info_network_update[] = { + {"help", N_("update parts of an existing network's configuration")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_network_update[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, N_("network name or uuid")}, + {"command", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("type of update (add, delete, or modify)")}, + {"section", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("which section of network configuration to update")}, + {"xml", VSH_OT_BOOL, 0, N_("xml is specified directly on commandline")}, + {"file", VSH_OT_BOOL, 0, N_("file containing xml is specified on commandline")}, + {"xmldata", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("complete xml element (or name of file containing xml) to add/modify, " + "or to be matched for search")}, + {"parent-index", VSH_OT_INT, 0, N_("which parent object to search through")}, + {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, + {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, + {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, + {NULL, 0, 0, NULL} +}; + +VIR_ENUM_DECL(virNetworkUpdateCommand) +VIR_ENUM_IMPL(virNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST, + "none", "modify", "delete", "add-last", "add-first"); + +VIR_ENUM_DECL(virNetworkSection) +VIR_ENUM_IMPL(virNetworkSection, VIR_NETWORK_SECTION_LAST, + "none", "bridge", "domain", "ip", "ip-dhcp-host", + "ip-dhcp-range", "forward", "forward-interface", + "forward-pf", "portgroup", "dns-host", "dns-txt", + "dns-srv"); + +static bool +cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) +{ + bool ret = false; + virNetworkPtr network; + const char *commandStr = NULL; + const char *sectionStr = NULL; + int command, section, parentIndex = -1; + const char *xmldata = NULL; + char *xmldataFromFile = NULL; + bool isFile = vshCommandOptBool(cmd, "file"); + bool isXml = vshCommandOptBool(cmd, "xml"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + unsigned int flags = 0; + const char *affected; + + if (!(network = vshCommandOptNetwork(ctl, cmd, NULL))) + goto cleanup; + + if (vshCommandOptString(cmd, "command", &commandStr) < 0) { + vshError(ctl, "%s", _("missing or malformed command argument")); + goto cleanup; + } + command = virNetworkUpdateCommandTypeFromString(commandStr); + if (command <= 0 || command >= VIR_NETWORK_UPDATE_COMMAND_LAST) { + vshError(ctl, _("unrecognized command name '%s'"), commandStr); + goto cleanup; + } + + if (vshCommandOptString(cmd, "section", &sectionStr) < 0) { + vshError(ctl, "%s", _("missing or malformed section argument")); + goto cleanup; + } + section = virNetworkSectionTypeFromString(sectionStr); + if (section <= 0 || section >= VIR_NETWORK_SECTION_LAST) { + vshError(ctl, _("unrecognized section name '%s'"), sectionStr); + goto cleanup; + } + + if (vshCommandOptInt(cmd, "parent-index", &parentIndex) < 0) { + vshError(ctl, "%s", _("malformed parent-index argument")); + goto cleanup; + } + + /* the goal is to have a full xml element in the "xmldata" + * string. This can either be directly given with the --xml + * option, or indirectly with the --file option (default, + * indicates that the xmldata on the commandline is really the + * name of a file whose contents are the desired xml). + */ + + if (!isXml) + isFile = true; + if (isXml && isFile) { + vshError(ctl, "%s", _("you can specify file (default) or xml, " + "but not both")); + goto cleanup; + } + if (vshCommandOptString(cmd, "xmldata", (const char **)&xmldata) < 0) { + vshError(ctl, "%s", _("malformed xmldata argument")); + goto cleanup; + } + + if (isFile) { + /* contents of xmldata is actually the name of a file that + * contains the xml. + */ + if (virFileReadAll(xmldata, VSH_MAX_XML_FILE, &xmldataFromFile) < 0) + return false; + /* NB: the original xmldata is freed by the vshCommand + * infrastructure, so it's safe to lose its pointer here. + */ + xmldata = xmldataFromFile; + } + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags |= VIR_NETWORK_UPDATE_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_NETWORK_UPDATE_AFFECT_CONFIG; + if (live) + flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; + } + + if (virNetworkUpdate(network, command, + section, parentIndex, xmldata, flags) < 0) { + vshError(ctl, _("Failed to update network %s"), + virNetworkGetName(network)); + goto cleanup; + } + + if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { + if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) + affected = _("persistent config and live state"); + else + affected = _("persistent config"); + } else if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { + affected = _("live state"); + } else if (virNetworkIsActive(network)) { + affected = _("live state"); + } else { + affected = _("persistent config"); + } + + vshPrint(ctl, _("Updated network %s %s"), + virNetworkGetName(network), affected); + ret = true; +cleanup: + virNetworkFree(network); + VIR_FREE(xmldataFromFile); + return ret; +} + +/* * "net-uuid" command */ static const vshCmdInfo info_network_uuid[] = { @@ -854,6 +1011,7 @@ const vshCmdDef networkCmds[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start, 0}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine, 0}, + {"net-update", cmdNetworkUpdate, opts_network_update, info_network_update, 0}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid, 0}, {NULL, NULL, NULL, NULL, 0} }; -- 1.7.11.4

3 5

[libvirt] [PATCH] qemu: Transition domain to PAUSED after 'stop' command
by Michal Privoznik 20 Sep '12

20 Sep '12

Currently, we mark domain PAUSED (but not emit an event) just before we issue 'stop' on monitor; This command can take ages to finish, esp. when domain's doing a lot of IO - users can enforce qemu to open files with O_DIRECT which doesn't return from write() until data reaches the block device. Having said that, we report PAUSED even if domain is not paused yet. --- The event is emitted correctly after all operations returns though. But if mgmt app would 'virsh domstate $dom' as we are issuing 'stop' monitor command it could get spurious results. src/qemu/qemu_process.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c28f5a5..b6eb342 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2708,13 +2708,9 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm, enum qemuDomainAsyncJob asyncJob) { int ret; - int oldState; - int oldReason; qemuDomainObjPrivatePtr priv = vm->privateData; VIR_FREE(priv->lockState); - oldState = virDomainObjGetState(vm, &oldReason); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); ret = qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob); if (ret == 0) { @@ -2723,11 +2719,10 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm, } if (ret == 0) { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - } else { - virDomainObjSetState(vm, oldState, oldReason); } return ret; -- 1.7.8.6

2 3

Re: [libvirt] [PATCH] block: Set cdrom device read only flag
by Kevin Shanahan 20 Sep '12

20 Sep '12

On Thu, Aug 02, 2012 at 11:46:13AM +0930, Kevin Shanahan wrote: > On Thu, Aug 02, 2012 at 11:02:42AM +0930, Kevin Shanahan wrote: > > Set the block driver read_only flag for cdrom devices so that > > qmp_change_blockdev does not attempt to open cdrom files in read-write > > mode when changing media. > > Hrm, this fixes my simple test case using the kvm monitor directly but > changing media via libvirt still has the same issue (fails for RO > files, succeeds for writable files). > > $ virsh attach-disk --type cdrom --mode readonly test1 /srv/kvm/iso/ubuntu-12.04-server-amd64.iso hdc > error: Failed to attach disk > error: internal error unable to execute QEMU command 'change': Could not open '/srv/kvm/iso/ubuntu-12.04-server-amd64.iso' > > I'll keep looking into it. In the libvirt case, it seems libvirt is failing to add media=cdrom to the commandline, so in this case qemu is defaulting to media=disk and my proposed fix has no effect. Diving into libvirt now to see why no media=disk is getting added... Common test case has this xml (generated by virt-install): <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <alias name='ide0-1-0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> > Cheers, > Kevin.

4 11

[libvirt] [PATCH v2] Fix libvirtd crash possibility
by Martin Kletzander 20 Sep '12

20 Sep '12

When generating RPC protocol messages, it's strictly needed to have continuousline of numbers or RPC messages. However in case anyone tries backporting some functionality and will skip a number, there is a possibility to make the daemon segfault with newer virsh (version of the library, rpc call, etc.) even unintentionally. The problem is that the skipped numbers will get func filled with NULLs, but there is no check whether these are set before the daemon tries to run them. This patch very simply enhances one check and fixes that. --- src/rpc/virnetserverprogram.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index d13b621..95a6d76 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -1,7 +1,7 @@ /* * virnetserverprogram.c: generic network RPC server program * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -109,12 +109,19 @@ int virNetServerProgramMatches(virNetServerProgramPtr prog, static virNetServerProgramProcPtr virNetServerProgramGetProc(virNetServerProgramPtr prog, int procedure) { + virNetServerProgramProcPtr proc; + if (procedure < 0) return NULL; if (procedure >= prog->nprocs) return NULL; - return &prog->procs[procedure]; + proc = &prog->procs[procedure]; + + if (!proc->func) + return NULL; + + return proc; } unsigned int -- 1.7.12

2 5

[libvirt] [PATCH] network: fix element size in memmove
by Laine Stump 20 Sep '12

20 Sep '12

The memmove to move elements in the dhcp hosts array when inserting and deleting items was mistakenly basing the length of the copy on the size of a virNetworkDHCPHostDefPtr rather than virNetworkDHCPHostDef, with the expected disastrous results. --- We really should create a VIR_SOMETHING() macro to take care of this... src/conf/network_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index db398ae..046891c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2449,7 +2449,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, } else { /* implied (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) */ memmove(ipdef->hosts + 1, ipdef->hosts, - sizeof(ipdef->hosts) * ipdef->nhosts); + sizeof(*ipdef->hosts) * ipdef->nhosts); ipdef->hosts[0] = host; ipdef->nhosts++; memset(&host, 0, sizeof(host)); @@ -2481,7 +2481,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, /* remove it */ virNetworkDHCPHostDefClear(&ipdef->hosts[ii]); memmove(ipdef->hosts + ii, ipdef->hosts + ii + 1, - sizeof(ipdef->hosts) * ipdef->nhosts - ii - 1); + sizeof(*ipdef->hosts) * ipdef->nhosts - ii - 1); ipdef->nhosts--; ignore_value(VIR_REALLOC_N(ipdef->hosts, ipdef->nhosts)); } -- 1.7.11.4

2 1

[libvirt] [PATCHv3 1/2] build: define WITH_INTERFACE for the driver
by Doug Goldstein 20 Sep '12

20 Sep '12

Based exclusively on work by Eric Blake in a patch posted with the same subject. However some modifications related to comments and my plans to add another backend. Added WITH_INTERFACE as the only automake variable deciding whether to build the driver and using WITH_NETCF to identify that we're wanting to use the netcf library as the backend. * configure.ac: Added with_interface * src/interface/netcf_driver.c: Renamed.. * src/interface/interface_backend_netcf.c: ..to this to match storage. * src/interface/netcf_driver.h: Renamed.. * src/interface/interface_driver.h: ..to this. * daemon/Makefile.am: Respect WITH_INTERFACE and WITH_NETCF. * libvirt.spec.in: Add RPM support for --with-interface --- Change from v2: * rebase against master * v2 conditionally ACK'd by Laine if Eric ACK'd it Change from v1: * rebased against master * Fixed copyright header * Added libvirt.spec.in modification * Changed virsh -V output configure.ac | 33 ++++++++++++++++++- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 8 ++-- libvirt.spec.in | 13 ++++--- src/Makefile.am | 24 +++++++++++--- .../{netcf_driver.c => interface_backend_netcf.c} | 2 +- .../{netcf_driver.h => interface_driver.h} | 0 tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 5 ++- 9 files changed, 67 insertions(+), 22 deletions(-) rename src/interface/{netcf_driver.c => interface_backend_netcf.c} (99%) rename src/interface/{netcf_driver.h => interface_driver.h} (100%) diff --git a/configure.ac b/configure.ac index 2090e5f..1a44d21 100644 --- a/configure.ac +++ b/configure.ac @@ -1948,7 +1948,6 @@ AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) - AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) @@ -2787,6 +2786,36 @@ if test "$with_nwfilter" = "yes" ; then fi AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) +dnl check if the interface driver should be compiled +AC_ARG_WITH([interface], + AC_HELP_STRING([--with-interface], + [with host interface driver @<:@default=check@:>@]), [], + [with_interface=check]) + +dnl Don't compile the interface driver without libvirtd +if test "$with_libvirtd" = "no" ; then + with_interface=no +fi + +dnl The interface driver depends on the netcf library +if test "$with_interface:$with_netcf" = "check:yes" ; then + with_interface=yes +fi + +if test "$with_interface:$with_netcf" = "check:no" ; then + with_interface=no +fi + +if test "$with_interface:$with_netcf" = "yes:no" ; then + AC_MSG_ERROR([Requested the Interface driver without netcf support]) +fi + +if test "$with_interface" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], + [whether the interface driver is enabled]) +fi +AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) + dnl libblkid is used by several storage drivers; therefore we probe dnl for it unconditionally. AC_ARG_WITH([libblkid], @@ -3016,7 +3045,7 @@ AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([ Libvirtd: $with_libvirtd]) -AC_MSG_NOTICE([ netcf: $with_netcf]) +AC_MSG_NOTICE([Interface: $with_interface]) AC_MSG_NOTICE([ macvtap: $with_macvtap]) AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index b45349c..3405c67 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -151,7 +151,7 @@ if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la endif -if WITH_NETCF +if WITH_INTERFACE libvirtd_LDADD += ../src/libvirt_driver_interface.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 6973df6..1156bd6 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -78,8 +78,8 @@ # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif -# ifdef WITH_NETCF -# include "interface/netcf_driver.h" +# ifdef WITH_INTERFACE +# include "interface/interface_driver.h" # endif # ifdef WITH_STORAGE # include "storage/storage_driver.h" @@ -382,7 +382,7 @@ static void daemonInitialize(void) # ifdef WITH_NWFILTER virDriverLoadModule("nwfilter"); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE virDriverLoadModule("interface"); # endif # ifdef WITH_XEN @@ -404,7 +404,7 @@ static void daemonInitialize(void) # ifdef WITH_NETWORK networkRegister(); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE interfaceRegister(); # endif # ifdef WITH_STORAGE diff --git a/libvirt.spec.in b/libvirt.spec.in index 8c4c08d..853cef7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -92,6 +92,7 @@ # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} +%define with_interface 0%{!?_without_interface:0} %define with_netcf 0%{!?_without_netcf:0} %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} @@ -200,6 +201,12 @@ %define with_netcf 0%{!?_without_netcf:%{server_drivers}} %endif +# interface is the driver that wraps netcf or udev interface management +# backends in Fedora 18 / RHEL-7 or newer +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%define with_interface 0%{!?_without_interface:%{server_drivers}} +%endif + # udev is used to manage host devices in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define with_udev 0%{!?_without_udev:%{server_drivers}} @@ -281,12 +288,6 @@ %define with_nodedev 0 %endif -%if %{with_netcf} -%define with_interface 1 -%else -%define with_interface 0 -%endif - %if %{with_storage_fs} || %{with_storage_mpath} || %{with_storage_iscsi} || %{with_storage_lvm} || %{with_storage_disk} %define with_storage 1 %else diff --git a/src/Makefile.am b/src/Makefile.am index 9f27fcf..4ae741b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -552,8 +552,17 @@ PARALLELS_DRIVER_SOURCES = \ NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c -INTERFACE_DRIVER_SOURCES = \ - interface/netcf_driver.h interface/netcf_driver.c +INTERFACE_DRIVER_SOURCES = + +if WITH_INTERFACE +INTERFACE_DRIVER_SOURCES += \ + interface/interface_driver.h +endif + +if WITH_NETCF +INTERFACE_DRIVER_SOURCES += \ + interface/interface_backend_netcf.c +endif SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -1021,7 +1030,7 @@ endif EXTRA_DIST += network/default.xml -if WITH_NETCF +if WITH_INTERFACE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_interface.la else @@ -1029,10 +1038,13 @@ noinst_LTLIBRARIES += libvirt_driver_interface.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la endif -libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) \ - -I$(top_srcdir)/src/conf $(AM_CFLAGS) +libvirt_driver_interface_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_interface_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_interface_la_LIBADD = $(NETCF_LIBS) +libvirt_driver_interface_la_LIBADD = +if WITH_NETCF +libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version diff --git a/src/interface/netcf_driver.c b/src/interface/interface_backend_netcf.c similarity index 99% rename from src/interface/netcf_driver.c rename to src/interface/interface_backend_netcf.c index 6e429db..3b4ee11 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/interface_backend_netcf.c @@ -27,7 +27,7 @@ #include "virterror_internal.h" #include "datatypes.h" -#include "netcf_driver.h" +#include "interface_driver.h" #include "interface_conf.h" #include "memory.h" #include "logging.h" diff --git a/src/interface/netcf_driver.h b/src/interface/interface_driver.h similarity index 100% rename from src/interface/netcf_driver.h rename to src/interface/interface_driver.h diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 4d6e91e..8762de4 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -79,7 +79,7 @@ mymain(void) #ifdef WITH_NWFILTER TEST("nwfilter", NULL); #endif -#ifdef WITH_NETCF +#ifdef WITH_INTERFACE TEST("interface", NULL); #endif #ifdef WITH_QEMU diff --git a/tools/virsh.c b/tools/virsh.c index d0b302a..6a7b89d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2707,8 +2707,11 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_BRIDGE vshPrint(ctl, " Bridging"); #endif -#ifdef WITH_NETCF +#if defined(WITH_INTERFACE) vshPrint(ctl, " Interface"); +#if defined(WITH_NETCF) + vshPrint(ctl, " netcf"); +#endif #endif #ifdef WITH_NWFILTER vshPrint(ctl, " Nwfilter"); -- 1.7.8.6

4 7

[libvirt] [PATCH 1/2] virsh: Move daemon to misc since its not a network
by Doug Goldstein 19 Sep '12

19 Sep '12

Move the 'Daemon' entry to the Miscellaneous section since its not a networking driver or component. --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 242f789..8592df9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2696,9 +2696,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif -#ifdef WITH_LIBVIRTD - vshPrint(ctl, " Daemon"); -#endif #ifdef WITH_NETWORK vshPrint(ctl, " Network"); #endif @@ -2747,6 +2744,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); +#ifdef WITH_LIBVIRTD + vshPrint(ctl, " Daemon"); +#endif #ifdef WITH_NODE_DEVICES vshPrint(ctl, " Nodedev"); #endif -- 1.7.8.6

2 5

[libvirt] [PATCH 0/3] Add further testing of SELinux security driver
by Daniel P. Berrange 19 Sep '12

19 Sep '12

This patch series expands on previous work to test the SELinux security driver via a LD_PRELOAD hack. This time we are testing the file labelling, by setting/getting private xattrs, instead of the actual SELinux xattrs. In doing this I had need to use libattr, and got fed up with duplicating the usual m4 black magic. Thus I wrote a helper macro for simplifying library checks, and then a further macro for the actual libattr check. The configure.ac file thus only gains two lines LIBVIRT_CHECK_LIBATTR ... LIBVIRT_RESULT_LIBATTR In the long run, I'd like to replace all our existing library checks with these macros, to try & get our configure.ac script back to a reasonable level of sanity.

2 4

[libvirt] [PATCH v2 0/4] qemu SPICE migration
by Michal Privoznik 19 Sep '12

19 Sep '12

With the latest qemu, we are a step closer to seamless migration. However, libvirt needs to lend a helping hand. Michal Privoznik (4): config: Introduce <migration> for SPICE graphics qemu: Implement new seamless attribute qemu: Create SPICE migration test qemu: wait for SPICE to migrate docs/formatdomain.html.in | 10 ++++ docs/schemas/domaincommon.rng | 11 ++++ src/conf/domain_conf.c | 31 +++++++++++- src/conf/domain_conf.h | 10 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +++++ src/qemu/qemu_migration.c | 38 +++++++++++++-- src/qemu/qemu_monitor.c | 22 ++++++++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 + .../qemuxml2argv-graphics-spice-migration.args | 7 +++ .../qemuxml2argv-graphics-spice-migration.xml | 36 ++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 16 files changed, 242 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-migration.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-migration.xml -- 1.7.8.6

4 12

[libvirt] NFS over RDMA small block DIRECT_IO bug
by Andrew Holway 19 Sep '12

19 Sep '12

Hello. # Avi Kivity avi(a)redhat recommended I copy kvm in on this. It would also seem relevent to libvirt. # I have a Centos 6.2 server and Centos 6.2 client. [root@store ~]# cat /etc/exports /dev/shm 10.149.0.0/16(rw,fsid=1,no_root_squash,insecure) (I have tried with non tempfs targets also) [root@node001 ~]# cat /etc/fstab store.ibnet:/dev/shm /mnt nfs rdma,port=2050,defaults 0 0 I wrote a little for loop one liner that dd'd the centos net install image to a file called 'hello' then checksummed that file. Each iteration uses a different block size. Non DIRECT_IO seems to work fine. DIRECT_IO with 512byte, 1K and 2K block sizes get corrupted. I want to run my KVM guests on top of NFS over RDMA. My guests cannot create filesystems. Thanks, Andrew. bug report: https://bugzilla.linux-nfs.org/show_bug.cgi?id=228 [root@node001 mnt]# for f in 512 1024 2048 4096 8192 16384 32768 65536 131072; do dd bs="$f" if=CentOS-6.3-x86_64-netinstall.iso of=hello iflag=direct oflag=direct && md5sum hello && rm -f hello; done 409600+0 records in 409600+0 records out 209715200 bytes (210 MB) copied, 62.3649 s, 3.4 MB/s aadd0ffe3c9dfa35d8354e99ecac9276 hello -- 512 byte block 204800+0 records in 204800+0 records out 209715200 bytes (210 MB) copied, 41.3876 s, 5.1 MB/s 336f6da78f93dab591edc18da81f002e hello -- 1K block 102400+0 records in 102400+0 records out 209715200 bytes (210 MB) copied, 21.1712 s, 9.9 MB/s f4cefe0a05c9b47ba68effdb17dc95d6 hello -- 2k block 51200+0 records in 51200+0 records out 209715200 bytes (210 MB) copied, 10.9631 s, 19.1 MB/s 690138908de516b6e5d7d180d085c3f3 hello -- 4k block 25600+0 records in 25600+0 records out 209715200 bytes (210 MB) copied, 5.4136 s, 38.7 MB/s 690138908de516b6e5d7d180d085c3f3 hello 12800+0 records in 12800+0 records out 209715200 bytes (210 MB) copied, 3.1448 s, 66.7 MB/s 690138908de516b6e5d7d180d085c3f3 hello 6400+0 records in 6400+0 records out 209715200 bytes (210 MB) copied, 1.77304 s, 118 MB/s 690138908de516b6e5d7d180d085c3f3 hello 3200+0 records in 3200+0 records out 209715200 bytes (210 MB) copied, 1.4331 s, 146 MB/s 690138908de516b6e5d7d180d085c3f3 hello 1600+0 records in 1600+0 records out 209715200 bytes (210 MB) copied, 0.922167 s, 227 MB/s 690138908de516b6e5d7d180d085c3f3 hello

4 8

[libvirt] [PATCH] build: force libnl1 if netcf also used libnl1
by Eric Blake 19 Sep '12

19 Sep '12

Recent spec file changes ensure that in distro situations, netcf and libvirt will link against the same libnl in order to avoid dumping core. But for every-day development, if you are F17 and have the libnl3-devel headers available, libvirt was blindly linking against libnl3 even though F17 netcf still links against libnl1, making testing a self-built binary on F17 impossible. By making configure a little bit smarter, we can avoid this situation. I intentionally wrote the test so that we still favor libnl-3 if netcf is not installed or if we couldn't use ldd to determine which library netcf linked against. * configure.ac (LIBNL): Don't probe libnl3 if netcf doesn't use it. --- Does this patch look safe enough to use? It was sufficient to let me resume self-tests on my F17 box, where I had intentionally installed libnl3-devel. configure.ac | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 47a72b9..7528894 100644 --- a/configure.ac +++ b/configure.ac @@ -2902,14 +2902,24 @@ LIBNL_LIBS="" have_libnl=no if test "$with_linux" = "yes"; then - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - have_libnl=yes - AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) - AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) - PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) - LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" - LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" - ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ + # When linking with netcf, we must ensure that we pick the same version + # of libnl that netcf picked. Prefer libnl-3 unless we can prove + # netcf linked against libnl-1. + ncftool=`which ncftool` + case `(ldd "$ncftool") 2>&1` in + *libnl.so.1*) ;; + *) + PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ + have_libnl=yes + AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) + AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) + PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) + LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" + LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" + ], []) ;; + esac + if test "$have_libnl" = no; then + PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ have_libnl=yes AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], [whether the netlink library is available]) @@ -2920,7 +2930,7 @@ if test "$with_linux" = "yes"; then AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) fi ]) - ]) + fi fi AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) -- 1.7.11.4

7 23

[libvirt] [PATCH] network: fix incorrect VIR_NETWORK_UPDATE_COMMAND_* values
by Laine Stump 19 Sep '12

19 Sep '12

These enums originally were put into the flags for virNetworkUpdate, and when they were moved into their own enum, the numbers weren't appropriately changed, causing the commands to start with value 2 instead of 1. This causes problems for things like ENUM_IMPL, which wants a string for every value in the requested range, including those not used in the enum. --- include/libvirt/libvirt.h.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 84ac2d0..0f67cbb 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2356,10 +2356,10 @@ int virNetworkUndefine (virNetworkPtr network); */ typedef enum { VIR_NETWORK_UPDATE_COMMAND_NONE = 0, /* (invalid) */ - VIR_NETWORK_UPDATE_COMMAND_MODIFY = 2, /* modify an existing element */ - VIR_NETWORK_UPDATE_COMMAND_DELETE = 3, /* delete an existing element */ - VIR_NETWORK_UPDATE_COMMAND_ADD_LAST = 4, /* add an element at end of list */ - VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST = 5, /* add an element at start of list */ + VIR_NETWORK_UPDATE_COMMAND_MODIFY = 1, /* modify an existing element */ + VIR_NETWORK_UPDATE_COMMAND_DELETE = 2, /* delete an existing element */ + VIR_NETWORK_UPDATE_COMMAND_ADD_LAST = 3, /* add an element at end of list */ + VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST = 4, /* add an element at start of list */ #ifdef VIR_ENUM_SENTINELS VIR_NETWORK_UPDATE_COMMAND_LAST #endif -- 1.7.11.4

2 2

[libvirt] [PATCHv2 0/9] new virNetworkUpdate API
by Laine Stump 19 Sep '12

19 Sep '12

===== Changes from V1: 1) implemented Eric's suggested change to make "command" a separate arg rather than squeezing it into the flags 2) already pushed the first two ACKed patches (not directly related to new API 3) added new patch at the end implementing updates of dhcp host entries. This patchset implements a new API function called virNetworkUpdate which enables updating certain parts of a libvirt network's definition without the need to destroy/re-start the network. This is especially useful, for example, to add/remove hosts from the dhcp static hosts table, or change portgroup settings. This was previously discussed in this thread: https://www.redhat.com/archives/libvir-list/2012-August/msg01535.html continuing here in September: https://www.redhat.com/archives/libvir-list/2012-September/msg00328.html with the final form here: https://www.redhat.com/archives/libvir-list/2012-September/msg00465.html In short, the single function has a "section" specifier which tells the part of the network definition to be updated, a "parentIndex" that gives the index of the *parent* element containing this section (when there are multiples - in particular in the case of the <ip> element), and a fully formed XML element which will be added as-is in the case of VIR_NETWORK_UPDATE_ADD_* (after checking for a duplicate), used to search for the specific element to delete in case of VIR_NETWORK_UPDATE_DELETE, and used both to find the existing element and replace its current contents in the case of VIR_UPDATE_EXISTING (this implies that you can't change the change the attribute used for indexing, e.g. the name of a portgroup, or mac address of a dhcp host entry). An example of use: to add a dhcp host entry to network "net", you would do this: virNetworkUpdate(net, VIR_NETWORK_UPDATE_COMMAND_ADD_LAST, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55' ip='192.168.122.5'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG); To delete that same entry: virNetworkUpdate(net, VIR_NETWORK_UPDATE_COMMAND_DELETE, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG); If you wanted to force any of these to affect the dhcp host list in the 3rd <ip> element of the network, you would replace "-1" with "2". Another example: to modify the portgroup named "engineering" (e.g. to increase the inbound average bandwidth from 1000 to 2000): virNetworkUpdate(net, VIR_NETWORK_UPDATE_COMMAND_MODIFY, VIR_NETWORK_SECTION_PORTGROUP, -1, "<portgroup name='engineering' default='yes'>" " <virtualport type='802.1Qbh'>" " <parameters profileid='test'/>" " </virtualport>" " <bandwidth>" " <inbound average='2000' peak='5000' burst='5120'/>" " <outbound average='1000' peak='5000' burst='5120'/>" " </bandwidth>" "</portgroup>", VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG) (note that parentIndex is irrelevant for PORTGROUP, since they are in the toplevel of <network>, so there aren't multiple instances of parents. In such cases, the caller *must* set parentIndex to -1 or 0 - any other value indicates that they don't understand the purpose/usage of parentIndex, so it must result in an error. Also note that the above function would fail if it couldn't find an existing portgroup with name='engineering' (i.e. it wouldn't automatically add a new one).) Adding support for each of the different sections has been reduced to a single function that handles the update of a virNetworkDef; all the logic to determine which virNetworkDef (def or newDef) and to restart/SIGHUP the appropriate daemons is in higher levels and is 100% complete. The low level functions aren't yet finished, although the function for IP_DHCP_HOST is nearly done. As usual, several of the patches are re-factoring existing code, and a couple are bugfixes that are only peripherally related: 1/9+2/9 - actual API 3/9 - utility functions to simplify API implementation 4/9 - framework for backend that updates the virNetworkDef 5/9 - refactoring in bridge_driver 6/9 - virNetworkUpdate for bridge_driver 7/9 - virNetworkUpdate for test_driver 8/9 - simple troubleshooting aid - restart dnsmasq/radvd when libvirtd is restarted (if its process is missing). 9/9 - implement backend for VIR_NETWORK_SECTION_IP_DHCP_HOST

3 21

[libvirt] [PATCH] virsh: Fix resource leaks when editing files.
by Peter Krempa 19 Sep '12

19 Sep '12

The cleanup path in virsh-edit helper was never reached when the edit was successful leaking the document in memory as well as the temporary file. --- tools/virsh-edit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 512ac0d..0ed0e8f 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -68,6 +68,7 @@ do { char *doc_edited = NULL; char *doc_reread = NULL; const char *msg = NULL; + bool edit_success = false; /* Get the XML configuration of the object. */ doc = (EDIT_GET_XML); @@ -139,7 +140,7 @@ redefine: } } - break; + edit_success = true; edit_cleanup: VIR_FREE(doc); @@ -149,7 +150,9 @@ edit_cleanup: unlink (tmp); VIR_FREE(tmp); } - goto cleanup; + + if (!edit_success) + goto cleanup; } while (0); -- 1.7.12

2 2

[libvirt] [PATCH] util: don't free dmidecode path string before printing it
by Ján Tomko 19 Sep '12

19 Sep '12

The path was freed before printing the error message, resulting in: error : virSysinfoRead:773 : internal error Failed to execute command (null) --- src/util/sysinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 92c3539..8ecd1e3 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -765,7 +765,6 @@ virSysinfoRead(void) { } cmd = virCommandNewArgList(path, "-q", "-t", "0,1,4,17", NULL); - VIR_FREE(path); virCommandSetOutputBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -796,6 +795,7 @@ virSysinfoRead(void) { goto no_memory; cleanup: + VIR_FREE(path); VIR_FREE(outbuf); virCommandFree(cmd); -- 1.7.8.6

3 3

[libvirt] [PATCH] security: Don't ignore errors when parsing DAC security labels
by Peter Krempa 19 Sep '12

19 Sep '12

The DAC security driver silently ignored errors when parsing the DAC label and used default values instead. With a domain containing the following label definition: <seclabel type='static' model='dac' relabel='yes'> <label>sdfklsdjlfjklsdjkl</label> </seclabel> the domain would start normaly but the disk images would be still owned by root and no error was displayed. This patch changes the behavior if the parsing of the label fails (note that a not present label is not a failure and in this case the default label should be used) the error isn't masked but is raised that causes the domain start to fail with a descriptive error message: virsh # start tr error: Failed to start domain tr error: invalid argument: failed to parse uid and gid for DAC security driver: sdfklsdjlfjklsdjkl I also changed the error code to "invalid argument" from "internal error". --- src/security/security_dac.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 211fb37..c669496 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -140,6 +140,8 @@ int virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, return -1; } + +/* returns 1 if label isn't found, 0 on success, -1 on error */ static int virSecurityDACParseImageIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) @@ -149,19 +151,19 @@ int virSecurityDACParseImageIds(virDomainDefPtr def, virSecurityLabelDefPtr seclabel; if (def == NULL) - return -1; + return 1; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); if (seclabel == NULL || seclabel->imagelabel == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label for DAC not found in domain %s"), def->name); - return -1; + return 1; } if (seclabel->imagelabel && parseIds(seclabel->imagelabel, &uid, &gid)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INVALID_ARG, _("failed to parse uid and gid for DAC " "security driver: %s"), seclabel->label); return -1; @@ -179,8 +181,10 @@ static int virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr) { - if (virSecurityDACParseImageIds(def, uidPtr, gidPtr) == 0) - return 0; + int ret; + + if ((ret = virSecurityDACParseImageIds(def, uidPtr, gidPtr)) <= 0) + return ret; if (priv) { if (uidPtr) -- 1.7.12

2 2

[libvirt] [PATCH 0/4] Add support for reboot-timeout
by Martin Kletzander 19 Sep '12

19 Sep '12

This series introduces simple reboot timeout support. That means what should be done in case all boot options fail, reboot or not. And if yes, then how long the machine should wait. Before adding the support for that into XML parser, builder, and qemu, I felt the need to cleanup the boot parsing and enums (I couldn't look at that), so that's the first patch. Most of it is mechanical, the rest should be pretty straight-forward. --- I'd *love* to have it in 0.10.2, but I understand if it's too late :( Martin Kletzander (4): qemu: Cleanup boot parameter building Add support for reboot-timeout qemu: Add support for reboot-timeout QEMU Tests for reboot-timeout docs/formatdomain.html.in | 9 ++ docs/schemas/domaincommon.rng | 20 ++++ src/conf/domain_conf.c | 56 ++++++++- src/conf/domain_conf.h | 78 ++++++++----- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 129 +++++++++++++++++---- tests/qemuargv2xmltest.c | 4 + ...xml2argv-boot-menu-disable-drive-bootindex.args | 1 + .../qemuxml2argv-reboot-timeout-disabled.args | 3 + .../qemuxml2argv-reboot-timeout-disabled.xml | 21 ++++ .../qemuxml2argv-reboot-timeout-enabled.args | 3 + .../qemuxml2argv-reboot-timeout-enabled.xml | 21 ++++ tests/qemuxml2argvtest.c | 5 + tests/qemuxml2xmltest.c | 4 + 16 files changed, 304 insertions(+), 57 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.xml -- 1.7.12

3 11

[libvirt] [PATCH 0/3] more build fixes
by Eric Blake 19 Sep '12

19 Sep '12

Pushing all three under the build-breaker rules. Eric Blake (3): bitmap: fix problems in previous commit build: fix nodeinfo build on non-Linux platforms build: avoid unused symbol src/libvirt_private.syms | 1 - src/nodeinfo.c | 4 ++++ src/util/bitmap.c | 3 +-- tests/virbitmaptest.c | 12 +++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) -- 1.7.11.4

2 6

[libvirt] [PATCH] Ensure existing selinux mount is removed before mounting new one in LXC
by Daniel P. Berrange 19 Sep '12

19 Sep '12

Some kernel versions (at least RHEL-6 2.6.32) do not let you over-mount an existing selinuxfs instance with a new one. Thus we must unmount the existing instance inside our namespace. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9bc5610..f5b0bc6 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1533,6 +1533,14 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, lxcContainerUnmountSubtree("/proc", false) < 0)) goto cleanup; +#if HAVE_SELINUX + /* Some versions of Linux kernel don't let you overmount + * the selinux filesystem, so make sure we kill it first + */ + if (lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) + goto cleanup; +#endif + /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(true, sec_mount_options) < 0) goto cleanup; @@ -1615,6 +1623,14 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, lxcContainerUnmountSubtree("/proc", false) < 0) goto cleanup; +#if HAVE_SELINUX + /* Some versions of Linux kernel don't let you overmount + * the selinux filesystem, so make sure we kill it first + */ + if (lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) + goto cleanup; +#endif + /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(false, sec_mount_options) < 0) goto cleanup; -- 1.7.1

2 1

[libvirt] [PATCH] Improve some debugging log messages in LXC mount setup
by Daniel P. Berrange 19 Sep '12

19 Sep '12

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f5b0bc6..8fbbc0d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -556,8 +556,9 @@ static int lxcContainerMountBasicFS(bool pivotRoot, srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts); if (mount(srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s"), - mnts[i].src, mnts[i].dst, NULLSTR(mnts[i].type)); + _("Failed to mount %s on %s type %s flags=%d opts=%s"), + srcpath, mnts[i].dst, NULLSTR(mnts[i].type), + mnts[i].mflags, NULLSTR(mnts[i].opts)); goto cleanup; } } @@ -579,8 +580,8 @@ static int lxcContainerMountBasicFS(bool pivotRoot, MS_NOSUID, opts); if (mount("devfs", "/dev", "tmpfs", MS_NOSUID, opts) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s"), - "devfs", "/dev", "tmpfs"); + _("Failed to mount %s on %s type %s (%s)"), + "devfs", "/dev", "tmpfs", opts); goto cleanup; } } -- 1.7.1

2 1

[libvirt] [PATCH] build: avoid non-portable byte-swapping
by Eric Blake 19 Sep '12

19 Sep '12

Commit 0fc89098 used functions only available on glibc, completely botched 32-bit environments, and risked SIGBUS due to unaligned memory access on platforms that aren't as forgiving as x86_64. * bootstrap.conf (gnulib_modules): Import ffsl. * src/util/bitmap.c (includes): Use <strings.h> for ffsl. (virBitmapNewData, virBitmapToData): Avoid 64-bit assumptions and non-portable functions. --- I wish I could push this under the build-breaker rule, but it is not quite trivial enough. bootstrap.conf | 1 + src/util/bitmap.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 2847c0b..23000ac 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -44,6 +44,7 @@ fcntl fcntl-h fdatasync ffs +ffsl fnmatch fsync func diff --git a/src/util/bitmap.c b/src/util/bitmap.c index 51e567a..4bade6c 100644 --- a/src/util/bitmap.c +++ b/src/util/bitmap.c @@ -1,7 +1,7 @@ /* * bitmap.h: Simple bitmap operations * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 Novell, Inc. * * This library is free software; you can redistribute it and/or @@ -27,6 +27,7 @@ #include <stdint.h> #include <stdio.h> #include <string.h> +#include <strings.h> #include <stdlib.h> #include <sys/types.h> @@ -418,15 +419,23 @@ virBitmapPtr virBitmapNewCopy(virBitmapPtr src) virBitmapPtr virBitmapNewData(void *data, int len) { virBitmapPtr bitmap; - int i; + int i, j; + unsigned long *p; + unsigned char *bytes = data; bitmap = virBitmapNew(len * CHAR_BIT); if (!bitmap) return NULL; - memcpy(bitmap->map, data, len); - for (i = 0; i < bitmap->map_len; i++) - bitmap->map[i] = le64toh(bitmap->map[i]); + /* le64toh is not provided by gnulib, so we do the conversion by hand */ + p = bitmap->map; + for (i = j = 0; i < len; i++, j++) { + if (j == sizeof(*p)) { + j = 0; + p++; + } + *p |= bytes[i] << (j * CHAR_BIT); + } return bitmap; } @@ -446,19 +455,26 @@ int virBitmapToData(virBitmapPtr bitmap, unsigned char **data, int *dataLen) { int len; unsigned long *l; - int i; + int i, j; + unsigned char *bytes; - len = bitmap->map_len * (VIR_BITMAP_BITS_PER_UNIT / CHAR_BIT); + len = (bitmap->max_bit + CHAR_BIT - 1) / CHAR_BIT; if (VIR_ALLOC_N(*data, len) < 0) return -1; - memcpy(*data, bitmap->map, len); + bytes = *data; *dataLen = len; - l = (unsigned long *)*data; - for (i = 0; i < bitmap->map_len; i++, l++) - *l = htole64(*l); + /* htole64 is not provided by gnulib, so we do the conversion by hand */ + l = bitmap->map; + for (i = j = 0; i < len; i++, j++) { + if (j == sizeof(*l)) { + j = 0; + l++; + } + bytes[i] = *l >> (j * CHAR_BIT); + } return 0; } -- 1.7.11.4

2 3

[libvirt] [PATCH v4 0/9] improve virBitmap
by Hu Tao 18 Sep '12

18 Sep '12

In many places we store bitmap info in a chunk of data (pointed to by a char *), and have redundant codes to set/unset bits. This series extends virBitmap, and convert those codes to use virBitmap. changes: v4: - rename virBitmapAlloc to virBitmapNew - rename virBitmapAllocFromData to virBitmapNewData v3: - renaming member variables of virBitmap - rewrite virBitmapFormat using virBitmapNextSetBit - store bits in machine native endian format - more tests of virBitmap v2: - fix bug in qemuSetupCgroupForEmulator - new function virBitmapNextSetBit - virBitmapcmp -> virBitmapEqual - virBitmap: store bits in little endian format - some improvements of virBitmap - fix some memory leaks Hu Tao (9): bitmap: new member variable and function renaming New functions for virBitmap use virBitmap to store cpupin info use virBitmap to store cpu affinity info use virBitmap to store numa nodemask info. use virBitmap to store cpumask info. use virBitmap to store cells' cpumask info. use virBitmap to store nodeinfo. remove virDomainCpuSetFormat and virDomainCpuSetParse .gitignore | 1 + src/conf/cpu_conf.c | 17 +- src/conf/cpu_conf.h | 3 +- src/conf/domain_conf.c | 394 ++++++---------------------------- src/conf/domain_conf.h | 18 +- src/conf/snapshot_conf.c | 2 +- src/libvirt_private.syms | 16 +- src/lxc/lxc_controller.c | 56 +++-- src/nodeinfo.c | 26 +-- src/nodeinfo.h | 6 +- src/parallels/parallels_driver.c | 5 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 43 +--- src/qemu/qemu_driver.c | 170 +++++++-------- src/qemu/qemu_process.c | 141 ++++-------- src/test/test_driver.c | 5 +- src/util/bitmap.c | 435 ++++++++++++++++++++++++++++++++++++-- src/util/bitmap.h | 36 +++- src/util/processinfo.c | 36 ++-- src/util/processinfo.h | 9 +- src/vmx/vmx.c | 36 ++-- tests/Makefile.am | 7 +- tests/cpuset | 2 +- tests/virbitmaptest.c | 362 +++++++++++++++++++++++++++++++ tools/virsh-domain.c | 2 +- 27 files changed, 1136 insertions(+), 706 deletions(-) create mode 100644 tests/virbitmaptest.c -- 1.7.10.2

5 36

[libvirt] update: dnsmasq and dynamic dns for IPv6
by Gene Czarcinski 18 Sep '12

18 Sep '12

I have done a bunch of testing and NetworkManager does not send the client-host's name to the server so that an IPv6 dns entry can occur. I have dupicated the problem with dnsmasq and bind/dhcp. This has been reported: https://bugzilla.redhat.com/show_bug.cgi?id=858327 Now back to figuring out how to get IPv6 dhcp support into libvirt. Gene

1 0

Re: [libvirt] [libvirt-users] virNodeGetCPUStats and virDomainGetCPUStats have same name in pyton binding as getCPUStats
by Daniel Veillard 18 Sep '12

18 Sep '12

On Tue, Sep 18, 2012 at 10:56:55AM +0000, Buggi, Harsha wrote: > Hi, > > virNodeGetCPUStats and virDomainGetCPUStats have same name in pyton binding as getCPUStats > > virDomainGetCPUStats gets called internally when we use the method getCPUStats. How do we access virNodeGetCPUStats? Ouch we need to fix the generator to have domainGetCPUStats !! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH 0/5] Support ephemeral passthrough hostdevs
by Shradha Shah 18 Sep '12

18 Sep '12

The ephemeral flag helps support migration with PCI-passthrough. An ephemeral hostdev is automatically unplugged before migration and replugged (if one is available on the destination) after migration. Shradha Shah (5): Added ephemeral flag for hostdev in domain conf. Adding ephemeral flag for hostdev in network conf. Ephemeral flag mofication within the network driver. Ephemeral flag modification within the qemu driver. Migration support for ephemeral hostdevs. docs/schemas/domaincommon.rng | 16 +++ docs/schemas/network.rng | 8 ++ src/conf/domain_conf.c | 23 ++++- src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 11 ++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 1 + src/qemu/qemu_command.c | 49 +++++----- src/qemu/qemu_migration.c | 98 +++++++++++++++++++- tests/networkxml2xmlin/hostdev-pf.xml | 2 +- tests/networkxml2xmlin/hostdev.xml | 2 +- tests/networkxml2xmlout/hostdev-pf.xml | 2 +- tests/networkxml2xmlout/hostdev.xml | 2 +- .../qemuxml2argv-hostdev-pci-address.xml | 2 +- .../qemuxml2argv-hostdev-usb-address.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 4 +- 17 files changed, 188 insertions(+), 38 deletions(-) -- 1.7.4.4

1 5

[libvirt] [PATCH] Fix minor details in apic eoi
by Martin Kletzander 18 Sep '12

18 Sep '12

The introduction of APIC EOI patches had a few little details that could look better, so this patch fixes that. The fixes: - "on" and "off" as values are changed to <code>on</code> and <code>off</code> respectively, because the code around uses the same tags for such values. - VIR_FREE is unnecessary as it is done in the error handling as well - one empty line stayed in my local changes not included in the sent patch, the code around is separated in similar fashion - For const strings, virBufferAddLit should be used instead of virBufferAsprintf. --- docs/formatdomain.html.in | 6 +++--- src/conf/domain_conf.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8bdfbf1..51f897c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1020,9 +1020,9 @@ </dd> <dt><code>apic</code></dt> <dd>APIC allows the use of programmable IRQ - management. <span class="since">Since 0.10.2 (QEMU only)</span> - there is an optional attribute <code>eoi</code> with values "on" - and "off" which toggles the availability of EOI (End of + management. <span class="since">Since 0.10.2 (QEMU only)</span> there is + an optional attribute <code>eoi</code> with values <code>on</code> + and <code>off</code> which toggles the availability of EOI (End of Interrupt) for the guest. </dd> <dt><code>hap</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b8ba0e2..880ac17 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8851,7 +8851,6 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown value for attribute eoi: %s"), tmp); - VIR_FREE(tmp); goto error; } def->apic_eoi = eoi; @@ -13433,6 +13432,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, } virBufferAddLit(buf, " <os>\n"); + virBufferAddLit(buf, " <type"); if (def->os.arch) virBufferAsprintf(buf, " arch='%s'", def->os.arch); @@ -13523,7 +13523,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, " eoi='%s'", virDomainApicEoiTypeToString(def->apic_eoi)); } - virBufferAsprintf(buf, "/>\n"); + virBufferAddLit(buf, "/>\n"); } } virBufferAddLit(buf, " </features>\n"); -- 1.7.12

2 2

[libvirt] [PATCH] virNetDevBandwidthClear: Improve error handling
by Martin Kletzander 18 Sep '12

18 Sep '12

Two changes are introduced in this patch. The first change removes ATTRIBUTE_RETURN_CHECK from virNetDevBandwidthClear, because it was called with ignore_value always, anyway. The function is used even when it's not necessary to call it, just for cleanup purposes. The second change is an added parameter "ignore_error" for the same function, which basically means "Ignore any errors from the commands that will be run". This parameter, when true, doesn't suppress any libvirt errors, just the exit value of commands ran. --- src/network/bridge_driver.c | 4 ++-- src/util/virnetdevbandwidth.c | 15 ++++++++++----- src/util/virnetdevbandwidth.h | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0e38016..f153cdd 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2161,7 +2161,7 @@ networkStartNetworkVirtual(struct network_driver *driver, return 0; err5: - ignore_value(virNetDevBandwidthClear(network->def->bridge)); + virNetDevBandwidthClear(network->def->bridge, true); err4: if (!save_err) @@ -2206,7 +2206,7 @@ networkStartNetworkVirtual(struct network_driver *driver, static int networkShutdownNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) { - ignore_value(virNetDevBandwidthClear(network->def->bridge)); + virNetDevBandwidthClear(network->def->bridge, true); if (network->radvdPid > 0) { char *radvdpidbase; diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b23ccd3..98f6b68 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,7 +69,7 @@ virNetDevBandwidthSet(const char *ifname, goto cleanup; } - ignore_value(virNetDevBandwidthClear(ifname)); + virNetDevBandwidthClear(ifname, true); if (bandwidth->in) { if (virAsprintf(&average, "%llukbps", bandwidth->in->average) < 0) @@ -163,15 +163,19 @@ cleanup: * Return 0 on success, -1 otherwise. */ int -virNetDevBandwidthClear(const char *ifname) +virNetDevBandwidthClear(const char *ifname, bool ignore_error) { int ret = 0; + int exitstatus, *es = NULL; virCommandPtr cmd = NULL; + if (ignore_error) + es = &exitstatus; + cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", ifname, "root", NULL); - if (virCommandRun(cmd, NULL) < 0) + if (virCommandRun(cmd, es) < 0) ret = -1; virCommandFree(cmd); @@ -179,8 +183,9 @@ virNetDevBandwidthClear(const char *ifname) cmd = virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", ifname, "ingress", NULL); - if (virCommandRun(cmd, NULL) < 0) + if (virCommandRun(cmd, es) < 0) ret = -1; + virCommandFree(cmd); return ret; diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index 18384ae..f15b489 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,8 +43,8 @@ void virNetDevBandwidthFree(virNetDevBandwidthPtr def); int virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthPtr bandwidth) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -int virNetDevBandwidthClear(const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virNetDevBandwidthClear(const char *ifname, bool ignore_error) + ATTRIBUTE_NONNULL(1); int virNetDevBandwidthCopy(virNetDevBandwidthPtr *dest, const virNetDevBandwidthPtr src) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -- 1.7.12

2 2

[libvirt] [PATCH] secret: Fix error for private secrets
by Martin Kletzander 18 Sep '12

18 Sep '12

When trying to get the value of a private secret, the code used 'operation denied' error. That error is specified as an error for read-only connections trying to perform denied operation. The following error seems more accurate. To compare the difference: - BEFORE error: operation secret is private forbidden for read only access - AFTER error: Invalid secret: secret is private --- src/secret/secret_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 2ad66dd..67c7323 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1,7 +1,7 @@ /* * secret_driver.c: local driver for secret manipulation API * - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -990,7 +990,7 @@ secretGetValue(virSecretPtr obj, size_t *value_size, unsigned int flags, if ((internalFlags & VIR_SECRET_GET_VALUE_INTERNAL_CALL) == 0 && secret->def->private) { - virReportError(VIR_ERR_OPERATION_DENIED, "%s", + virReportError(VIR_ERR_INVALID_SECRET, "%s", _("secret is private")); goto cleanup; } -- 1.7.12

2 2

[libvirt] [PATCH] syntax-check: fix run.in
by Martin Kletzander 18 Sep '12

18 Sep '12

Two more problems in "run.in" made the syntax-check fail. --- Pushed under the 'build-breaker' rule. cfg.mk | 2 +- run.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 0dd58df..bbfd4a2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -789,7 +789,7 @@ exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \ ^src/rpc/gendispatch\.pl$$ exclude_file_name_regexp--sc_prohibit_nonreentrant = \ - ^((po|tests)/|docs/.*py$$) + ^((po|tests)/|docs/.*py|run.in$$) exclude_file_name_regexp--sc_prohibit_raw_allocation = \ ^(src/util/memory\.[ch]|examples/.*)$$ diff --git a/run.in b/run.in index 83c1785..f7d30ca 100644 --- a/run.in +++ b/run.in @@ -1,6 +1,6 @@ #!/bin/bash - # libvirt 'run' programs locally script -# Copyright (C) 2012 Red Hat Inc. +# Copyright (C) 2012 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 1.7.12

1 0

[libvirt] [PATCH] Adhere to copyright_address check
by Guido Günther 18 Sep '12

18 Sep '12

to fix "make syntax-check" Found by http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ --- run.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/run.in b/run.in index 7700e52..83c1785 100644 --- a/run.in +++ b/run.in @@ -13,8 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# along with this program; If not, see <http://www.gnu.org/licenses/>. #---------------------------------------------------------------------- # -- 1.7.10.4

3 2

[libvirt] [PATCH] qemuhelptest: convert runaway tab to spaces
by Ján Tomko 18 Sep '12

18 Sep '12

Make syntax-check happy and smiling again. --- tests/qemuhelptest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 5c6ecd5..a3d9656 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -845,7 +845,7 @@ mymain(void) QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_BLOCKIO, - QEMU_CAPS_SCSI_DISK_WWN, + QEMU_CAPS_SCSI_DISK_WWN, QEMU_CAPS_SECCOMP_SANDBOX); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 1.7.8.6

3 2

[libvirt] FYI: valgrind output from libvirtd when running the libguestfs test suite
by Richard W.M. Jones 18 Sep '12

18 Sep '12

./run \ valgrind --leak-check=full --child-silent-after-fork=yes \ --log-file=/tmp/valgrind.log \ daemon/libvirtd --timeout=30 Then run '../libvirt/run make check' in another window. This is with libvirt from git, updated a few hours ago. I'm always dubious about these strlen problems since they are often caused by glibc, but could be worth looking into. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

1 0

[libvirt] [libvirt-glib][PATCH] autobuild: Init AUTOBUILD_INSTALL_ROOT variable
by Michal Privoznik 18 Sep '12

18 Sep '12

Otherwise autobuild sets prefix to / resulting in Permission denied when building as non-root as 'make install' tries to write to /lib. We need to set this var to accessible path like $HOME/builder. --- autobuild.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 3675249..053dc1f 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -4,6 +4,7 @@ set -e set -v test -n "$1" && RESULTS=$1 || RESULTS=results.log +: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} # Make things clean. test -f Makefile && make -k distclean || : -- 1.7.8.6

2 2

[libvirt] [PATCH 00/10] new virNetworkUpdate API
by Laine Stump 18 Sep '12

18 Sep '12

This patchset implements a new API function called virNetworkUpdate which enables updating certain parts of a libvirt network's definition without the need to destroy/re-start the network. This is especially useful, for example, to add/remove hosts from the dhcp static hosts table, or change portgroup settings. This was previously discussed in this thread: https://www.redhat.com/archives/libvir-list/2012-August/msg01535.html continuing here in September: https://www.redhat.com/archives/libvir-list/2012-September/msg00328.html with the final form here: https://www.redhat.com/archives/libvir-list/2012-September/msg00465.html In short, the single function has a "section" specifier which tells the part of the network definition to be updated, a "parentIndex" that gives the index of the *parent* element containing this section (when there are multiples - in particular in the case of the <ip> element), and a fully formed XML element which will be added as-is in the case of VIR_NETWORK_UPDATE_ADD_* (after checking for a duplicate), used to search for the specific element to delete in case of VIR_NETWORK_UPDATE_DELETE, and used both to find the existing element and replace its current contents in the case of VIR_UPDATE_EXISTING (this implies that you can't change the change the attribute used for indexing, e.g. the name of a portgroup, or mac address of a dhcp host entry). An example of use: to add a dhcp host entry to network "net", you would do this: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55' ip='192.168.122.5'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_ADD_LAST); To delete that same entry: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_DELETE); If you wanted to force any of these to affect the dhcp host list in the 3rd <ip> element of the network, you would replace "-1" with "2". Another example: to modify the portgroup named "engineering" (e.g. to increase the inbound average bandwidth from 1000 to 2000): virNetworkUpdate(net, VIR_NETWORK_SECTION_PORTGROUP, -1, "<portgroup name='engineering' default='yes'>" " <virtualport type='802.1Qbh'>" " <parameters profileid='test'/>" " </virtualport>" " <bandwidth>" " <inbound average='2000' peak='5000' burst='5120'/>" " <outbound average='1000' peak='5000' burst='5120'/>" " </bandwidth>" "</portgroup>", VIR_NETWORK_UPDATE_EXISTING | VIR_NETWORK_UPDATE_LIVE | VIR_NETWORK_UPDATE_CONFIG) (note that parentIndex is irrelevant for PORTGROUP, since they are in the toplevel of <network>, so there aren't multiple instances of parents. In such cases, the caller *must* set parentIndex to -1 or 0 - any other value indicates that they don't understand the purpose/usage of parentIndex, so it must result in an error. Also note that the above function would fail if it couldn't find an existing portgroup with name='engineering' (i.e. it wouldn't automatically add a new one).) Adding support for each of the different sections has been reduced to a single function that handles the update of a virNetworkDef; all the logic to determine which virNetworkDef (def or newDef) and to restart/SIGHUP the appropriate daemons is in higher levels and is 100% complete. The low level functions aren't yet finished, although the function for IP_DHCP_HOST is nearly done. As usual, several of the patches are re-factoring existing code, and a couple are bugfixes that are only peripherally related: 1/10 - splits out parsing of dhcp related elements to separate functions 2/10 - fixes a small bug that would probably never be encountered IRL anyway 3/10+4/10 - actual API 5/10 - utility functions to simplify API implementation 6/10 - framework for backend that updates the virNetworkDef 7/10 - refactoring in bridge_driver 8/10 - virNetworkUpdate for bridge_driver 9/10 - virNetworkUpdate for test_driver 10/10 - simple troubleshooting aid - restart dnsmasq/radvd when libvirtd is restarted (if its process is missing). I'll try to have the following additional patches posted later today: 11/10 - backend for IP_DHCP_HOST update 12/10 - backend for PORTGROUP update 13/10 - virsh "net-update" command Differences from email thread: 1) Aside from being actual code instead of just pseudo code, I've changed the "index" arg into "parentIndex" to avoid confusion between the index of the element we're looking at (e.g. which host in the list of hosts in a <dhcp> element) and the index of the parent (e.g. which <ip> element will contain the <dhcp> with the list of <hosts> we want to update). I also changed this from a unsigned into to an int so that it can hold the special value "-1", which means "pick the most useful/only item". Again, in the case of VIR_NETWORK_SECTION_IP_DHCP_HOST, this would mean to pick the one <ip> element that actually has a <dhcp> section (may not be the first, but there can only be one). 2) added VIR_NETWORK_UPDATE_AFFECT_CURRENT similar to VIR_DOMAIN_AFFECT_CURRENT

3 20

[libvirt] [PATCH] rpc: Fix name of member in remote_protocol-structs
by Peter Krempa 18 Sep '12

18 Sep '12

Commit 7a99b0abafb69e1686198ac3473892a9aaeb8255 adds a new RPC struct but one of the members has different names in remote_protocol.x and remote_protocol-struct breaking make check. --- Pushing under build-breaker rule. src/remote_protocol-structs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 0a9beff..4d2627a 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -981,7 +981,7 @@ struct remote_network_update_args { remote_nonnull_network net; u_int command; u_int section; - int index; + int parentIndex; remote_nonnull_string xml; u_int flags; }; -- 1.7.12

1 0

[libvirt] Add a ./run script for running programs from the local directory.
by Richard W.M. Jones 18 Sep '12

18 Sep '12

In libguestfs we successfully use a ./run script which sets up the environment so you can run libguestfs programs (internal and external ones, in C and non-C) without needing to install anything. This adds a similar script for libvirt. Here is the documentation included in the script: # With this script you can run libvirt programs without needing to # install them first. You just have to do for example: # # ./run ./tools/virsh [args ...] # # If you are already in the tools/ subdirectory, then the following # command will also work: # # ../run ./virsh [...] # # You can also run the C programs under valgrind like this: # # ./run valgrind [valgrind opts...] ./program # # or under gdb: # # ./run gdb --args ./program # # This also works with sudo (eg. if you need root access for libvirt): # # sudo ./run ./tools/virsh list --all

2 8

[libvirt] [PATCH] virBitmap: fix build without HAVE_NUMACTL
by Ján Tomko 18 Sep '12

18 Sep '12

Commit 75b198b3e7b2c8b4106afbd42f8bb795c4773511 forgot to change arguments of dummy qemuProcessInitNumaMemoryPolicy from char* to virBitmapPtr. --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5095381..c28f5a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1798,7 +1798,7 @@ cleanup: #else static int qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm, - const char *nodemask ATTRIBUTE_UNUSED) + virBitmapPtr nodemask ATTRIBUTE_UNUSED) { if (vm->def->numatune.memory.nodemask) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.8.6

3 2

[libvirt] [PATCHv3 0/4] qemu: Add seccomp sandbox support
by Ján Tomko 18 Sep '12

18 Sep '12

This series adds support to run QEMU with seccomp sandbox enabled. It can be configured in qemu.conf to on, off, or the QEMU default, which is off in 1.2. Default value is the QEMU default. V1 of the patches supports tri-state configuration and includes a test for detecting the capability. V2 includes libvirtd_qemu.aug, renames vague 'sandbox' to 'seccompSandbox' and prints an error if the sandbox was requested but QEMU doesn't have the capability. V3 is a rebase, needed after the addition of usb-redir.filter and the change of virBitmapPtr to qemuCapsPtr. Ján Tomko (4): qemu: add capability flag for seccomp sandbox qemu: conf: add seccomp_sandbox option qemu: add -sandbox to command line if requested tests: add qemu-1.2.0 help data src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_conf.c | 5 + src/qemu/qemu_conf.h | 1 + tests/qemuhelpdata/qemu-1.2.0 | 270 ++++++++++++++++++++++++++++++++++ tests/qemuhelpdata/qemu-1.2.0-device | 181 +++++++++++++++++++++++ tests/qemuhelptest.c | 82 ++++++++++ 10 files changed, 563 insertions(+), 0 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-1.2.0 create mode 100644 tests/qemuhelpdata/qemu-1.2.0-device -- 1.7.8.6

2 5

[libvirt] [PATCH] qemu: Avoid deadlock on HandleAgentEOF
by Michal Privoznik 18 Sep '12

18 Sep '12

On agent EOF the qemuProcessHandleAgentEOF() callback is called which locks virDomainObjPtr. Then qemuAgentClose() is called (with domain object locked) which eventually calls qemuAgentFree() and qemuProcessHandleAgentDestroy(). This tries to lock the domain object again. Hence the deadlock. --- src/qemu/qemu_process.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5ac1d2b..8f42c83 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -115,7 +115,7 @@ extern struct qemud_driver *qemu_driver; * performed */ static void -qemuProcessHandleAgentEOF(qemuAgentPtr agent ATTRIBUTE_UNUSED, +qemuProcessHandleAgentEOF(qemuAgentPtr agent, virDomainObjPtr vm) { struct qemud_driver *driver = qemu_driver; @@ -127,12 +127,12 @@ qemuProcessHandleAgentEOF(qemuAgentPtr agent ATTRIBUTE_UNUSED, virDomainObjLock(vm); priv = vm->privateData; - - qemuAgentClose(agent); priv->agent = NULL; virDomainObjUnlock(vm); qemuDriverUnlock(driver); + + qemuAgentClose(agent); } -- 1.7.8.6

2 2

[libvirt] [PATCH 0/4 v3] Support to set disk wwn
by Osier Yang 18 Sep '12

18 Sep '12

v2 - v3: * Just rebase on the top. v1 - v2: * Validate wwn while parsing * Error out earlier "if (disk->device == "lun" && disk->wwn)", no logic change. This introduces new element <wwn> for disk, to allow to set wwn (just like setting serial number) for the virtual disk (Only QEMU devices like ide-drive, ide-hd, ide-cd, scsi-disk, scsi-hd, and scsi-cd support it). Osier Yang (4): schema: Add schema for disk <wwn> conf: Parse and format disk <wwn> qemu: Add caps to indentify if setting wwn is supported by qemu qemu: Use disk wwn in qemu command line docs/formatdomain.html.in | 6 +++ docs/schemas/basictypes.rng | 6 +++ docs/schemas/domaincommon.rng | 5 +++ docs/schemas/nodedev.rng | 6 --- src/conf/domain_conf.c | 12 +++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 8 ++++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 33 ++++++++++++++++++ src/util/util.c | 17 +++++++++ src/util/util.h | 2 + .../qemuxml2argv-disk-ide-wwn.args | 6 +++ .../qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml | 28 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-wwn.args | 10 ++++++ .../qemuxml2argv-disk-scsi-disk-wwn.xml | 35 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ 17 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml -- 1.7.7.3

2 9

[libvirt] [PATCH 0/3] block commit support
by Eric Blake 18 Sep '12

18 Sep '12

I'm still working on the qemu implementation of this API, but want to get the API reviewed and included in 0.10.2 before adding piecewise support for more and more of the API. My biggest issues for current implementations are: online qemu: Jeff's block-commit API is still not part of qemu.git, and might be subject to change, in particular based on review from Paolo's drive-mirror changes (since both patch series will be sharing related code on how to handle error reporting). offline qemu: qemu-img is a blocking command, but this API promises to be asynchronous. I'll have to run qemu-img in a worker thread, and I still need to figure out whether qemu-img can display progress for virDomainBlockJobInfo (can you send it a SIGUSR1, like for dd?), otherwise, the job will look like it is making no progress. But as neither of those issues invalidate the API, I'm comfortable with committing the API now (after all, that's what we did back in 0.9.12 with the virDomainBlockRebase API - we committed code in preparation for qemu to implement drive-mirror, and we are STILL waiting on qemu to follow through with that promise...) Obviously, there will be more patches to come as I get more things working at the qemu layer (I'm not sure whether online or offline qemu will be done first, as I have branches working on both approaches while I am testing against Jeff's qemu patch proposals). Eric Blake (3): blockjob: add virDomainBlockCommit blockjob: add virsh blockcommit blockjob: add blockcommit support to rpc docs/apibuild.py | 1 + include/libvirt/libvirt.h.in | 20 ++++++ src/driver.h | 5 ++ src/libvirt.c | 105 +++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++- src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 1 + tools/virsh-domain.c | 153 ++++++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 30 +++++++++ 11 files changed, 336 insertions(+), 2 deletions(-) -- 1.7.11.4

2 9

[libvirt] [PATCH] qemu: drop unused arguments for dump-guest-memory
by Eric Blake 18 Sep '12

18 Sep '12

Upstream qemu has raised a concern about whether dumping guest memory by reading guest paging tables is a security hole: https://lists.gnu.org/archive/html/qemu-devel/2012-09/msg02607.html While auditing libvirt to see if we would be impacted, I noticed that we had some dead code. It is simpler to nuke the dead code and limit our monitor code to just the subset we make use of. * src/qemu/qemu_monitor.h (QEMU_MONITOR_DUMP): Drop poorly named and mostly-unused enum. * src/qemu/qemu_monitor.c (qemuMonitorDumpToFd): Drop arguments. * src/qemu/qemu_monitor_json.h (qemuMonitorJSONDump): Likewise. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDump): Likewise. * src/qemu/qemu_driver.c (qemuDumpToFd): Update caller. --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 12 ++++-------- src/qemu/qemu_monitor.h | 11 +---------- src/qemu/qemu_monitor_json.c | 24 +++++++----------------- src/qemu/qemu_monitor_json.h | 5 +---- 5 files changed, 14 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f14c220..e6e5d02 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3136,7 +3136,7 @@ static int qemuDumpToFd(struct qemud_driver *driver, virDomainObjPtr vm, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - ret = qemuMonitorDumpToFd(priv->mon, 0, fd, 0, 0); + ret = qemuMonitorDumpToFd(priv->mon, fd); qemuDomainObjExitMonitorWithDriver(driver, vm); return ret; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b7730fd..b772b28 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2045,15 +2045,11 @@ int qemuMonitorMigrateCancel(qemuMonitorPtr mon) return ret; } -int qemuMonitorDumpToFd(qemuMonitorPtr mon, - unsigned int flags, - int fd, - unsigned long long begin, - unsigned long long length) +int +qemuMonitorDumpToFd(qemuMonitorPtr mon, int fd) { int ret; - VIR_DEBUG("mon=%p fd=%d flags=%x begin=%llx length=%llx", - mon, fd, flags, begin, length); + VIR_DEBUG("mon=%p fd=%d", mon, fd); if (!mon) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2073,7 +2069,7 @@ int qemuMonitorDumpToFd(qemuMonitorPtr mon, if (qemuMonitorSendFileHandle(mon, "dump", fd) < 0) return -1; - ret = qemuMonitorJSONDump(mon, flags, "fd:dump", begin, length); + ret = qemuMonitorJSONDump(mon, "fd:dump"); if (ret < 0) { if (qemuMonitorCloseFileHandle(mon, "dump") < 0) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index e37dac8..232ae96 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -387,17 +387,8 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon, int qemuMonitorMigrateCancel(qemuMonitorPtr mon); -typedef enum { - QEMU_MONITOR_DUMP_HAVE_FILTER = 1 << 0, - QEMU_MONITOR_DUMP_PAGING = 1 << 1, - QEMU_MONITOR_DUMP_FLAGS_LAST -} QEMU_MONITOR_DUMP; - int qemuMonitorDumpToFd(qemuMonitorPtr mon, - unsigned int flags, - int fd, - unsigned long long begin, - unsigned long long length); + int fd); int qemuMonitorGraphicsRelocate(qemuMonitorPtr mon, int type, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b23be1e..a5198b0 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2552,28 +2552,18 @@ int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon) return ret; } -int qemuMonitorJSONDump(qemuMonitorPtr mon, - unsigned int flags, - const char *protocol, - unsigned long long begin, - unsigned long long length) +int +qemuMonitorJSONDump(qemuMonitorPtr mon, + const char *protocol) { int ret; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; - if (flags & QEMU_MONITOR_DUMP_HAVE_FILTER) - cmd = qemuMonitorJSONMakeCommand("dump-guest-memory", - "b:paging", flags & QEMU_MONITOR_DUMP_PAGING ? 1 : 0, - "s:protocol", protocol, - "U:begin", begin, - "U:length", length, - NULL); - else - cmd = qemuMonitorJSONMakeCommand("dump-guest-memory", - "b:paging", flags & QEMU_MONITOR_DUMP_PAGING ? 1 : 0, - "s:protocol", protocol, - NULL); + cmd = qemuMonitorJSONMakeCommand("dump-guest-memory", + "b:paging", false, + "s:protocol", protocol, + NULL); if (!cmd) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index bdcf819..b592d12 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -138,10 +138,7 @@ int qemuMonitorJSONMigrate(qemuMonitorPtr mon, int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon); int qemuMonitorJSONDump(qemuMonitorPtr mon, - unsigned int flags, - const char *protocol, - unsigned long long begin, - unsigned long long length); + const char *protocol); int qemuMonitorJSONGraphicsRelocate(qemuMonitorPtr mon, int type, -- 1.7.11.4

2 2

[libvirt] [PATCH 0/3]generate man pages to describe valid keycodes
by Guannan Ren 18 Sep '12

18 Sep '12

This patchset will try to generate manpages to describe valid keycodes. It does this job via a helper perl script passing file src/util/keymaps.csv. we have 1 man page per keycode set, that is, 11 manpages to be generated in total. Each of them corresponds to codeset defined in virsh manpage. libvirt-keycode-linux.5 libvirt-keycode-xt.5 libvirt-keycode-atset1.5 libvirt-keycode-atset2.5 libvirt-keycode-atset3.5 libvirt-keycode-os_x.5 libvirt-keycode-kbd.5 libvirt-keycode-win32.5 libvirt-keycode-usb.5 libvirt-keycode-rfb.5 I really think that the words in these manpages still be polished again. If anyone could help, that would be appreciated. Guannan Ren(3) doc: Add a perl script to generate keycodes mapping automake: generate libvirt keycodes manpages doc: fix some typoes on virsh manpage .gitignore | 2 +- tools/Makefile.am | 31 +++++++++++++++++++++++++--- tools/keymap-gen.pl | 202 +++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 27 +++++++++++++------------ 4 files changed, 245 insertions(+), 17 deletions(-)

2 6

[libvirt] [PATCH] build: Fix build failure on mingw32 platform
by Osier Yang 18 Sep '12

18 Sep '12

--- I'm not sure if we prefer indentions inside the block between "#ifdef __linux__" ... "#else" clause. nodeinfo.c uses both (indentions/no indentions). --- src/nodeinfo.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7af6512..1ec3ada 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -971,13 +971,14 @@ cleanup: int nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); #ifdef __linux__ + { int ret = 0; int i; @@ -1010,6 +1011,7 @@ nodeSetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, } return ret; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node set memory parameters not implemented" @@ -1066,13 +1068,14 @@ cleanup: #define NODE_MEMORY_PARAMETERS_NUM 7 int nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, - virTypedParameterPtr params, - int *nparams, + virTypedParameterPtr params ATTRIBUTE_UNUSED, + int *nparams ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); #ifdef __linux__ + { unsigned int pages_to_scan; unsigned int sleep_millisecs; unsigned long long pages_shared; @@ -1174,6 +1177,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, } return 0; + } #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node get memory parameters not implemented" -- 1.7.7.3

2 3

[libvirt] [PATCH] virsh: Clarify behavior of domain list filtering.
by Peter Krempa 17 Sep '12

17 Sep '12

Some combinations of filtering flags produce no result. This patch tries to clarify this. Also fix unintentional double space. --- tools/virsh.pod | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c6f205a..2efb277 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -395,10 +395,11 @@ into s3 state. Normally only active domains are listed. To list inactive domains specify I<--inactive> or I<--all> to list both active and inactive domains. -To filter the list of domains present on the hypervisor you may specify one or -more of filtering flags supported by the B<list> command. These flags are -grouped by function. Specifying one or more flags from a group enables the -filter group. Supported filtering flags and groups: +To further filter the list of domains you may specify one or more of filtering +flags supported by the B<list> command. These flags are grouped by function. +Specifying one or more flags from a group enables the filter group. Note that +some combinations of flags may yield no results. Supported filtering flags and +groups: =over 4 @@ -435,7 +436,7 @@ domains without a snapshot I<--without-snapshot>. When talking to older servers, this command is forced to use a series of API calls with an inherent race, where a domain might not be listed or might appear more than once if it changed state between calls while the list was being -collected. Newer servers do not have this problem. +collected. Newer servers do not have this problem. If I<--managed-save> is specified, then domains that have managed save state (only possible if they are in the B<shut off> state, so you need to specify -- 1.7.12

3 4

[libvirt] [PATCH] build: fix missing include
by Dwight Engen 17 Sep '12

17 Sep '12

virNWFilterSnoopAdjustPoll() uses a struct pollfd but poll.h is never included nwfilter/nwfilter_dhcpsnoop.c:1297: error: 'struct pollfd' declared inside parameter list --- src/nwfilter/nwfilter_dhcpsnoop.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index eb03f9d..04dd37a 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -47,6 +47,7 @@ #endif #include <fcntl.h> +#include <poll.h> #include <arpa/inet.h> #include <netinet/ip.h> -- 1.7.1

3 2

[libvirt] [PATCHv2] svirt: Label serial sockets (RHBZ#853393).
by Richard W.M. Jones 17 Sep '12

17 Sep '12

From: "Richard W.M. Jones" <rjones(a)redhat.com> libvirt skips labelling these, for unknown reasons. This breaks libguestfs. Adding this and some SELinux rules (RHBZ#857453) fixes everything for me. --- src/security/security_selinux.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index a7e2420..4214105 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1233,6 +1233,14 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, ret = virSecuritySELinuxSetFilecon(dev->data.file.path, secdef->imagelabel); break; + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (!dev->data.nix.listen) { + if (virSecuritySELinuxSetFilecon(dev->data.file.path, secdef->imagelabel) < 0) + goto done; + } + ret = 0; + break; + case VIR_DOMAIN_CHR_TYPE_PIPE: if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) { @@ -1284,6 +1292,15 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virDomainDefPtr def, goto done; ret = 0; break; + + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (!dev->data.nix.listen) { + if (virSecuritySELinuxRestoreSecurityFileLabel(dev->data.file.path) < 0) + goto done; + } + ret = 0; + break; + case VIR_DOMAIN_CHR_TYPE_PIPE: if ((virAsprintf(&out, "%s.out", dev->data.file.path) < 0) || (virAsprintf(&in, "%s.in", dev->data.file.path) < 0)) { -- 1.7.10.4

2 1

[libvirt] [libvirt-designer][PATCH v2 0/4] Yet another functional extension
by Michal Privoznik 17 Sep '12

17 Sep '12

This time aimed on virtxml tool to make it user friendlier a little bit. Michal Privoznik (4): virtxml: Init variables virtxml: Detect OS from given ISO virtxml: Detect platform from libvirt connection URI Implement resources setting configure.ac | 2 +- examples/virtxml.c | 260 +++++++++++++++++++++++++--- libvirt-designer/libvirt-designer-domain.c | 91 ++++++++++ libvirt-designer/libvirt-designer-domain.h | 8 + libvirt-designer/libvirt-designer.sym | 1 + 5 files changed, 335 insertions(+), 27 deletions(-) -- 1.7.8.6

2 9

[libvirt] [PATCHv2 0/4] qemu: Add seccomp sandbox support
by Ján Tomko 17 Sep '12

17 Sep '12

This series adds support to run QEMU with seccomp sandbox enabled. It can be configured in qemu.conf to on, off, or the QEMU default, which is off in 1.2. Default value is the QEMU default. V1 of the patches supports tri-state configuration and includes a test for detecting the capability. V2 includes libvirtd_qemu.aug, renames vague 'sandbox' to 'seccompSandbox' and prints an error if the sandbox was requested but QEMU doesn't have the capability. Ján Tomko (4): qemu: add capability flag for seccomp sandbox qemu: conf: add seccomp_sandbox option qemu: add -sandbox to command line if requested tests: add qemu-1.2.0 help data src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_conf.c | 5 + src/qemu/qemu_conf.h | 1 + tests/qemuhelpdata/qemu-1.2.0 | 270 ++++++++++++++++++++++++++++++++++ tests/qemuhelpdata/qemu-1.2.0-device | 181 +++++++++++++++++++++++ tests/qemuhelptest.c | 82 ++++++++++ 10 files changed, 563 insertions(+), 0 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-1.2.0 create mode 100644 tests/qemuhelpdata/qemu-1.2.0-device -- 1.7.8.6

2 6

[libvirt] [PATCH 0/6 v3] New APIs to get/set node memory tunables
by Osier Yang 17 Sep '12

17 Sep '12

v1: https://www.redhat.com/archives/libvir-list/2012-September/msg00517.html v1 - v2: * Rename virNode{Get,Set}SharedMemoryParameters to virNode{Get,Set}MemoryParameters, in case of we could add more node memory tunables in future. v2 - v3: * Add prefix "shm_" to the shared memory parameter field. * Change REMOTE_NODE_MEMORY_PARAMETERS_MAX from 16 to 64. * Helper fucntions for internal APIs (node{Get,Set}MemoryParameters) * Add "shm" prefix for the virsh options. As a result of RFC: https://www.redhat.com/archives/libvir-list/2012-August/msg01998.html, this adds two new APIs (virNode{Get,Set}MemoryParameters) to get and set the host shared memory tunables (ksm under linux). Osier Yang (6): node_memory: Define the APIs to get/set memory parameters node_memory: Wire up the RPC protocol node_memory: Implement the internal APIs node_memory: Support get/set memory parameters for drivers node_memory: Expose the APIs to virsh node_memory: Expose the APIs to Python bindings daemon/remote.c | 59 +++++++++ include/libvirt/libvirt.h.in | 63 ++++++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 125 ++++++++++++++++++++ src/driver.h | 14 ++ src/libvirt.c | 121 +++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/nodeinfo.c | 249 +++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 ++ src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 50 ++++++++ src/remote/remote_protocol.x | 24 ++++- src/remote_protocol-structs | 20 +++ src/rpc/gendispatch.pl | 3 + src/uml/uml_driver.c | 2 + src/xen/xen_driver.c | 3 + tools/virsh-host.c | 116 ++++++++++++++++++ tools/virsh.pod | 8 ++ 21 files changed, 889 insertions(+), 1 deletions(-) -- 1.7.7.3

2 8

[libvirt] [PATCH 0/5 v5] Atomic API to list secrets
by Osier Yang 17 Sep '12

17 Sep '12

v4 - v5: * Support filter the returned secrets by its properties "ephemeral" and "private". Osier Yang (5): list: Define new API virConnectListAllSecrets list: Implement RPC calls for virConnectListAllSecrets list: Implement listAllSecrets list: Expose virConnectListAllSecrets to Python binding list: Use virConnectListAllSecrets in virsh daemon/remote.c | 54 +++++++++ include/libvirt/libvirt.h.in | 21 ++++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 ++ python/libvirt-override.c | 48 ++++++++ src/conf/secret_conf.h | 12 ++ src/driver.h | 5 + src/libvirt.c | 66 +++++++++++ src/libvirt_public.syms | 1 + src/remote/remote_driver.c | 64 ++++++++++ src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 12 ++ src/secret/secret_driver.c | 82 +++++++++++++- tools/virsh-secret.c | 209 ++++++++++++++++++++++++++++----- tools/virsh.pod | 8 +- 16 files changed, 581 insertions(+), 33 deletions(-) -- 1.7.7.3

2 13

[libvirt] [PATCH 0/5 v4] Atomic API to list network filters
by Osier Yang 17 Sep '12

17 Sep '12

v3 - v4: * Just rebase on the top, and split the patches from v3's large set. Osier Yang (5): list: Define new API virConnectListAllNWFilters list: Implement RPC calls for virConnectListAllNWFilters list: Implement listAllNWFilters list: Expose virConnectListAllNWFilters to Python binding list: Use virConnectListAllNWFilters in virsh daemon/remote.c | 54 +++++++++++ include/libvirt/libvirt.h.in | 4 +- python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 +++ python/libvirt-override.c | 48 ++++++++++ src/driver.h | 5 + src/libvirt.c | 50 ++++++++++ src/libvirt_public.syms | 1 + src/nwfilter/nwfilter_driver.c | 56 +++++++++++ src/remote/remote_driver.c | 63 +++++++++++++ src/remote/remote_protocol.x | 13 +++- src/remote_protocol-structs | 12 +++ tools/virsh-nwfilter.c | 163 +++++++++++++++++++++++++++------ 14 files changed, 457 insertions(+), 31 deletions(-) -- 1.7.7.3

3 10

[libvirt] [PATCH 0/7 v4] Atomic API to list node devices
by Osier Yang 17 Sep '12

17 Sep '12

v3 - v4: * Just rebase on the top, split the patches from v3's larget set. Osier Yang (7): list: Define new API virConnectListAllNodeDevices list: Implemente RPC calls for virConnectListAllNodeDevices list: Add helpers for listing node devices list: Implement listAllNodeDevices list: Expose virConnectListAllNodeDevices to Python binding virsh: Fix a bug of nodedev-list list: Use virConnectListAllNodeDevices in virsh daemon/remote.c | 53 ++++++ include/libvirt/libvirt.h.in | 25 +++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 + python/libvirt-override-virConnect.py | 12 ++ python/libvirt-override.c | 48 +++++ src/conf/node_device_conf.c | 103 +++++++++++ src/conf/node_device_conf.h | 16 ++ src/driver.h | 4 + src/libvirt.c | 62 +++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 1 + src/node_device/node_device_driver.c | 15 ++ src/node_device/node_device_driver.h | 3 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/remote/remote_driver.c | 64 +++++++ src/remote/remote_protocol.x | 13 ++- src/remote_protocol-structs | 12 ++ tools/virsh-nodedev.c | 303 ++++++++++++++++++++++++++++----- tools/virsh.pod | 8 +- 21 files changed, 710 insertions(+), 43 deletions(-) -- 1.7.7.3

3 29

[libvirt] Memory statistics patch for collectd plugin
by Chris Furlough 17 Sep '12

17 Sep '12

Hello list, I see several mentions online for a patch that adds memory statistics to the libvirt plugin for collectd. Can anyone point me to the patch? Thanks! Frank

1 0

[libvirt] libvirt plans: dns support for IPv6?
by Gene Czarcinski 16 Sep '12

16 Sep '12

I would like to know what the plans are for supporting dns for virtual guests with only IPv6. My objective is to be able to reference a virtual guest for the host ... doing ssh, scp, etc. such functions work just fine if you specify the ip-address but, after a while, those ip-addresses are difficult to remember ... afterall, that is why dns exists. For IPv4, with a some patches to libvert implementing "--local=/virt/ --domain-needed" if "--domain virt" is specified, I am now able to ssh to guests by name. The additions needed are to run the NetworkManager supporting "--conf-dir=/etc/NetworkManager/dnsmasq.d/" (or patch it like I did), and add a file specifying the dnsmasq on the virtual NIC. For example, server=/virt/,192.168.122.1 will forward queries. Alternatively, you can run yet another dnsmasq on the host which just passes queries to the dnsmasq and modify your upstream dns server to forward any queries for the virtual domains to the dnsmasq on the host. IPv6 is another situation entirely. And it may be even more important to have dns support because if IPv4 address are difficult to remember, IPv6 are practically impossible. So, are there any plans for providing dns on the IPv6 virtual networks? I can see a couple of solutions and each has pluses and minuses. 1. Do it the same way the it is done for IPv4. The current version of dnsmasq (2.63) supports dhcp for IPv6 and, IIRC, has since 2.61. I realize that you need to continue support of libvirt on RHEL 6 and possibly others that are running an old version of dnsmasq, but isn't it time to move along? While you can manually configure IPv6 interfaces so that you can add the definitions to a /etc/host file, this is not a good approach from my perspective. The use of dnsmasq also allows specification of different domains for each virtual IPv6 network. 2. There is another approach and it would be useful for both dnsmasq and this approach be available. That is, continue to use radvd and have the virtual guests autoconf the ip addresses. Then use mDNS (avahi and nss-mdns) to support access by name. This does not require doing anything about dnsmasq. In fact, it is possible thatyou do not need it at all. In addition, the plans for Fedora 18 are to make mDNS the default for Desktop installs [I am not sure what that means]. A big problem is that there is only a single domain which is ".local" by default. An even bigger problem is that ssh (openssh) has an error if a mDNS name is specified. I noticed that Daniel Berrange has put in a bugzilla request that dnsmasq be updated. If someone is already coding up patches to add dhcp for IPv6 or will "real soon now", I will be happy to test it. Otherwise, I could take a shot at coming up with the patches. Gene

3 7

[libvirt] [V2 PATCH 0/3] Transport Open vSwitch per-port data during live migration
by Kyle Mestery 15 Sep '12

15 Sep '12

This series of commits has the end goal of allowing per-port data stored in the Open vSwitch DB to be transported during live migration. This is done by first providing a generic infrastructure for transporting network data, adding some utility functions specific to Open vSwitch, and hooking the two together. The framework provided is generic in that other networking data could be transferred as well by simply adding in additional hooks as needed. ---- V2 of this patch series fixes some issues found when migrating VMs on standard Linux bridges. Kyle Mestery (3): Add the ability for the Qemu V3 migration protocol to include transporting network configuration. A generic framework is proposed with this patch to allow for the transfer of opaque data. Add utility functions for Open vSwitch to both save per-port data before a live migration, and restore the per-port data after a live migration. Transport Open vSwitch per-port data during live migration by using the utility functions virNetDevOpenvswitchGetMigrateData() and virNetDevOpenvswitchSetMigrateData(). src/libvirt_private.syms | 2 + src/qemu/qemu_migration.c | 291 +++++++++++++++++++++++++++++++++++++++- src/util/virnetdevopenvswitch.c | 71 ++++++++++ src/util/virnetdevopenvswitch.h | 6 + 4 files changed, 368 insertions(+), 2 deletions(-) -- 1.7.11.4

3 5

[libvirt] [PATCH 0/3] Transport Open vSwitch per-port data during live migration
by Kyle Mestery 15 Sep '12

15 Sep '12

This series of commits has the end goal of allowing per-port data stored in the Open vSwitch DB to be transported during live migration. This is done by first providing a generic infrastructure for transporting network data, adding some utility functions specific to Open vSwitch, and hooking the two together. The framework provided is generic in that other networking data could be transferred as well by simply adding in additional hooks as needed. Kyle Mestery (3): Add the ability for the Qemu V3 migration protocol to include transporting network configuration. A generic framework is proposed with this patch to allow for the transfer of opaque data. Add utility functions for Open vSwitch to both save per-port data before a live migration, and restore the per-port data after a live migration. Transport Open vSwitch per-port data during live migration by using the utility functions virNetDevOpenvswitchGetMigrateData() and virNetDevOpenvswitchSetMigrateData(). cfg.mk | 9 + configure.ac | 36 +- docs/formatdomain.html.in | 45 +- docs/schemas/domaincommon.rng | 75 ++- src/conf/domain_conf.c | 394 +++++++++++- src/conf/domain_conf.h | 32 + src/esx/esx_util.c | 7 +- src/libvirt.c | 20 +- src/libvirt_private.syms | 5 + src/parallels/parallels_driver.c | 133 +++- src/qemu/qemu_capabilities.c | 679 +++++++++++++++------ src/qemu/qemu_capabilities.h | 49 +- src/qemu/qemu_command.c | 660 +++++++++++--------- src/qemu/qemu_command.h | 56 +- src/qemu/qemu_domain.c | 16 +- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 50 +- src/qemu/qemu_hotplug.c | 141 ++--- src/qemu/qemu_migration.c | 295 ++++++++- src/qemu/qemu_monitor.c | 114 ++-- src/qemu/qemu_monitor.h | 10 +- src/qemu/qemu_monitor_json.c | 77 ++- src/qemu/qemu_monitor_json.h | 5 +- src/qemu/qemu_monitor_text.c | 335 +++------- src/qemu/qemu_process.c | 62 +- src/rpc/virnetserverprogram.c | 11 +- src/rpc/virnettlscontext.c | 6 +- src/util/bitmap.c | 19 + src/util/bitmap.h | 6 + src/util/virnetdevopenvswitch.c | 71 +++ src/util/virnetdevopenvswitch.h | 6 + src/vbox/vbox_tmpl.c | 14 +- src/vmware/vmware_driver.c | 4 +- tests/Makefile.am | 10 +- .../domain-parallels-ct-simple.xml | 27 + tests/qemuhelptest.c | 16 +- tests/qemumonitortestutils.c | 12 +- .../qemuxml2argv-cpu-eoi-disabled.args | 4 + .../qemuxml2argv-cpu-eoi-disabled.xml | 28 + .../qemuxml2argv-cpu-eoi-enabled.args | 4 + .../qemuxml2argv-cpu-eoi-enabled.xml | 28 + .../qemuxml2argv-eoi-disabled.args | 4 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 25 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 4 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 25 + .../qemuxml2argv-usb-redir-filter.args | 10 + .../qemuxml2argv-usb-redir-filter.xml | 45 ++ tests/qemuxml2argvtest.c | 23 +- tests/qemuxml2xmltest.c | 6 + tests/qemuxmlnstest.c | 6 +- tests/undefine | 72 --- tests/virsh-undefine | 72 +++ tools/virsh-domain.c | 4 +- tools/virsh-network.c | 8 +- tools/virsh-pool.c | 8 +- tools/virsh-volume.c | 8 +- 56 files changed, 2678 insertions(+), 1217 deletions(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml delete mode 100755 tests/undefine create mode 100755 tests/virsh-undefine -- 1.7.11.4

3 5

[libvirt] [PATCH 1/2] build: allow building with newer glibc-headers and -O0
by Christophe Fergeau 14 Sep '12

14 Sep '12

Fix copied from libvirt, commit by Eric Blake. glibc 2.15 (on Fedora 17) coupled with explicit disabling of optimization during development dies a painful death: /usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] Work around this by only conditionally defining _FORTIFY_SOURCE, in the case where glibc can actually use it. The trick is using AH_VERBATIM instead of AC_DEFINE. --- m4/virt-compile-warnings.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index d403587..913abca 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -84,8 +84,12 @@ AC_DEFUN([LIBVIRT_DESIGNER_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) # Use improved glibc headers - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.7.11.4

3 4

[libvirt] [PATCH RFC] network: define new API virNetworkUpdate
by Laine Stump 14 Sep '12

14 Sep '12

This patch adds a new public API virNetworkUpdate that will permit updating an existing network configuration without requiring that the network be destroyed/restarted for the changes to take effect. --- an example of use: to add a dhcp host entry to network "net", you would do this: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55' ip='192.168.122.5'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_ADD_LAST); To delete that same entry: virNetworkUpdate(net, VIR_NETWORK_SECTION_IP_DHCP_HOST, -1, "<host mac='00:11:22:33:44:55'/>", VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG | VIR_NETWORK_UPDATE_DELETE); If you wanted to force any of these to affect the dhcp host list in the 3rd <ip> element of the network, you would replace "-1" with "2". I'm still working on an example of one of the backends of this, but need eyeballs on the API, since that's the most critical part before the freeze. I would appreciate anyone with a few spare minutes who can take a look. Differences from email thread: 1) Aside from being actual code instead of just pseudo code, I've changed the "index" arg into "parentIndex" to avoid confusion between the index of the element we're looking at (e.g. which host in the list of hosts in a <dhcp> element) and the index of the parent (e.g. which <ip> element will contain the <dhcp> with the list of <hosts> we want to update). I also changed this from a unsigned into to an int so that it can hold the special value "-1", which means "pick the most useful/only item". Again, in the case of VIR_NETWORK_SECTION_IP_DHCP_HOST, this would mean to pick the one <ip> element that actually has a <dhcp> section (may not be the first, but there can only be one). I'll follow with a backend implementation of at least one of the update sections as soon as I get all the underlying utility functions working properly. 2) added VIR_NETWORK_UPDATE_AFFECT_CURRENT similar to VIR_DOMAIN_AFFECT_CURRENT include/libvirt/libvirt.h.in | 50 ++++++++++++++++++++++++++++++++++++ src/driver.h | 7 ++++++ src/libvirt.c | 60 +++++++++++++++++++++++++++++++++++++++++++- src/libvirt_public.syms | 1 + 4 files changed, 117 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index b0d34c5..d91e6c2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2328,6 +2328,56 @@ virNetworkPtr virNetworkDefineXML (virConnectPtr conn, int virNetworkUndefine (virNetworkPtr network); /* + * virNetworkUpdateSection: + * + * describes which section of a <network> definition the provided + * xml should be applied to. + * + */ +typedef enum { + VIR_NETWORK_SECTION_BRIDGE = 0, + VIR_NETWORK_SECTION_DOMAIN = 1, + VIR_NETWORK_SECTION_IP = 2, + VIR_NETWORK_SECTION_IP_DHCP_HOST = 3, + VIR_NETWORK_SECTION_IP_DHCP_RANGE = 4, + VIR_NETWORK_SECTION_FORWARD = 5, + VIR_NETWORK_SECTION_FORWARD_INTERFACE = 6, + VIR_NETWORK_SECTION_FORWARD_PF = 7, + VIR_NETWORK_SECTION_PORTGROUP = 8, + VIR_NETWORK_SECTION_DNS_HOST = 9, + VIR_NETWORK_SECTION_DNS_TXT = 10, + VIR_NETWORK_SECTION_DNS_SRV = 11, +#ifdef VIR_ENUM_SENTINELS + VIR_NETWORK_SECTION_LAST +#endif +} virNetworkUpdateSection; + +/* + * virNetworkUpdateFlags: + * + * Used to specify what type of operation to perform, and whether to + * affect live network, persistent config, or both. + */ +typedef enum { + VIR_NETWORK_UPDATE_AFFECT_CURRENT = 0, + VIR_NETWORK_UPDATE_AFFECT_LIVE = 1 << 0, + VIR_NETWORK_UPDATE_AFFECT_CONFIG = 1 << 1, + VIR_NETWORK_UPDATE_EXISTING = 1 << 2, + VIR_NETWORK_UPDATE_DELETE = 1 << 3, + VIR_NETWORK_UPDATE_ADD_LAST = 1 << 4, + VIR_NETWORK_UPDATE_ADD_FIRST = 1 << 5, + } virNetworkUpdateFlags; + +/* + * Update an existing network definition + */ +int virNetworkUpdate(virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); + +/* * Activate persistent network */ int virNetworkCreate (virNetworkPtr network); diff --git a/src/driver.h b/src/driver.h index 534da05..958712a 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1101,6 +1101,12 @@ typedef virNetworkPtr typedef int (*virDrvNetworkUndefine) (virNetworkPtr network); typedef int + (*virDrvNetworkUpdate) (virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags); +typedef int (*virDrvNetworkCreate) (virNetworkPtr network); typedef int (*virDrvNetworkDestroy) (virNetworkPtr network); @@ -1150,6 +1156,7 @@ struct _virNetworkDriver { virDrvNetworkCreateXML networkCreateXML; virDrvNetworkDefineXML networkDefineXML; virDrvNetworkUndefine networkUndefine; + virDrvNetworkUpdate networkUpdate; virDrvNetworkCreate networkCreate; virDrvNetworkDestroy networkDestroy; virDrvNetworkGetXMLDesc networkGetXMLDesc; diff --git a/src/libvirt.c b/src/libvirt.c index 5639850..133fbf5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10207,7 +10207,7 @@ error: * @conn: pointer to the hypervisor connection * @xml: the XML description for the network, preferably in UTF-8 * - * Define a network, but does not create it + * Define a network, but do not create it. * * Returns NULL in case of error, a pointer to the network otherwise */ @@ -10286,6 +10286,64 @@ error: } /** + * virNetworkUpdate: + * @network: pointer to a defined network + * @section: which section of the network to update + * (virNetworkUpdateSection) + * @index: which parent element if there are multiple parents + * of the same type (e.g. which <ip> element when + * modifying a <dhcp> element) + * @xml: the XML description for the network, preferably in UTF-8 + * @flags: bitwise or of virNetworkDefineFlags (currently must be 0). + * + * Update the definition of an existing network, either its live + * running state, its persistent configuration, or both. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkUpdate(virNetworkPtr network, + unsigned int section, /* virNetworkUpdateSection */ + int parentIndex, + const char *xml, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DEBUG("network=%p, section=%d, parentIndex=%d, xml=%s, flags=0x%x", + network, section, parentIndex, xml, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(VIR_ERR_INVALID_NETWORK, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + virCheckNonNullArgGoto(xml, error); + + if (conn->networkDriver && conn->networkDriver->networkUpdate) { + int ret; + ret = conn->networkDriver->networkUpdate(network, section, + parentIndex, xml, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(network->conn); + return -1; +} + +/** * virNetworkCreate: * @network: pointer to a defined network * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 6ff5a77..f953f67 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -558,6 +558,7 @@ LIBVIRT_0.10.2 { global: virConnectListAllNetworks; virConnectListAllStoragePools; + virNetworkUpdate; virStoragePoolListAllVolumes; } LIBVIRT_0.10.0; -- 1.7.11.4

1 0

[libvirt] [PATCH 0/8] Hostdev-hybrid patches
by Shradha Shah 14 Sep '12

14 Sep '12

This patch series adds the support for interface-type="hostdev-hybrid" and forward mode="hostdev-hybrid". The hostdev-hybrid mode makes migration possible along with PCI-passthrough. I had posted a RFC on the hostdev-hybrid methodology earlier on the libvirt mailing list. The RFC can be found here: https://www.redhat.com/archives/libvir-list/2012-February/msg00309.html Shradha Shah (8): RNG updates, new xml parser/formatter code for interface type=hostdev-hybrid RNG updates, new xml parser/formatter code for forward mode=hostdev-hybrid Hostdev-hybrid mode requires a direct linkdev and direct mode. ActualParent is used to store the information about the NETDEV. network: support hostdev-hybrid in network driver qemu: support netdevs from hostdev-hybrid networks Using the Ephemeral Flag to prepare for Migration Support. Migration support for hostdev-hybrid. docs/formatdomain.html.in | 29 ++++ docs/formatnetwork.html.in | 46 ++++++ docs/schemas/domaincommon.rng | 50 ++++++ docs/schemas/network.rng | 1 + include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 167 +++++++++++++++++--- src/conf/domain_conf.h | 8 + src/conf/network_conf.c | 9 +- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 123 +++++++++++++-- src/qemu/qemu_command.c | 61 +++++++ src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hostdev.c | 158 +++++++++++++------ src/qemu/qemu_hotplug.c | 26 +++- src/qemu/qemu_migration.c | 106 ++++++++++++- src/qemu/qemu_process.c | 3 +- src/uml/uml_conf.c | 5 + src/util/pci.c | 2 +- src/util/pci.h | 2 + src/util/virnetdev.c | 40 +++++ src/util/virnetdev.h | 6 + src/xenxs/xen_sxpr.c | 1 + tests/networkxml2xmlin/hostdev-hybrid-pf.xml | 7 + tests/networkxml2xmlin/hostdev-hybrid.xml | 10 ++ tests/networkxml2xmlout/hostdev-hybrid-pf.xml | 7 + tests/networkxml2xmlout/hostdev-hybrid.xml | 10 ++ tests/networkxml2xmltest.c | 2 + .../qemuxml2argv-net-hostdevhybrid.args | 8 + .../qemuxml2argv-net-hostdevhybrid.xml | 35 ++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-net-hostdevhybrid.xml | 40 +++++ tests/qemuxml2xmltest.c | 1 + 35 files changed, 884 insertions(+), 99 deletions(-) create mode 100644 tests/networkxml2xmlin/hostdev-hybrid-pf.xml create mode 100644 tests/networkxml2xmlin/hostdev-hybrid.xml create mode 100644 tests/networkxml2xmlout/hostdev-hybrid-pf.xml create mode 100644 tests/networkxml2xmlout/hostdev-hybrid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdevhybrid.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdevhybrid.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdevhybrid.xml -- 1.7.4.4

4 22

[libvirt] [PATCH v4 0/5] Per-guest configurable user/group for QEMU processes
by Marcelo Cerri 14 Sep '12

14 Sep '12

This is a v4 patch series that updates the libvirt's security driver mechanism to support per-guest configurable user and group for QEMU processes running together with other security drivers, such as SELinux and AppArmor. Marcelo Cerri (5): Internal refactory of data structures Multiple security drivers in XML data Update security layer to handle many security labels Support for multiple default security drivers in QEMU config Update the remote API daemon/remote.c | 63 ++++ docs/formatdomain.html.in | 11 +- docs/schemas/capability.rng | 18 +- docs/schemas/domaincommon.rng | 30 ++- include/libvirt/libvirt.h.in | 2 + python/generator.py | 1 + src/conf/capabilities.c | 17 +- src/conf/capabilities.h | 6 +- src/conf/domain_audit.c | 14 +- src/conf/domain_conf.c | 343 +++++++++++++++----- src/conf/domain_conf.h | 20 +- src/driver.h | 4 + src/libvirt.c | 47 +++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 1 + src/lxc/lxc_conf.c | 8 +- src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 11 +- src/lxc/lxc_process.c | 23 +- src/qemu/qemu.conf | 6 +- src/qemu/qemu_conf.c | 38 ++- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_driver.c | 218 +++++++++++--- src/qemu/qemu_process.c | 50 ++- src/remote/remote_driver.c | 46 +++ src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 11 + src/security/security_apparmor.c | 118 +++++-- src/security/security_dac.c | 324 +++++++++++++++++-- src/security/security_manager.c | 101 +++++-- src/security/security_manager.h | 8 +- src/security/security_selinux.c | 263 +++++++++++----- src/security/security_stack.c | 237 +++++++++----- src/security/security_stack.h | 13 + src/test/test_driver.c | 11 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 4 +- .../qemuxml2argv-seclabel-dynamic.xml | 2 +- 37 files changed, 1653 insertions(+), 448 deletions(-)

5 20

[libvirt] [PATCH] svirt: Label serial sockets (RHBZ#853393).
by Richard W.M. Jones 14 Sep '12

14 Sep '12

From: "Richard W.M. Jones" <rjones(a)redhat.com> libvirt skips labelling these, for unknown reasons. This breaks libguestfs. Adding this and some SELinux rules (RHBZ#857453) fixes everything for me. --- src/security/security_selinux.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index a7e2420..c3b33f8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1230,6 +1230,7 @@ virSecuritySELinuxSetSecurityChardevLabel(virDomainDefPtr def, switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_UNIX: ret = virSecuritySELinuxSetFilecon(dev->data.file.path, secdef->imagelabel); break; @@ -1280,6 +1281,7 @@ virSecuritySELinuxRestoreSecurityChardevLabel(virDomainDefPtr def, switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_UNIX: if (virSecuritySELinuxRestoreSecurityFileLabel(dev->data.file.path) < 0) goto done; ret = 0; @@ -1318,11 +1320,6 @@ virSecuritySELinuxRestoreSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, void *opaque ATTRIBUTE_UNUSED) { - /* This is taken care of by processing of def->serials */ - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - dev->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) - return 0; - return virSecuritySELinuxRestoreSecurityChardevLabel(def, &dev->source); } @@ -1698,11 +1695,6 @@ virSecuritySELinuxSetSecurityChardevCallback(virDomainDefPtr def, virDomainChrDefPtr dev, void *opaque ATTRIBUTE_UNUSED) { - /* This is taken care of by processing of def->serials */ - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - dev->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) - return 0; - return virSecuritySELinuxSetSecurityChardevLabel(def, &dev->source); } -- 1.7.10.4

2 2

[libvirt] [PATCH] qemu: fix uninitialized variable in qemuParseCommandLine
by Ján Tomko 14 Sep '12

14 Sep '12

Newly added if branch for kvm_pv_eoi did not set the ret variable. --- src/qemu/qemu_command.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec825bc..d0c8e22 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7655,7 +7655,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, else if (*p == '+' || *p == '-') { char *feature; int policy; - int ret; + int ret = 0; if (*p == '+') policy = VIR_CPU_FEATURE_REQUIRE; @@ -7702,7 +7702,6 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, goto error; } dom->clock.timers[i]->present = present; - ret = 0; } else if (STREQ(feature, "kvm_pv_eoi")) { if (policy == VIR_CPU_FEATURE_REQUIRE) dom->apic_eoi = VIR_DOMAIN_APIC_EOI_ON; -- 1.7.8.6

2 2

[libvirt] [PATCH 00/20] Prepare QEMU capabilities for detection via QMP
by Daniel P. Berrange 14 Sep '12

14 Sep '12

As of QEMU 1.2 libvirt is supposed to stop parsing -help and instead use various QMP commands to detect capabilities. Before we can do this, the current QEMU capabilities code needs a serious cleanup and some refactoring. This series does that major preparation work. Currently we consider "capabilities" to just refer to flags we detect from -help. This series expands to cover all the things we detect from QEMU, specifically including machine types, CPU definitions and architecture. It introduces a single object to track all this data and a centralized caching mechanism so we never re-query data we already have somewhere.

2 45

[libvirt] [PATCH 0/2] tell dnsmasq not to forward PTR queries
by gene＠czarc.net 14 Sep '12

14 Sep '12

From: Gene Czarcinski <gene(a)czarc.net> For networks which dnsmasq has "--listen-address" specified, add the command line parameter so that any dns PTR queries for those networks are not forwarded. There are separate patches for IPv4 and IPv6. Gene Czarcinski (2): IPV4 local=/....in-addr.arpa/ IPv6 local=/...ip6.arpa/ src/network/bridge_driver.c | 32 ++++++++++++++++++++++ tests/networkxml2argvdata/isolated-network.argv | 1 + .../networkxml2argvdata/nat-network-dns-hosts.argv | 1 + .../nat-network-dns-srv-record-minimal.argv | 5 ++++ .../nat-network-dns-srv-record.argv | 5 ++++ .../nat-network-dns-txt-record.argv | 11 ++++++-- tests/networkxml2argvdata/nat-network.argv | 18 ++++++++++-- tests/networkxml2argvdata/nat-network.xml | 4 +++ tests/networkxml2argvdata/netboot-network.argv | 1 + .../networkxml2argvdata/netboot-proxy-network.argv | 1 + tests/networkxml2argvdata/routed-network.argv | 3 +- 11 files changed, 76 insertions(+), 6 deletions(-) -- 1.7.11.4

2 3

[libvirt] [PATCH] fix memory leak in virCopyLastError
by Hu Tao 14 Sep '12

14 Sep '12

memset before virResetError will cause memory leak. virResetError and virCopyError, which calls virResetError, will do memset properly, so we don't have to worry about it here. --- src/util/virterror.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 7caa69e..46afd37 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -276,8 +276,6 @@ int virCopyLastError(virErrorPtr to) { virErrorPtr err = virLastErrorObject(); - /* We can't guarantee caller has initialized it to zero */ - memset(to, 0, sizeof(*to)); if (err) virCopyError(err, to); else -- 1.7.10.2

3 5

[libvirt] [PATCH 0/6 v2] New APIs to get/set node memory parameters
by Osier Yang 14 Sep '12

14 Sep '12

v1: https://www.redhat.com/archives/libvir-list/2012-September/msg00517.html v1 - v2: * Rename virNode{Get,Set}SharedMemoryParameters to virNode{Get,Set}MemoryParameters, in case of we could add more node memory tunables in future. As a result of RFC: https://www.redhat.com/archives/libvir-list/2012-August/msg01998.html, this adds two new APIs (virNode{Get,Set}MemoryParameters) to get and set the host shared memory tunables (ksm under linux). Osier Yang (6): node_memory: Define the APIs to get/set shared memory parameters node_memory: Wire up the RPC protocol node_memory: Implement the internal APIs node_memory: Support get/set memory parameters for drivers node_memory: Expose the APIs to virsh node_memory: Expose the APIs to Python bindings daemon/remote.c | 59 +++++++ include/libvirt/libvirt.h.in | 63 ++++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 125 +++++++++++++++ src/driver.h | 14 ++ src/libvirt.c | 121 ++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/nodeinfo.c | 332 +++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 ++ src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 50 ++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 20 +++ src/rpc/gendispatch.pl | 3 + src/uml/uml_driver.c | 2 + src/xen/xen_driver.c | 3 + tools/virsh-host.c | 116 ++++++++++++++ tools/virsh.pod | 8 + 21 files changed, 972 insertions(+), 1 deletions(-) -- 1.7.7.3

2 14

[libvirt] [PATCH 1/2] Add support for EOI with APIC
by Martin Kletzander 14 Sep '12

14 Sep '12

New options is added to support EOI (End of Interrupt) exposure for guests. As it makes sense only when APIC is enabled, I added this into the <apic> element in <features> because this should be tri-state option (cannot be handled as standalone feature). --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 9 ++++++++- src/conf/domain_conf.c | 35 ++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 503685f..66319d0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1018,6 +1018,13 @@ <dd>ACPI is useful for power management, for example, with KVM guests it is required for graceful shutdown to work. </dd> + <dt><code>apic</code></dt> + <dd>APIC allows the use of programmable IRQ + management. <span class="since">Since 0.10.2 (QEMU only)</span> + there is an optional attribute <code>eoi</code> with values "on" + and "off" which toggle the availability of EOI (End of + Interrupt) for the guest. + </dd> <dt><code>hap</code></dt> <dd>Enable use of Hardware Assisted Paging if available in the hardware. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c2c6184..029c796 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2859,7 +2859,14 @@ </optional> <optional> <element name="apic"> - <empty/> + <optional> + <attribute name="eoi"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 292cc9a..89c08da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -110,6 +110,11 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "viridian", "privnet") +VIR_ENUM_IMPL(virDomainApicEoi, VIR_DOMAIN_APIC_EOI_LAST, + "default", + "on", + "off") + VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", "restart", @@ -8621,6 +8626,28 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, goto error; } def->features |= (1 << val); + if (val == VIR_DOMAIN_FEATURE_APIC) { + char *attrstr = NULL; + if (virAsprintf(&attrstr, + "string(./features/%s/@eoi)", + nodes[i]->name) < 0) + goto no_memory; + + tmp = virXPathString(attrstr, ctxt); + if (tmp) { + int eoi; + if ((eoi = virDomainApicEoiTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for attribute eoi: %s"), + nodes[i]->name); + VIR_FREE(tmp); + goto error; + } + def->apic_eoi = eoi; + VIR_FREE(tmp); + } + VIR_FREE(attrstr); + } } VIR_FREE(nodes); } @@ -13413,7 +13440,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, _("unexpected feature %d"), i); goto cleanup; } - virBufferAsprintf(buf, " <%s/>\n", name); + virBufferAsprintf(buf, " <%s", name); + if (i == VIR_DOMAIN_FEATURE_APIC && def->apic_eoi) { + virBufferAsprintf(buf, + " eoi='%s'", + virDomainApicEoiTypeToString(def->apic_eoi)); + } + virBufferAsprintf(buf, "/>\n"); } } virBufferAddLit(buf, " </features>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3995c2d..86dae7d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1351,6 +1351,14 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_LAST }; +enum virDomainApicEoi { + VIR_DOMAIN_APIC_EOI_DEFAULT = 0, + VIR_DOMAIN_APIC_EOI_ON, + VIR_DOMAIN_APIC_EOI_OFF, + + VIR_DOMAIN_APIC_EOI_LAST, +}; + enum virDomainLifecycleAction { VIR_DOMAIN_LIFECYCLE_DESTROY, VIR_DOMAIN_LIFECYCLE_RESTART, @@ -1642,6 +1650,8 @@ struct _virDomainDef { virDomainOSDef os; char *emulator; int features; + /* enum virDomainApicEoi */ + int apic_eoi; virDomainClockDef clock; @@ -2104,6 +2114,7 @@ VIR_ENUM_DECL(virDomainTaint) VIR_ENUM_DECL(virDomainVirt) VIR_ENUM_DECL(virDomainBoot) VIR_ENUM_DECL(virDomainFeature) +VIR_ENUM_DECL(virDomainApicEoi) VIR_ENUM_DECL(virDomainLifecycle) VIR_ENUM_DECL(virDomainLifecycleCrash) VIR_ENUM_DECL(virDomainPMState) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0494e1f..5dd9313 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -263,6 +263,8 @@ virBlkioDeviceWeightArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; +virDomainApicEoiTypeFromString; +virDomainApicEoiTypeToString; virDomainAssignDef; virDomainBlockedReasonTypeFromString; virDomainBlockedReasonTypeToString; -- 1.7.12

3 6

[libvirt] [PATCH v3 0/9] improve virBitmap
by Hu Tao 14 Sep '12

14 Sep '12

In many places we store bitmap info in a chunk of data (pointed to by a char *), and have redundant codes to set/unset bits. This series extends virBitmap, and convert those codes to use virBitmap. patch 01 is based on https://www.redhat.com/archives/libvir-list/2012-September/msg00644.html changes: v3: - renaming member variables of virBitmap - rewrite virBitmapFormat using virBitmapNextSetBit - store bits in machine native endian format - more tests of virBitmap v2: - fix bug in qemuSetupCgroupForEmulator - new function virBitmapNextSetBit - virBitmapcmp -> virBitmapEqual - virBitmap: store bits in little endian format - some improvements of virBitmap - fix some memory leaks Hu Tao (9): bitmap: add a new member variable map_len New functions for virBitmap use virBitmap to store cpupin info use virBitmap to store cpu affinity info use virBitmap to store numa nodemask info. use virBitmap to store cpumask info. use virBitmap to store cells' cpumask info. use virBitmap to store nodeinfo. remove virDomainCpuSetFormat and virDomainCpuSetParse .gitignore | 1 + src/conf/cpu_conf.c | 17 +- src/conf/cpu_conf.h | 3 +- src/conf/domain_conf.c | 392 ++++++---------------------------- src/conf/domain_conf.h | 18 +- src/libvirt_private.syms | 14 +- src/lxc/lxc_controller.c | 56 +++-- src/nodeinfo.c | 26 +-- src/nodeinfo.h | 6 +- src/parallels/parallels_driver.c | 5 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 43 +--- src/qemu/qemu_driver.c | 168 +++++++-------- src/qemu/qemu_process.c | 141 ++++--------- src/test/test_driver.c | 5 +- src/util/bitmap.c | 429 ++++++++++++++++++++++++++++++++++++-- src/util/bitmap.h | 34 +++ src/util/processinfo.c | 36 ++-- src/util/processinfo.h | 9 +- src/vmx/vmx.c | 36 ++-- tests/Makefile.am | 7 +- tests/cpuset | 2 +- tests/virbitmaptest.c | 362 ++++++++++++++++++++++++++++++++ 24 files changed, 1126 insertions(+), 696 deletions(-) create mode 100644 tests/virbitmaptest.c -- 1.7.10.2

2 12

[libvirt] [PATCH 0/7] New APIs to get/set node shared memory parameters
by Osier Yang 14 Sep '12

14 Sep '12

As a result of RFC: https://www.redhat.com/archives/libvir-list/2012-August/msg01998.html, this adds two new APIs (virNode{Get,Set}SharedMemoryParameters) to get and set the host shared memory tunables (ksm under linux). Osier Yang (7): Improve virTypedParameterValidateSet shared_memory: Define the APIs to get/set shared memory parameters shared_memory: Wire up the RPC protocol shared_memory: Implement the internal APIs shared_memory: Support get/set shared memory parameters for drivers shared_memory: Expose the APIs to virsh shared_memory: Expose the APIs to Python bindings daemon/remote.c | 61 +++++++ include/libvirt/libvirt.h.in | 63 +++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 125 ++++++++++++++ src/driver.h | 14 ++ src/libvirt.c | 141 +++++++++++++++- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/lxc/lxc_driver.c | 2 + src/nodeinfo.c | 344 +++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 + src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 50 ++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 20 +++ src/rpc/gendispatch.pl | 3 + src/uml/uml_driver.c | 2 + src/xen/xen_driver.c | 3 + tools/virsh-host.c | 110 +++++++++++++ tools/virsh.pod | 8 + 21 files changed, 990 insertions(+), 11 deletions(-) -- 1.7.7.3

2 16

[libvirt] [PATCH] snapshot: fix rollback failure in transaction mode
by Guannan Ren 14 Sep '12

14 Sep '12

After failure of qemu transaction command, the snapshot file still be there with non-zero in size. In order to unlink the file, the patch removes the file size checking. --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e8e00c..1fedfb8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10833,7 +10833,7 @@ qemuDomainSnapshotUndoSingleDiskActive(struct qemud_driver *driver, if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0) VIR_WARN("Unable to release lock on %s", disk->src); if (need_unlink && stat(disk->src, &st) == 0 && - st.st_size == 0 && S_ISREG(st.st_mode) && unlink(disk->src) < 0) + S_ISREG(st.st_mode) && unlink(disk->src) < 0) VIR_WARN("Unable to remove just-created %s", disk->src); /* Update vm in place to match changes. */ -- 1.7.11.2

3 9

[libvirt] [PATCH 1/1 V2] Migrate per-port data for Open vSwitch ports during Qemu Live Migration
by Kyle Mestery 13 Sep '12

13 Sep '12

Add the ability to migrate per-port data on Open vSwitch ports during qemu live migration. A controller can use this to store data relating to each port, and have it migrated with the virtual machine and populated on the destination host. Signed-off-by: Kyle Mestery <kmestery(a)cisco.com> Cc: Laine Stump <laine(a)laine.org> --- src/qemu/qemu_migration.c | 246 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1b21ef6..8c1a8f1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OVS_PORT_DATA, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "ovsportdata"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OVS_PORT_DATA = (1 << QEMU_MIGRATION_COOKIE_FLAG_OVS_PORT_DATA), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -95,6 +97,19 @@ struct _qemuMigrationCookieGraphics { char *tlsSubject; }; +typedef struct _qemuMigrationCookieOvsPortData qemuMigrationCookieOvsPortData; +typedef qemuMigrationCookieOvsPortData *qemuMigrationCookieOvsPortDataPtr; +struct _qemuMigrationCookieOvsPortData { + /* How many virtual NICs are we saving data for? */ + int nnets; + + /* + * Array of pointers to saved data. Each VIF will have it's own + * data to transfer. + */ + char **portdata; +}; + typedef struct _qemuMigrationCookie qemuMigrationCookie; typedef qemuMigrationCookie *qemuMigrationCookiePtr; struct _qemuMigrationCookie { @@ -120,6 +135,9 @@ struct _qemuMigrationCookie { /* If (flags & QEMU_MIGRATION_COOKIE_PERSISTENT) */ virDomainDefPtr persistent; + + /* If (flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) */ + qemuMigrationCookieOvsPortDataPtr ovsportdata; }; static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) @@ -132,6 +150,24 @@ static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) } +static void qemuMigrationCookieOvsPortDataFree(qemuMigrationCookieOvsPortDataPtr + ovsportdata) +{ + int i; + + if (!ovsportdata) + return; + + for (i = 0; i < ovsportdata->nnets; i++) { + VIR_FREE(ovsportdata->portdata[i]); + } + + VIR_FREE(ovsportdata->portdata); + + VIR_FREE(ovsportdata); +} + + static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) { if (!mig) @@ -140,6 +176,10 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) qemuMigrationCookieGraphicsFree(mig->graphics); + if (mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) { + qemuMigrationCookieOvsPortDataFree(mig->ovsportdata); + } + VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); VIR_FREE(mig->name); @@ -256,6 +296,60 @@ error: } +static qemuMigrationCookieOvsPortDataPtr +qemuMigrationCookieOvsPortDataAlloc(struct qemud_driver *driver ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + qemuMigrationCookieOvsPortDataPtr mig; + int i; + virCommandPtr cmd = NULL; + virDomainNetDefPtr netptr; + + if (VIR_ALLOC(mig) < 0) + goto no_memory; + + mig->nnets = def->nnets; + + if (VIR_ALLOC_N(mig->portdata, def->nnets) < 0) + goto no_memory; + + for (i = 0; i < def->nnets; i++) { + virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(def->nets[i]); + netptr = def->nets[i]; + + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + if (VIR_ALLOC(mig->portdata[i]) < 0) + goto no_memory; + + cmd = virCommandNewArgList(OVSVSCTL, "get", "Interface", + netptr->ifname, "external_ids:PortData", + NULL); + + virCommandSetOutputBuffer(cmd, &mig->portdata[i]); + + /* Run the command */ + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to get OVS port data for " + "interface %s"), netptr->ifname); + goto error; + } + + /* Wipeout the newline */ + mig->portdata[i][strlen(mig->portdata[i]) - 1] = '\0'; + } + } + + return mig; + +no_memory: + virReportOOMError(); +error: + qemuMigrationCookieOvsPortDataFree(mig); + return NULL; +} + + static qemuMigrationCookiePtr qemuMigrationCookieNew(virDomainObjPtr dom) { @@ -370,6 +464,27 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, } +static int +qemuMigrationCookieAddOvsPortData(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, + virDomainObjPtr dom) +{ + if (mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration ovs port data data already present")); + return -1; + } + + if (dom->def->nnets >= 1) { + if (!(mig->ovsportdata = qemuMigrationCookieOvsPortDataAlloc( + driver, dom->def))) + return -1; + mig->flags |= QEMU_MIGRATION_COOKIE_OVS_PORT_DATA; + } + + return 0; +} + static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, qemuMigrationCookieGraphicsPtr grap) @@ -389,6 +504,25 @@ static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, } +static void qemuMigrationCookieOvsPortDataXMLFormat(virBufferPtr buf, + qemuMigrationCookieOvsPortDataPtr optr) +{ + int i; + + virBufferAsprintf(buf, " <ovsportdata nnets='%d'>\n", optr->nnets); + if (optr->nnets > 0) + virBufferAsprintf(buf, " <vifs>\n"); + for (i = 0; i < optr->nnets; i++) { + virBufferAsprintf(buf, " <vif num='%d' portdata='%s'/>\n", + i, optr->portdata[i]); + } + if (optr->nnets > 0) + virBufferAsprintf(buf, " </vifs>\n"); + + virBufferAddLit(buf, " </ovsportdata>\n"); +} + + static int qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferPtr buf, @@ -439,6 +573,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if ((mig->flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) && + mig->ovsportdata) + qemuMigrationCookieOvsPortDataXMLFormat(buf, mig->ovsportdata); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -516,6 +654,57 @@ error: } +static qemuMigrationCookieOvsPortDataPtr +qemuMigrationCookieOvsPortDataXMLParse(xmlXPathContextPtr ctxt) +{ + qemuMigrationCookieOvsPortDataPtr optr; + int i; + int n; + xmlNodePtr *vifs = NULL; + + if (VIR_ALLOC(optr) < 0) + goto no_memory; + + if (virXPathInt("string(./ovsportdata/@nnets)", ctxt, &optr->nnets) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing nnets attribute in migration data")); + goto error; + } + + if (VIR_ALLOC_N(optr->portdata, optr->nnets) < 0) + goto no_memory; + + if ((n = virXPathNodeSet("./ovsportdata/vifs/vif", ctxt, &vifs)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing vif information")); + goto error; + } + + for (i = 0; i < n; i++) { + if (VIR_ALLOC(optr->portdata[i]) < 0) + goto no_memory; + + if (!(optr->portdata[i] = virXMLPropString(vifs[i], "portdata"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing portdata attribute in migration data")); + goto error; + } + } + + VIR_FREE(vifs); + + return optr; + +no_memory: + virReportOOMError(); +error: + if (vifs) + VIR_FREE(vifs); + qemuMigrationCookieOvsPortDataFree(optr); + return NULL; +} + + static int qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, struct qemud_driver *driver, @@ -662,6 +851,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) && + virXPathBoolean("count(./ovsportdata) > 0", ctxt) && + (!(mig->ovsportdata = qemuMigrationCookieOvsPortDataXMLParse(ctxt)))) + goto error; + return 0; error: @@ -721,6 +915,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OVS_PORT_DATA && + qemuMigrationCookieAddOvsPortData(mig, driver, dom) < 0) + return -1; + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1050,6 +1248,44 @@ qemuDomainMigrateGraphicsRelocate(struct qemud_driver *driver, } +static int +qemuDomainMigrateOPDRelocate(struct qemud_driver *driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + qemuMigrationCookiePtr cookie) +{ + virCommandPtr cmd = NULL; + virDomainNetDefPtr netptr; + int ret = 0; + int i; + virBufferPtr buf; + + if (VIR_ALLOC(buf) < 0) { + ret = -1; + goto out; + } + + for (i = 0; i < cookie->ovsportdata->nnets; i++) { + netptr = vm->def->nets[i]; + + virBufferAsprintf(buf, "external_ids:PortData=%s", + cookie->ovsportdata->portdata[i]); + + cmd = virCommandNewArgList(OVSVSCTL, "set", "Interface", + netptr->ifname, virBufferCurrentContent(buf), + NULL); + /* Run the command */ + if ((ret = virCommandRun(cmd, NULL)) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to set OVS port data for " + "interface %s"), vm->def->nets[i]->ifname); + } + } + +out: + return ret; +} + + /* This is called for outgoing non-p2p migrations when a connection to the * client which initiated the migration was closed but we were waiting for it * to follow up with the next phase, that is, in between @@ -1994,7 +2230,8 @@ cleanup: if (ret == 0 && qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, - QEMU_MIGRATION_COOKIE_PERSISTENT ) < 0) + QEMU_MIGRATION_COOKIE_PERSISTENT | + QEMU_MIGRATION_COOKIE_OVS_PORT_DATA) < 0) VIR_WARN("Unable to encode migration cookie"); qemuMigrationCookieFree(mig); @@ -2929,6 +3166,7 @@ qemuMigrationFinish(struct qemud_driver *driver, qemuDomainCleanupRemove(vm, qemuMigrationPrepareCleanup); + cookie_flags = QEMU_MIGRATION_COOKIE_OVS_PORT_DATA; if (flags & VIR_MIGRATE_PERSIST_DEST) cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; @@ -2956,6 +3194,10 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + if (mig->ovsportdata) + if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + VIR_WARN("unable to provide data for OVS port data relocation"); + if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) -- 1.7.11.4

5 7

[libvirt] [PATCH] qemu: wait for SPICE to migrate
by Michal Privoznik 13 Sep '12

13 Sep '12

Recently, there have been some improvements made to qemu so it supports seamless migration or something very close to it. However, it requires libvirt interaction. Once qemu is migrated, the SPICE server needs to send its internal state to the destination. Once it's done, it fires SPICE_MIGRATE_COMPLETED event and this fact is advertised in 'query-spice' output as well. We must not kill qemu until SPICE server finishes the transfer. --- Okay, I am ignoring the event completely in this patch. I am just asking for 'query-spice' until after 'query-migrate' reports 'completed'. It's simple and small. However, if there is a wider consensus I should catch the event as well, e.g. so we don't have to enter the monitor and thus have smaller overhead, I can rewrite this patch. src/qemu/qemu_migration.c | 32 ++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 22 +++++++++++++++++ src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 52 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ 5 files changed, 108 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 99fc8ce..e4ec66d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -891,11 +891,13 @@ static int qemuMigrationUpdateJobStatus(struct qemud_driver *driver, virDomainObjPtr vm, const char *job, - enum qemuDomainAsyncJob asyncJob) + enum qemuDomainAsyncJob asyncJob, + bool wait_for_spice) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; int status; + bool spice_migrated = true; unsigned long long memProcessed; unsigned long long memRemaining; unsigned long long memTotal; @@ -910,6 +912,13 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, &memProcessed, &memRemaining, &memTotal); + + /* If qemu says migrated, check spice */ + if (wait_for_spice && (ret == 0) && + (status == QEMU_MONITOR_MIGRATION_STATUS_COMPLETED)) + ret = qemuMonitorGetSpiceMigrationStatus(priv->mon, + &spice_migrated); + qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0 || virTimeMillisNow(&priv->job.info.timeElapsed) < 0) { @@ -939,7 +948,8 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, break; case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED: - priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; + if (spice_migrated) + priv->job.info.type = VIR_DOMAIN_JOB_COMPLETED; ret = 0; break; @@ -967,6 +977,12 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv = vm->privateData; const char *job; + bool wait_for_spice; + + /* If guest uses SPICE we have to hold up migration finish + * until SPICE server transfers its data */ + wait_for_spice = (vm->def->ngraphics == 1) && + (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE); switch (priv->job.asyncJob) { case QEMU_ASYNC_JOB_MIGRATION_OUT: @@ -988,7 +1004,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm, /* Poll every 50ms for progress & to allow cancellation */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; - if (qemuMigrationUpdateJobStatus(driver, vm, job, asyncJob) < 0) + if (qemuMigrationUpdateJobStatus(driver, vm, job, + asyncJob, wait_for_spice) < 0) goto cleanup; if (dconn && virConnectIsAlive(dconn) <= 0) { @@ -1840,6 +1857,7 @@ qemuMigrationRun(struct qemud_driver *driver, int fd = -1; unsigned long migrate_speed = resource ? resource : priv->migMaxBandwidth; virErrorPtr orig_err = NULL; + bool wait_for_spice; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " @@ -1848,6 +1866,11 @@ qemuMigrationRun(struct qemud_driver *driver, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType); + /* If guest uses SPICE we have to hold up migration finish + * until SPICE server transfers its data */ + wait_for_spice = (vm->def->ngraphics == 1) && + (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE); + if (virLockManagerPluginUsesState(driver->lockManager) && !cookieout) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1946,7 +1969,8 @@ qemuMigrationRun(struct qemud_driver *driver, * connection from qemu which may never be initiated. */ if (qemuMigrationUpdateJobStatus(driver, vm, _("migration job"), - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + QEMU_ASYNC_JOB_MIGRATION_OUT, + wait_for_spice) < 0) goto cancel; while ((fd = accept(spec->dest.unix_socket.sock, NULL, NULL)) < 0) { diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b43b15e..20bb333 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1844,6 +1844,28 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, return ret; } +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (mon->json) { + ret = qemuMonitorJSONGetSpiceMigrationStatus(mon, spice_migrated); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return ret; +} int qemuMonitorMigrateToFd(qemuMonitorPtr mon, unsigned int flags, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f206d49..d3a0877 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -346,6 +346,9 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, QEMU_MONITOR_MIGRATE_NON_SHARED_DISK = 1 << 1, /* migration with non-shared storage with full disk copy */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8842817..63dbd25 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2487,6 +2487,58 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, } +static int +qemuMonitorJSONSpiceGetMigrationStatusReply(virJSONValuePtr reply, + bool *spice_migrated) +{ + virJSONValuePtr ret; + const char *migrated_str; + + if (!(ret = virJSONValueObjectGet(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-spice reply was missing return data")); + return -1; + } + + if (!(migrated_str = virJSONValueObjectGetString(ret, "migrated"))) { + /* Deliberately don't report error here as we are + * probably dealing with older qemu which doesn't + * report this yet. Pretend spice is migrated. */ + *spice_migrated = true; + } else { + *spice_migrated = STREQ(migrated_str, "true"); + } + + return 0; +} + + +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated) +{ + int ret; + virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-spice", + NULL); + virJSONValuePtr reply = NULL; + + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + if (ret == 0) + ret = qemuMonitorJSONSpiceGetMigrationStatusReply(reply, + spice_migrated); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} + + int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index f5d515f..88edb73 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -132,6 +132,9 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *remaining, unsigned long long *total); +int qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitorPtr mon, + bool *spice_migrated); + int qemuMonitorJSONMigrate(qemuMonitorPtr mon, unsigned int flags, const char *uri); -- 1.7.8.6

2 1

[libvirt] [PATCH] conf: avoid libvirt crash with empty address guestfwd channel
by Alex Jia 13 Sep '12

13 Sep '12

The 'def->target.addr' hasn't been initialized in virDomainChrDefNew() and its value is always '0xffffffff', in addition, the following test scenario hasn't also include 'port' element in channel XML block, so the branch 'if (addrStr == NULL)' is hit in virDomainChrDefParseTargetXML(), the programming jumps to 'error' label to release relevant resources, and the statement 'if (VIR_ALLOC(def->target.addr) < 0)' hasn't been executed then the virDomainChrDefFree() will free 'def->target.addr'(0xffffffff) via VIR_FREE(), which results in libvirt crash, to use valgrind can also find a 'Invalid free() / delete / delete[]' error. This patch just adjusts codes order to initialize 'def->target.addr' firstly. With this patch, libvirt hasn't crash and can get a expected error message " XML error: guestfwd channel does not define a target address". How to reproduce? 1. define a guest with the following channel XML configuration $ cat foo.xml <snip> <channel type='pty'> <target type='guestfwd'/> </channel> </snip> $ virsh define foo.xml 2. actual result error: Failed to define domain from /tmp/foo.xml error: End of file while reading data: Input/output error error: Failed to reconnect to the hypervisor GDB debugger information: <snip> Breakpoint 1, virDomainChrDefFree (def=0x7f8ab000ec70) at conf/domain_conf.c:1264 ...ignore 1264 { (gdb) p def->target $2 = {port = -1, addr = 0xffffffff, name = 0xffffffff <Address 0xffffffff out of bounds>} </snip> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=856489 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2f8e5d2..02048c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5231,6 +5231,11 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, addrStr = virXMLPropString(cur, "address"); portStr = virXMLPropString(cur, "port"); + if (VIR_ALLOC(def->target.addr) < 0) { + virReportOOMError(); + goto error; + } + if (addrStr == NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("guestfwd channel does not " @@ -5238,11 +5243,6 @@ virDomainChrDefParseTargetXML(virCapsPtr caps, goto error; } - if (VIR_ALLOC(def->target.addr) < 0) { - virReportOOMError(); - goto error; - } - if (virSocketAddrParse(def->target.addr, addrStr, AF_UNSPEC) < 0) goto error; -- 1.7.1

2 3

[libvirt] [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'.
by Richard W.M. Jones 13 Sep '12

13 Sep '12

I have added the attached patch to Fedora because Fedora (only?) renames 'qemu' to 'qemu-system-i386'. As a result of this, on 32 bit Fedora would run 'qemu-system-x86_64 [...] -cpu qemu32'. In fact this caused no issues (I originally added the patch because I suspected this was a cause of RHBZ#857026, but that doesn't appear to be the case). But if we're going to package qemu-system-i386 we might as well run it. The alternative would be to delete that binary altogether if it does nothing useful ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 2

[libvirt] [PATCH 0/4 v2] Support to set disk wwn
by Osier Yang 13 Sep '12

13 Sep '12

v1 - v2: * Validate wwn while parsing * Error out earlier "if (disk->device == "lun" && disk->wwn)", no logic change. This introduces new element <wwn> for disk, to allow to set wwn (just like setting serial number) for the virtual disk (Only QEMU devices like ide-drive, ide-hd, ide-cd, scsi-disk, scsi-hd, and scsi-cd support it). Osier Yang (4): schema: Add schema for disk <wwn> conf: Parse and format disk <wwn> qemu: Add caps to indentify if setting wwn is supported by qemu qemu: Use disk wwn in qemu command line docs/formatdomain.html.in | 6 +++ docs/schemas/basictypes.rng | 6 +++ docs/schemas/domaincommon.rng | 5 +++ docs/schemas/nodedev.rng | 6 --- src/conf/domain_conf.c | 12 +++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 34 +++++++++++++++++++ src/util/util.c | 17 +++++++++ src/util/util.h | 2 + .../qemuxml2argv-disk-ide-wwn.args | 6 +++ .../qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml | 28 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-wwn.args | 10 ++++++ .../qemuxml2argv-disk-scsi-disk-wwn.xml | 35 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ 17 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml -- 1.7.7.3

2 7

[libvirt] [PATCH] Don't overwrite errors raised by qemuMonitorHMPCommand
by Daniel P. Berrange 13 Sep '12

13 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The qemuMonitorHMPCommand() API and things it calls will report a wide variety of errors. The QEMU text monitor should not be overwriting these errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_monitor_text.c | 335 ++++++++++--------------------------------- 1 file changed, 76 insertions(+), 259 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a575e30..f7b88a7 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -387,14 +387,11 @@ qemuMonitorTextStartCPUs(qemuMonitorPtr mon, int qemuMonitorTextStopCPUs(qemuMonitorPtr mon) { char *info; + int ret; - if (qemuMonitorHMPCommand(mon, "stop", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot stop CPU execution")); - return -1; - } + ret = qemuMonitorHMPCommand(mon, "stop", &info); VIR_FREE(info); - return 0; + return ret; } @@ -409,11 +406,8 @@ qemuMonitorTextGetStatus(qemuMonitorPtr mon, if (reason) *reason = VIR_DOMAIN_PAUSED_UNKNOWN; - if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot get status info")); + if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) return -1; - } if (strstr(reply, "running")) { *running = true; @@ -448,14 +442,12 @@ cleanup: int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon) { char *info; + int ret; + + ret = qemuMonitorHMPCommand(mon, "system_powerdown", &info); - if (qemuMonitorHMPCommand(mon, "system_powerdown", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("system shutdown operation failed")); - return -1; - } VIR_FREE(info); - return 0; + return ret; } int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainNetInterfaceLinkState state) { @@ -473,11 +465,8 @@ int qemuMonitorTextSetLink(qemuMonitorPtr mon, const char *name, enum virDomainN virReportOOMError(); goto error; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("set_link operation failed")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto error; - } /* check if set_link command is supported */ if (strstr(info, "\nunknown ")) { @@ -507,14 +496,12 @@ error: int qemuMonitorTextSystemReset(qemuMonitorPtr mon) { char *info; + int ret; + + ret = qemuMonitorHMPCommand(mon, "system_reset", &info); - if (qemuMonitorHMPCommand(mon, "system_reset", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("system reset operation failed")); - return -1; - } VIR_FREE(info); - return 0; + return ret; } @@ -527,11 +514,8 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, pid_t *cpupids = NULL; size_t ncpupids = 0; - if (qemuMonitorHMPCommand(mon, "info cpus", &qemucpus) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to fetch CPU thread info")); + if (qemuMonitorHMPCommand(mon, "info cpus", &qemucpus) < 0) return -1; - } /* * This is the gross format we're about to parse :-{ @@ -608,11 +592,8 @@ int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, *virtType = VIR_DOMAIN_VIRT_QEMU; - if (qemuMonitorHMPCommand(mon, "info kvm", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query kvm status")); + if (qemuMonitorHMPCommand(mon, "info kvm", &reply) < 0) return -1; - } if (strstr(reply, "enabled")) *virtType = VIR_DOMAIN_VIRT_KVM; @@ -715,11 +696,8 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, int ret = -1; char *offset; - if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query memory balloon allocation")); + if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) return -1; - } if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { offset += strlen(BALLOON_PREFIX); @@ -759,11 +737,8 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, int ret = 0; char *offset; - if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not query memory balloon statistics")); + if (qemuMonitorHMPCommand(mon, "info balloon", &reply) < 0) return -1; - } if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { offset += strlen(BALLOON_PREFIX); @@ -786,11 +761,8 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, char *dev; int tmp; - if (qemuMonitorHMPCommand(mon, "info block", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("info block command failed")); + if (qemuMonitorHMPCommand(mon, "info block", &reply) < 0) goto cleanup; - } if (strstr(reply, "\ninfo ")) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -905,11 +877,8 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, const char *p, *eol; int devnamelen = strlen(dev_name); - if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("'info blockstats' command failed")); + if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints the supported * info commands, so the output starts "info ". Since this is @@ -1032,11 +1001,8 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, int num = 0; const char *p, *eol; - if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("'info blockstats' command failed")); + if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints the supported * info commands, so the output starts "info ". Since this is @@ -1116,11 +1082,8 @@ int qemuMonitorTextBlockResize(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to resize block")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1197,11 +1160,8 @@ int qemuMonitorTextSetPassword(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("setting password failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1231,11 +1191,8 @@ int qemuMonitorTextExpirePassword(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("expiring password failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -1271,8 +1228,6 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon, } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not balloon memory allocation")); VIR_FREE(cmd); return -1; } @@ -1308,8 +1263,6 @@ int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online) } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not change CPU online status")); VIR_FREE(cmd); return -1; } @@ -1342,11 +1295,8 @@ int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not eject media on %s"), dev_name); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * device not found, device is locked ... @@ -1386,11 +1336,8 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not change media on %s"), dev_name); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * device not found, device is locked ... @@ -1438,11 +1385,8 @@ static int qemuMonitorTextSaveMemory(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("could not save memory region to '%s'"), path); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX what is printed on failure ? */ @@ -1485,11 +1429,8 @@ int qemuMonitorTextSetMigrationSpeed(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not restrict migration speed")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } ret = 0; @@ -1512,11 +1453,8 @@ int qemuMonitorTextSetMigrationDowntime(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("could not set maximum migration downtime")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } ret = 0; @@ -1553,11 +1491,8 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon, *remaining = 0; *total = 0; - if (qemuMonitorHMPCommand(mon, "info migrate", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot query migration status")); + if (qemuMonitorHMPCommand(mon, "info migrate", &reply) < 0) return -1; - } if ((tmp = strstr(reply, MIGRATION_PREFIX)) != NULL) { tmp += strlen(MIGRATION_PREFIX); @@ -1704,11 +1639,8 @@ int qemuMonitorTextMigrate(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to start migration to %s"), dest); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } /* Now check for "fail" in the output string */ if (strstr(info, "fail") != NULL) { @@ -1738,15 +1670,12 @@ cleanup: int qemuMonitorTextMigrateCancel(qemuMonitorPtr mon) { char *info = NULL; + int ret; - if (qemuMonitorHMPCommand(mon, "migrate_cancel", &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to cancel migration")); - return -1; - } - VIR_FREE(info); + ret = qemuMonitorHMPCommand(mon, "migrate_cancel", &info); - return 0; + VIR_FREE(info); + return ret; } @@ -1769,8 +1698,6 @@ int qemuMonitorTextGraphicsRelocate(qemuMonitorPtr mon, if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { VIR_FREE(cmd); - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to relocate graphics client")); return -1; } VIR_FREE(cmd); @@ -1799,11 +1726,8 @@ int qemuMonitorTextAddUSBDisk(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command to add usb disk")); + if (qemuMonitorHMPCommand(mon, cmd, &info) < 0) goto cleanup; - } /* If the command failed qemu prints: * Could not add ... */ @@ -1835,11 +1759,8 @@ static int qemuMonitorTextAddUSBDevice(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot attach usb device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command failed qemu prints: * Could not add ... */ @@ -1976,11 +1897,8 @@ int qemuMonitorTextAddPCIHostDevice(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot attach host pci device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "invalid type: host")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2027,11 +1945,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s disk %s"), bus, path); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { if (!tryOldSyntax && strstr(reply, "invalid char in expression")) { @@ -2069,11 +1984,8 @@ int qemuMonitorTextAddPCINetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add NIC with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -2113,11 +2025,8 @@ try_command: } } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to remove PCI device")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* Syntax changed when KVM merged PCI hotplug upstream to QEMU, * so check for an error message from old KVM indicating the @@ -2161,11 +2070,8 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommandWithFd(mon, cmd, fd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to pass fd to qemu with '%s'"), cmd); + if (qemuMonitorHMPCommandWithFd(mon, cmd, fd, &reply) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints: * unknown command: getfd" */ @@ -2204,11 +2110,8 @@ int qemuMonitorTextCloseFileHandle(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the command isn't supported then qemu prints: * unknown command: getfd" */ @@ -2240,11 +2143,8 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add host net with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2275,11 +2175,8 @@ int qemuMonitorTextRemoveHostNetwork(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to remove host network in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2304,11 +2201,8 @@ int qemuMonitorTextAddNetdev(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add netdev with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2333,11 +2227,8 @@ int qemuMonitorTextRemoveNetdev(qemuMonitorPtr mon, return -1; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to remove netdev in qemu with '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* XXX error messages here ? */ @@ -2368,11 +2259,8 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, char *reply = NULL; int ret = -1; - if (qemuMonitorHMPCommand(mon, "info chardev", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("failed to retrieve chardev info in qemu with 'info chardev'")); + if (qemuMonitorHMPCommand(mon, "info chardev", &reply) < 0) return -1; - } char *pos; /* The current start of searching */ char *next = reply; /* The start of the next line */ @@ -2453,11 +2341,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s disk controller"), bus); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (qemuMonitorTextParsePciAddReply(mon, reply, guestAddr) < 0) { if (!tryOldSyntax && strstr(reply, "invalid char in expression")) { @@ -2552,11 +2437,8 @@ try_command: goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to attach drive '%s'"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2643,11 +2525,8 @@ int qemuMonitorTextGetAllPCIAddresses(qemuMonitorPtr mon, *retaddrs = NULL; - if (qemuMonitorHMPCommand(mon, "info pci", &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot query PCI addresses")); + if (qemuMonitorHMPCommand(mon, "info pci", &reply) < 0) return -1; - } p = reply; @@ -2736,11 +2615,8 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon, } VIR_DEBUG("TextDelDevice devalias=%s", devalias); - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot detach %s device"), devalias); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -2776,11 +2652,8 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot attach %s device"), devicestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } /* If the host device is hotpluged first time, qemu will output * husb: using %s file-system with %s if the command succeeds. @@ -2829,11 +2702,8 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add drive '%s'"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2877,11 +2747,8 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot delete %s drive"), drivestr); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { VIR_ERROR(_("deleting drive is not supported. " @@ -2930,11 +2797,8 @@ int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("failed to set disk password")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -2968,11 +2832,8 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to take snapshot using command '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "Error while creating snapshot") != NULL) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -3016,12 +2877,8 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to restore snapshot using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "No block device supports snapshots") != NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3074,12 +2931,8 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) virReportOOMError(); goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to delete snapshot using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "No block device supports snapshots") != NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3120,11 +2973,8 @@ qemuMonitorTextDiskSnapshot(qemuMonitorPtr mon, const char *device, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to take snapshot using command '%s'"), cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - } if (strstr(reply, "error while creating qcow2") != NULL || strstr(reply, "unknown command:") != NULL) { @@ -3158,9 +3008,6 @@ int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, } ret = qemuMonitorHMPCommand(mon, safecmd, reply); - if (ret != 0) - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to run cmd '%s'"), safecmd); VIR_FREE(safecmd); @@ -3169,30 +3016,21 @@ int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, int qemuMonitorTextInjectNMI(qemuMonitorPtr mon) { - const char *cmd = "inject-nmi"; char *reply = NULL; - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) - goto fail; + if (qemuMonitorHMPCommand(mon, "inject-nmi", &reply) < 0) + return -1; if (strstr(reply, "unknown command") != NULL) { VIR_FREE(reply); /* fallback to 'nmi' if qemu has not supported "inject-nmi" yet. */ - cmd = "nmi 0"; - reply = NULL; - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) - goto fail; + if (qemuMonitorHMPCommand(mon, "nmi 0", &reply) < 0) + return -1; } VIR_FREE(reply); return 0; - -fail: - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to inject NMI using command '%s'"), - cmd); - return -1; } int qemuMonitorTextSendKey(qemuMonitorPtr mon, @@ -3232,12 +3070,8 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon, } cmd = virBufferContentAndReset(&buf); - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to send key using command '%s'"), - cmd); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -3265,11 +3099,8 @@ int qemuMonitorTextScreendump(qemuMonitorPtr mon, const char *file) goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("taking screenshot failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (strstr(reply, "unknown command:")) { ret = -2; @@ -3299,11 +3130,8 @@ int qemuMonitorTextOpenGraphics(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("adding graphics client failed")); + if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) goto cleanup; - } if (STRNEQ(reply, "")) goto cleanup; @@ -3323,34 +3151,28 @@ int qemuMonitorTextSetBlockIoThrottle(qemuMonitorPtr mon, { char *cmd = NULL; char *result = NULL; - int ret = 0; + int ret = -1; const char *cmd_name = NULL; /* For the not specified fields, 0 by default */ cmd_name = "block_set_io_throttle"; - ret = virAsprintf(&cmd, "%s %s %llu %llu %llu %llu %llu %llu", cmd_name, - device, info->total_bytes_sec, info->read_bytes_sec, - info->write_bytes_sec, info->total_iops_sec, - info->read_iops_sec, info->write_iops_sec); - - if (ret < 0) { + if (virAsprintf(&cmd, "%s %s %llu %llu %llu %llu %llu %llu", cmd_name, + device, info->total_bytes_sec, info->read_bytes_sec, + info->write_bytes_sec, info->total_iops_sec, + info->read_iops_sec, info->write_iops_sec) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command")); - ret = -1; + if (qemuMonitorHMPCommand(mon, cmd, &result) < 0) goto cleanup; - } if (qemuMonitorTextCommandNotFound(cmd_name, result)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Command '%s' is not found"), cmd_name); - ret = -1; goto cleanup; } + ret = 0; cleanup: VIR_FREE(cmd); @@ -3441,20 +3263,15 @@ int qemuMonitorTextGetBlockIoThrottle(qemuMonitorPtr mon, virDomainBlockIoTuneInfoPtr reply) { char *result = NULL; - int ret = 0; + int ret = -1; const char *cmd_name = "info block"; - if (qemuMonitorHMPCommand(mon, cmd_name, &result) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot run monitor command")); - ret = -1; + if (qemuMonitorHMPCommand(mon, cmd_name, &result) < 0) goto cleanup; - } if (qemuMonitorTextCommandNotFound(cmd_name, result)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Command '%s' is not found"), cmd_name); - ret = -1; goto cleanup; } -- 1.7.11.4

2 1

[libvirt] [libvirt-designer][PATCH 0/3] Another cleanup
by Michal Privoznik 13 Sep '12

13 Sep '12

to address Chritophe's improvements hints. Michal Privoznik (3): init_check: Ignore DB loading errors get_supported_disk_bus_types: NULL is valid list add_disk_full: Only set error if !NULL libvirt-designer/libvirt-designer-domain.c | 5 ++--- libvirt-designer/libvirt-designer-main.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) -- 1.7.8.6

3 6

[libvirt] [PATCH] parallels: implement containers creation
by Dmitry Guryanov 13 Sep '12

13 Sep '12

Add separate function parallelsCreateCt, which creates container. Also add example xml configuration domain-parallels-ct-simple.xml. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_driver.c | 41 +++++++++++++++++++- .../domain-parallels-ct-simple.xml | 27 +++++++++++++ 2 files changed, 67 insertions(+), 1 deletions(-) create mode 100644 tests/domainschemadata/domain-parallels-ct-simple.xml diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 9eb2526..0dd13fe 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1663,6 +1663,36 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def) return -1; } +static int +parallelsCreateCt(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDefPtr def) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(def->uuid, uuidstr); + + if (def->nfss != 1 || + def->fss[0]->type != VIR_DOMAIN_FS_TYPE_TEMPLATE) { + + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("There must be only 1 template FS for " + "container creation")); + goto error; + } + + if (parallelsCmdRun(PRLCTL, "create", def->name, "--vmtype", "ct", + "--uuid", uuidstr, + "--ostemplate", def->fss[0]->src, NULL) < 0) + goto error; + + if (parallelsCmdRun(PRLCTL, "set", def->name, "--vnc-mode", "auto", NULL) < 0) + goto error; + + return 0; + +error: + return -1; +} + static virDomainPtr parallelsDomainDefineXML(virConnectPtr conn, const char *xml) { @@ -1703,8 +1733,17 @@ parallelsDomainDefineXML(virConnectPtr conn, const char *xml) def = NULL; } else { - if (parallelsCreateVm(conn, def)) + if (STREQ(def->os.type, "hvm")) { + if (parallelsCreateVm(conn, def)) + goto cleanup; + } else if (STREQ(def->os.type, "exe")) { + if (parallelsCreateCt(conn, def)) + goto cleanup; + } else { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported OS type: %s"), def->os.type); goto cleanup; + } if (parallelsLoadDomains(privconn, def->name)) goto cleanup; dom = virDomainFindByName(&privconn->domains, def->name); diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml new file mode 100644 index 0000000..a2b87ce --- /dev/null +++ b/tests/domainschemadata/domain-parallels-ct-simple.xml @@ -0,0 +1,27 @@ +<domain type='parallels'> + <name>1010</name> + <uuid>88576506-d611-41c2-b6b6-c9043704a0dd</uuid> + <description></description> + <memory unit='KiB'>262144</memory> + <currentMemory unit='KiB'>262144</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <filesystem type='template'> + <source name='centos-6-x86_64'/> + <target dir='/'/> + </filesystem> + <video> + <model type='vga' vram='16777216' heads='1'> + <acceleration accel3d='no' accel2d='no'/> + </model> + </video> + </devices> +</domain> -- 1.7.1

2 1

[libvirt] Release of libvirt-java-0.4.9
by Daniel Veillard 13 Sep '12

13 Sep '12

New version of the Java bindings are available, I know that there is bugs being chased ATM but I push this release to provide the change of licence from LGPLv2+ to MIT needed by the CloudStack folks (that was done after getting positive feedback from previous contributors). Release available as libvirt-java-0.4.9.tar.gz and rpms at ftp://libvirt.org/libvirt/java it's also tagged in git. Content is slim: - Change Licence to MIT and release 0.4.9 (Daniel Veillard) - Update the maven jar coordinates (Daniel Veillard) (but it is broken one month later no mirror seems to export jars) - Fix IndexOutOfBoundsException for unknown error codes (Claudio Bley) - Add debian packaging for the Java bindings (Wido den Hollander) - Fix javadoc warnings. (Claudio Bley) - Fix typo in Domain.java (Claudio Bley) thanks everybody for the patches, we may push a new release (0.5.0 ?) if the leaks detected by Benjamin Wang get fixed. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCHv2 0/4]add support usb redirection filter
by Guannan Ren 13 Sep '12

13 Sep '12

v2 fixed: (1) type int->size_t (2) Don't output filter attributes with default -1 value in XML. (3) Treat 0x0(0 decimal) as valid value for USB vendorID and productID as well as USB classID and bcdDevice code. (4) doc fixed. BZ RFE https://bugzilla.redhat.com/show_bug.cgi?id=795929 qemu support: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=6af165892cf900291046f1d25f95… Since qemu has have the code to support USB redirection filter. This set of patches try to support it from libvirt. The input XML format is like this: <devices> ... <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x1234' product='0xbeef' \ version='2.00' allow='yes'/> <usbdev allow='no'/> </redirfilter> ... </devices> Multiple <usbdev> element as one of filter rule could be added into parent element <redirfilter>, only no more than <redirfilter> element could exists. There is no 1:1 mapping between ports and redirected devices and qemu and spicy client couldn't decide into which usbredir ports the client can 'plug' redirected devices. So it make sense to apply all of filter rules global to all existing usb redirection devices. class attribute is USB Class codes. version is bcdDevice value of USB device. vendor and product is USB vendorId and productId. -1 can be used to allow any value for a field. Except allow attribute the other four are optional, default value is -1. The above XML will be converted to the following qemu command line: If there are multiple usb-redir device, all of them have the same filter rules. -device usb-redir,chardev=charredir0,id=redir0,\ filter=0x08:0x1234:0xBEEF:0x2000:1|-1:-1:-1:-1:0,bus=usb.0,port=4 Guannan Ren(0/4) qemu: define and parse USB redirection filter XML qemu: build USB redirection filter qemu command line test: add xml2argvtest for usb-redir filter and update doc: update usb redirection filter infomation on docs/formatdomain.html.in | 38 +++++++++++------ docs/schemas/domaincommon.rng | 66 +++++++++++++++++++++++++++++ src/conf/domain_conf.c | 339 +++++++++++++++++++++++++++++.. src/conf/domain_conf.h | 21 +++++++++ src/qemu/qemu_command.c | 45 +++++++++++++++++++- src/qemu/qemu_command.h | 5 ++- src/qemu/qemu_hotplug.c | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 10 +++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml | 45 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 10 files changed, 559 insertions(+), 19 deletions(-)

2 6

[libvirt] [libvirt-glib][PATCH v4 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 13 Sep '12

13 Sep '12

which is basically a wrapper for virConnectGetType(). --- examples/conn-test.c | 9 ++++++ libvirt-gobject/libvirt-gobject-connection.c | 41 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 2 + libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b9cb417 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,20 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + } + + g_print("Hypervisor name: %s\n", hv_name); + + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..3dff564 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,47 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = conn->priv; + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not opened"); + goto cleanup; + } + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..1bdac54 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,8 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

2 3

[libvirt] [PATCH] virsh: Fix version numbers in comments
by Osier Yang 13 Sep '12

13 Sep '12

And redundant error resetting. Pushed under trivial rule. --- tools/virsh-network.c | 8 +++----- tools/virsh-pool.c | 8 +++----- tools/virsh-volume.c | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5c3daa3..2c32a78 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -397,7 +397,7 @@ vshNetworkListCollect(vshControl *ctl, int nInactiveNets = 0; int nAllNets = 0; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virConnectListAllNetworks(ctl->conn, &list->nets, flags)) >= 0) { @@ -406,10 +406,8 @@ vshNetworkListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { /* try the new API again but mask non-guaranteed flags */ @@ -430,7 +428,7 @@ vshNetworkListCollect(vshControl *ctl, fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* Get the number of active networks */ diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 15d1883..bc10f76 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -606,7 +606,7 @@ vshStoragePoolListCollect(vshControl *ctl, int nInactivePools = 0; int nAllPools = 0; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virConnectListAllStoragePools(ctl->conn, &list->pools, flags)) >= 0) { @@ -615,10 +615,8 @@ vshStoragePoolListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } if (last_error && last_error->code == VIR_ERR_INVALID_ARG) { /* try the new API again but mask non-guaranteed flags */ @@ -638,7 +636,7 @@ vshStoragePoolListCollect(vshControl *ctl, fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* There is no way to get the pool type */ diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index ec0b5b0..c5bd4af 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1017,7 +1017,7 @@ vshStorageVolListCollect(vshControl *ctl, int nvols = 0; int ret = -1; - /* try the list with flags support (0.10.0 and later) */ + /* try the list with flags support (0.10.2 and later) */ if ((ret = virStoragePoolListAllVolumes(pool, &list->vols, flags)) >= 0) { @@ -1026,17 +1026,15 @@ vshStorageVolListCollect(vshControl *ctl, } /* check if the command is actually supported */ - if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) { - vshResetLibvirtError(); + if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) goto fallback; - } /* there was an error during the call */ vshError(ctl, "%s", _("Failed to list volumes")); goto cleanup; fallback: - /* fall back to old method (0.9.13 and older) */ + /* fall back to old method (0.10.1 and older) */ vshResetLibvirtError(); /* Determine the number of volumes in the pool */ -- 1.7.7.3

1 0

[libvirt] [PATCH 0/5] add support usb redirection filter
by Guannan Ren 13 Sep '12

13 Sep '12

(This is not a new set of patches, it's rebased version) BZ RFE https://bugzilla.redhat.com/show_bug.cgi?id=795929 qemu support: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=6af165892cf900291046f1d25f95… Since qemu has have the code to support USB redirection filter. This set of patches try to support it from libvirt. The XML format is like this: <devices> ... <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x1234' product='0xbeef' \ version='2.00' allow='yes'/> <usbdev class='-1' vendor='-1' product='-1' version='-1' allow='no'/> </redirfilter> ... </devices> Multiple <usbdev> element as one of filter rule could be added into parent element <redirfilter>, only no more than <redirfilter> element could exists. There is no 1:1 mapping between ports and redirected devices and qemu and spicy client couldn't decide into which usbredir ports the client can 'plug' redirected devices. So it make sense to apply all of filter rules global to all existing usb redirection devices. class attribute is USB Class codes. version is bcdDevice value of USB device. vendor and product is USB vendorId and productId. -1 can be used to allow any value for a field. Except allow attribute the other four are optional, default value is -1. The above XML will be converted to the following qemu command line: If there are multiple usb-redir device, all of them have the same filter rules. -device usb-redir,chardev=charredir0,id=redir0,\ filter=0x08:0x1234:0xBEEF:0x2000:1|-1:-1:-1:-1:0,bus=usb.0,port=4 Guannan Ren(0/5) qemu: add usb-redir.filter qemu capability flag qemu: define and parse USB redirection filter XML qemu: build USB redirection filter qemu command line test: add xml2argvtest for usb-redir filter and update doc: update usb redirection filter infomation on docs/formatdomain.html.in | 38 ++++++++++------ docs/schemas/domaincommon.rng | 66 ++++++++++++++++++++++++++++ src/conf/domain_conf.c | 346 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 21 +++++++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 45 ++++++++++++++++++- src/qemu/qemu_command.h | 5 ++- src/qemu/qemu_hotplug.c | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 10 +++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml | 45 +++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 12 files changed, 571 insertions(+), 19 deletions(-)

2 11

[libvirt] [PATCH] Fix libvirtd crash possibility
by Martin Kletzander 13 Sep '12

13 Sep '12

When generating RPC protocol messages, it's strictly needed to have continuousline of numbers or RPC messages. However in case anyone tries backporting some functionality and will skip a number, there is a possibility to make the daemon segfault with newer virsh (version of the library, rpc call, etc.) even unintentionally. The problem is that the skipped numbers will get func filled with NULLs, but there is no check whether these are set before the daemon tries to run them. This patch very simply enhances one check and fixes that. I haven't investigated into such a deepness to say if the possibility comes as well with hacked RPC call (calling event instead of function), but this patch gets rid of both these problems. --- src/rpc/virnetserverprogram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index d13b621..bc85df0 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -1,7 +1,7 @@ /* * virnetserverprogram.c: generic network RPC server program * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -379,7 +379,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog, dispatcher = virNetServerProgramGetProc(prog, msg->header.proc); - if (!dispatcher) { + if (!dispatcher || !dispatcher->func) { virReportError(VIR_ERR_RPC, _("unknown procedure: %d"), msg->header.proc); -- 1.7.12

2 2

[libvirt] [PATCH] conf: fix missing spaces in message
by Eric Blake 12 Sep '12

12 Sep '12

I got an off-list report about a bad diagnostic: Target network card mac 52:54:00:49:07:ccdoes not match source 52:54:00:49:07:b8 True to form, I've added a syntax check rule to prevent it from recurring, and found several other offenders. * cfg.mk (sc_require_whitespace_in_translation): New rule. * src/conf/domain_conf.c (virDomainNetDefCheckABIStability): Add space. * src/esx/esx_util.c (esxUtil_ParseUri): Likewise. * src/qemu/qemu_command.c (qemuCollectPCIAddress): Likewise. * src/qemu/qemu_driver.c (qemuDomainSetMetadata) (qemuDomainGetMetadata): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainChangeNetBridge): Likewise. * src/rpc/virnettlscontext.c (virNetTLSContextCheckCertDNWhitelist): Likewise. * src/vmware/vmware_driver.c (vmwareDomainResume): Likewise. * src/vbox/vbox_tmpl.c (vboxDomainGetXMLDesc, vboxAttachDrives): Avoid false negatives. * tools/virsh-domain.c (info_save_image_dumpxml): Reword. Based on a report by Luwen Su. --- Too big to use the trivial rule, so I'll wait for a review. cfg.mk | 9 +++++++++ src/conf/domain_conf.c | 5 +++-- src/esx/esx_util.c | 7 ++++--- src/qemu/qemu_command.c | 5 +++-- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_hotplug.c | 2 +- src/rpc/virnettlscontext.c | 6 +++--- src/vbox/vbox_tmpl.c | 14 ++++++++------ src/vmware/vmware_driver.c | 4 ++-- tools/virsh-domain.c | 4 ++-- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/cfg.mk b/cfg.mk index bca363c..0dd58df 100644 --- a/cfg.mk +++ b/cfg.mk @@ -597,6 +597,15 @@ sc_prohibit_useless_translation: halt='no translations in tests or examples' \ $(_sc_search_regexp) +# When splitting a diagnostic across lines, ensure that there is a space +# or \n on one side of the split. +sc_require_whitespace_in_translation: + @grep -n -A1 '"$$' $$($(VC_LIST_EXCEPT)) \ + | sed -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ + -e '/_(.*[^\ ]""[^\ ]/p' | grep . && \ + { echo '$(ME): missing whitespace at line split' 1>&2; \ + exit 1; } || : + # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @if cppi --version >/dev/null 2>&1; then \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e71b06..292cc9a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9846,7 +9846,8 @@ static bool virDomainDeviceInfoCheckABIStability(virDomainDeviceInfoPtr src, src->addr.pci.slot != dst->addr.pci.slot || src->addr.pci.function != dst->addr.pci.function) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device PCI address %04x:%02x:%02x.%02x does not match source %04x:%02x:%02x.%02x"), + _("Target device PCI address %04x:%02x:%02x.%02x " + "does not match source %04x:%02x:%02x.%02x"), dst->addr.pci.domain, dst->addr.pci.bus, dst->addr.pci.slot, dst->addr.pci.function, src->addr.pci.domain, src->addr.pci.bus, @@ -10044,7 +10045,7 @@ static bool virDomainNetDefCheckABIStability(virDomainNetDefPtr src, if (virMacAddrCmp(&src->mac, &dst->mac) != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target network card mac %02x:%02x:%02x:%02x:%02x:%02x" - "does not match source %02x:%02x:%02x:%02x:%02x:%02x"), + " does not match source %02x:%02x:%02x:%02x:%02x:%02x"), dst->mac.addr[0], dst->mac.addr[1], dst->mac.addr[2], dst->mac.addr[3], dst->mac.addr[4], dst->mac.addr[5], src->mac.addr[0], src->mac.addr[1], src->mac.addr[2], diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 9288218..9d84a6a 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -2,7 +2,7 @@ /* * esx_util.c: utility functions for the VMware ESX driver * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2011 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * @@ -159,8 +159,9 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) (*parsedUri)->proxy_port < 1 || (*parsedUri)->proxy_port > 65535) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'proxy' has unexpected port" - "value '%s' (should be [1..65535])"), tmp); + _("Query parameter 'proxy' has unexpected " + "port value '%s' (should be [1..65535])"), + tmp); goto cleanup; } } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a83d6de..cd4ee93 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1044,8 +1044,9 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (virHashLookup(addrs->used, addr)) { virReportError(VIR_ERR_XML_ERROR, - _("Attempted double use of PCI Address '%s'" - "(need \"multifunction='off'\" for device on function 0)"), + _("Attempted double use of PCI Address '%s' " + "(need \"multifunction='off'\" for device " + "on function 0)"), addr); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e8e00c..a410521 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13271,7 +13271,7 @@ qemuDomainSetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEmu driver does not support modifying" + _("QEmu driver does not support modifying " "<metadata> element")); goto cleanup; break; @@ -13299,7 +13299,7 @@ qemuDomainSetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU driver does not support" + _("QEMU driver does not support " "<metadata> element")); goto cleanup; default: @@ -13367,7 +13367,7 @@ qemuDomainGetMetadata(virDomainPtr dom, break; case VIR_DOMAIN_METADATA_ELEMENT: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU driver does not support" + _("QEMU driver does not support " "<metadata> element")); goto cleanup; break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a8a904c..d4d08ac 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1278,7 +1278,7 @@ int qemuDomainChangeNetBridge(virDomainObjPtr vm, virDomainAuditNet(vm, NULL, olddev, "attach", ret == 0); if (ret < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("unable to recover former state by adding port" + _("unable to recover former state by adding port " "to bridge %s"), oldbridge); } return -1; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 9fe6eb1..dee4334 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1,7 +1,7 @@ /* * virnettlscontext.c: TLS encryption/x509 handling * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -393,8 +393,8 @@ virNetTLSContextCheckCertDNWhitelist(const char *dname, virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Client's Distinguished Name is not on the list " "of allowed clients (tls_allowed_dn_list). Use " - "'certtool -i --infile clientcert.pem' to view the" - "Distinguished Name field in the client certificate," + "'certtool -i --infile clientcert.pem' to view the " + "Distinguished Name field in the client certificate, " "or run this daemon with --verbose option.")); return 0; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 48f371f..4f2d025 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -3752,8 +3752,9 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { ret = vboxStartMachine(dom, i, machine, &iid); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("machine is not in poweroff|saved|" - "aborted state, so couldn't start it")); + _("machine is not in " + "poweroff|saved|aborted state, so " + "couldn't start it")); ret = -1; } } @@ -4280,8 +4281,9 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) &devicePort, &deviceSlot)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't get the port/slot number of harddisk/" - "dvd/floppy to be attached: %s, rc=%08x"), + _("can't get the port/slot number of " + "harddisk/dvd/floppy to be attached: " + "%s, rc=%08x"), def->disks[i]->src, (unsigned)rc); VBOX_RELEASE(medium); VBOX_UTF16_FREE(mediumUUID); @@ -4303,8 +4305,8 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not attach the file as harddisk/" - "dvd/floppy: %s, rc=%08x"), + _("could not attach the file as " + "harddisk/dvd/floppy: %s, rc=%08x"), def->disks[i]->src, (unsigned)rc); } else { DEBUGIID("Attached HDD/DVD/Floppy with UUID", mediumUUID); diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 1607018..557b917 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*/ /* - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011-2012 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) * * This library is free software; you can redistribute it and/or @@ -484,7 +484,7 @@ vmwareDomainResume(virDomainPtr dom) if (driver->type == TYPE_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume" + _("vmplayer does not support libvirt suspend/resume " "(vmware pause/unpause) operation ")); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 409eb24..c6695b3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2945,8 +2945,8 @@ cleanup: */ static const vshCmdInfo info_save_image_dumpxml[] = { {"help", N_("saved state domain information in XML")}, - {"desc", N_("Output the domain information for a saved state file,\n" - "as an XML dump to stdout.")}, + {"desc", + N_("Dump XML of domain information for a saved state file to stdout.")}, {NULL, NULL} }; -- 1.7.11.4

2 2

[libvirt] libvirt build failure w/GNU make and automake.git (automake regression?)
by Jim Meyering 12 Sep '12

12 Sep '12

When I run ./autogen.sh && make, I see this: (this arose because I had the latest automake.git/master tools -- commit c1b83e1af60b866cf5cdeebf77d0275019bad8b2 from today -- early in my path) Generated 3 wrapper functions CC libvirtmod_la-libvirt-override.lo CC libvirtmod_la-typewrappers.lo CC libvirtmod_la-libvirt.lo CC libvirtmod_qemu_la-libvirt-qemu-override.lo CC libvirtmod_qemu_la-typewrappers.lo CC libvirtmod_qemu_la-libvirt-qemu.lo CCLD libvirtmod_qemu.la CCLD libvirtmod.la make[3]: Leaving directory `/h/j/w/co/libvirt/python' Making all in tests make[3]: Entering directory `/h/j/w/co/libvirt/python/tests' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/h/j/w/co/libvirt/python/tests' make[2]: Leaving directory `/h/j/w/co/libvirt/python' Making all in tests make[2]: Entering directory `/h/j/w/co/libvirt/tests' Makefile:4355: *** Malformed target-specific variable definition. Stop. make[2]: Leaving directory `/h/j/w/co/libvirt/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/h/j/w/co/libvirt' make: *** [all] Error 2 That is because of this automake-generated rule: undefine.log: undefine @p='undefine'; \ b='undefine'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) The trouble is that "undefine" is an operator in GNU make. Here's that part of GNU make's documentation: 6.9 Undefining Variables ======================== If you want to clear a variable, setting its value to empty is usually sufficient. Expanding such a variable will yield the same result (empty string) regardless of whether it was set or not. However, if you are using the `flavor' (*note Flavor Function::) and `origin' (*note Origin Function::) functions, there is a difference between a variable that was never set and a variable with an empty value. In such situations you may want to use the `undefine' directive to make a variable appear as if it was never set. For example: foo := foo bar = bar undefine foo undefine bar $(info $(origin foo)) $(info $(flavor bar)) This example will print "undefined" for both variables. If you want to undefine a command-line variable definition, you can use the `override' directive together with `undefine', similar to how this is done for variable definitions: override undefine CFLAGS The most pragmatic work-around is to rename the "undefine" test script. However, Stephano, as automake maintainer, I think you will want to fix automake not to prohibit the use of such test names.

3 2

[libvirt] [libvirt-glib][PATCH v3 1/2] gobject: Introduce gvir_connection_get_hypervisor_name
by Michal Privoznik 12 Sep '12

12 Sep '12

which is basically a wrapper for virConnectGetType(). --- The list is sad as it hasn't delivered previous version. examples/conn-test.c | 12 +++++++ libvirt-gobject/libvirt-gobject-connection.c | 45 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 3 ++ libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/examples/conn-test.c b/examples/conn-test.c index 8c70997..b90d2b0 100644 --- a/examples/conn-test.c +++ b/examples/conn-test.c @@ -31,11 +31,23 @@ do_connection_open(GObject *source, { GVirConnection *conn = GVIR_CONNECTION(source); GError *err = NULL; + gchar *hv_name = NULL; if (!gvir_connection_open_finish(conn, res, &err)) { g_error("%s", err->message); + goto cleanup; } g_print("Connected to libvirt\n"); + + if (!(hv_name = gvir_connection_get_hypervisor_name(conn, &err))) { + g_error("%s", err->message); + goto cleanup; + } + + g_print("Hypervisor name: %s\n", hv_name); + +cleanup: + g_free(hv_name); g_object_unref(conn); } diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index d826905..75bf041 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1025,6 +1025,51 @@ const gchar *gvir_connection_get_uri(GVirConnection *conn) return conn->priv->uri; } +/** + * gvir_connection_get_hypervisor_name: + * @conn: a #GVirConnection + * @err: return location for any #GError + * + * Get name of current hypervisor used. + * + * Return value: new string that should be freed when no longer needed, + * or NULL upon error. + */ +gchar * +gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv; + gchar *ret = NULL; + const char *type; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), NULL); + g_return_val_if_fail(err == NULL || *err == NULL, NULL); + + priv = conn->priv; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(priv->conn); + if (!priv->conn) { + g_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Connection is not open"); + goto cleanup; + } + + type = virConnectGetType(priv->conn); + if (!type) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, 0, + "Unable to get hypervisor name"); + goto cleanup; + } + + ret = g_strdup(type); + +cleanup: + if (priv->conn) + virConnectClose(priv->conn); + return ret; +} + static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) { g_object_ref(obj); diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d658b01..62eb024 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -112,6 +112,9 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, const gchar *gvir_connection_get_uri(GVirConnection *conn); +gchar *gvir_connection_get_hypervisor_name(GVirConnection *conn, + GError **err); + GList *gvir_connection_get_domains(GVirConnection *conn); GVirDomain *gvir_connection_get_domain(GVirConnection *conn, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 67e5a4f..2c2f1f4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -194,4 +194,9 @@ LIBVIRT_GOBJECT_0.1.2 { gvir_domain_resume_finish; } LIBVIRT_GOBJECT_0.1.1; +LIBVIRT_GOBJECT_0.1.3 { + global: + gvir_connection_get_hypervisor_name; +} LIBVIRT_GOBJECT_0.1.2; + # .... define new API here using predicted next version number .... -- 1.7.8.6

2 3