- Devel - libvirt List Archives

[libvirt] Fwd: [virt-tools-list] virt-manager, dependency question
by Jason Helfman 20 Aug '11

20 Aug '11

Any thoughts on this to this list? Figure I would get a quicker response here, possibly. Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

1 0

[libvirt] xml style?
by Eric Blake 20 Aug '11

20 Aug '11

When writing an attribute in xml, which style is preferred? <element attr='single'/> <element attr="double"/> We are currently rather split-brain in libvirt, among three general areas: test programs under tests/*data/*, documentation under docs/*.html.in, and RNG schemas under docs/schemas/*. In all cases, both styles are present, but in different proportions: $ git grep '="' tests/*data |wc 48 163 4276 $ git grep "='" tests/*data |wc 5994 21336 526402 $ git grep '="' docs/schemas/ |wc 1522 4599 103050 $ git grep "='" docs/schemas/ |wc 566 1699 33005 $ git grep '="' docs/*.in |wc 1288 6436 114146 $ git grep "='" docs/*.in |wc 611 2242 42950 Is it worth a cleanup patch that settles on one particular style, or even a syntax check that forces style compliance? -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCHv2 1/2] virsh: add virsh snapshot-current --name
by Eric Blake 20 Aug '11

20 Aug '11

Sometimes, full XML is too much; since most snapshot commands operate on a snapshot name, there should be an easy way to get at the current snapshot's name. * tools/virsh.c (cmdSnapshotCurrent): Add an option. * tools/virsh.pod (snapshot-current): Document it. --- v2: use xpath instead of strstr; replaces: https://www.redhat.com/archives/libvir-list/2011-August/msg00329.html tools/virsh.c | 29 ++++++++++++++++++++++++++--- tools/virsh.pod | 4 +++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bffec1d..fd64020 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12034,6 +12034,7 @@ static const vshCmdInfo info_snapshot_current[] = { static const vshCmdOptDef opts_snapshot_current[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"name", VSH_OT_BOOL, 0, N_("list the name, rather than the full xml")}, {NULL, 0, 0, NULL} }; @@ -12044,6 +12045,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) bool ret = false; int current; virDomainSnapshotPtr snapshot = NULL; + char *xml = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -12056,7 +12058,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (current < 0) goto cleanup; else if (current) { - char *xml; + char *name = NULL; if (!(snapshot = virDomainSnapshotCurrent(dom, 0))) goto cleanup; @@ -12065,13 +12067,34 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - vshPrint(ctl, "%s", xml); - VIR_FREE(xml); + if (vshCommandOptBool(cmd, "name")) { + xmlDocPtr xmldoc = NULL; + xmlXPathContextPtr ctxt = NULL; + + xmldoc = xmlReadDoc((const xmlChar *) xml, "domainsnapshot.xml", + NULL, XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xmldoc) + goto cleanup; + ctxt = xmlXPathNewContext(xmldoc); + if (!ctxt) { + xmlFreeDoc(xmldoc); + } + + name = virXPathString("string(/domainsnapshot/name)", ctxt); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xmldoc); + if (!name) + goto cleanup; + } + + vshPrint(ctl, "%s", name ? name : xml); } ret = true; cleanup: + VIR_FREE(xml); if (snapshot) virDomainSnapshotFree(snapshot); if (dom) diff --git a/tools/virsh.pod b/tools/virsh.pod index ec778bf..53376d6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1569,9 +1569,11 @@ Create a snapshot for domain I<domain> with the given <name> and value. If I<--print-xml> is specified, then XML appropriate for I<snapshot-create> is output, rather than actually creating a snapshot. -=item B<snapshot-current> I<domain> +=item B<snapshot-current> I<domain> [I<--name>] Output the snapshot XML for the domain's current snapshot (if any). +If I<--name> is specified, just list the snapshot name instead of the +full xml. =item B<snapshot-list> I<domain> -- 1.7.4.4

2 6

[libvirt] [PATCH 0/3] xml simplifications
by Eric Blake 20 Aug '11

20 Aug '11

I noticed this while working on my snapshot stuff. There was lots of copy and paste going on in virsh.c, and it felt awful to not be able to represent the same idea in fewer lines, so I fixed it. This will probably mean I have to rebase the entire snapshot series, since it will introduce several conflicts in at least virsh.c; oh well. Eric Blake (3): maint: treat more libxml2 functions as free-like xml: add another convenience function maint: simplify lots of libxml2 clients cfg.mk | 2 + src/conf/domain_conf.c | 20 +------ src/conf/storage_conf.c | 8 +--- src/cpu/cpu.c | 18 +----- src/esx/esx_vi.c | 17 ++----- src/libvirt_private.syms | 2 - src/qemu/qemu_migration.c | 9 +--- src/security/virt-aa-helper.c | 12 +---- src/test/test_driver.c | 13 +---- src/util/xml.c | 53 +++++------------- src/util/xml.h | 84 +++++++++++++++++++++++++--- tests/cputest.c | 9 +--- tools/virsh.c | 120 +++++++++-------------------------------- 13 files changed, 135 insertions(+), 232 deletions(-) -- 1.7.4.4

2 9

[libvirt] Allow to undefine a running domain
by Osier Yang 20 Aug '11

20 Aug '11

Per API virDomainUndefineFlags' doc says, if a domain is running, it will be converted to transient, but keep running. However, the drivers prohibit one undefining a running domain. This patch series modify the internal domainUndefineFlags function of all drivers (except some driver don't need to check if the domain is running, it's handled by the underlying hypervisor, such as ESX and XEND). The principle is: 1) Set vm->persistent = 0 for a running domain 2) domainDestroy and domainShutdown will take care of remove the domain obj from the hash table. [PATCH 1/8] libxl: Allow to undefine a running domain [PATCH 2/8] lxc: Allow to undefine a running domain [PATCH 3/8] openvz: Allow to undefine a running domain [PATCH 4/8] qemu: Allow to undefine a running domain [PATCH 5/8] test: Allow to undefine a running domain [PATCH 6/8] uml: Allow to undefine a running domain [PATCH 7/8] vmware: Allow to undefine a running domain [PATCH 8/8] xen: Allow to undefine a running domain (xm_internal) Split the patches for easy reviewing, will merge when committing if need. Regards Osier

2 28

[libvirt] [PATCH] qemu: Get memory balloon info correctly for text monitor
by Osier Yang 19 Aug '11

19 Aug '11

* src/qemu/qemu_monitor_text.c: BALLOON_PREFIX was defined as "balloon: actual=", which cause "actual=" is stripped early before the real parsing. This patch changes BALLOON_PREFIX into "balloon: ", and modifies related functions, also renames "qemuMonitorParseExtraBalloonInfo" to "qemuMonitorParseBalloonInfo", as after the changing, it parses all the info returned by "info balloon". --- src/qemu/qemu_monitor_text.c | 47 +++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7bf733d..d17d863 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -547,8 +547,12 @@ static int parseMemoryStat(char **text, unsigned int tag, return 0; } - /* Convert bytes to kilobytes for libvirt */ switch (tag) { + /* Convert megabytes to kilobytes for libvirt */ + case VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON: + value = value << 10; + break; + /* Convert bytes to kilobytes for libvirt */ case VIR_DOMAIN_MEMORY_STAT_SWAP_IN: case VIR_DOMAIN_MEMORY_STAT_SWAP_OUT: case VIR_DOMAIN_MEMORY_STAT_UNUSED: @@ -565,15 +569,17 @@ static int parseMemoryStat(char **text, unsigned int tag, /* The reply from the 'info balloon' command may contain additional memory * statistics in the form: '[,<tag>=<val>]*' */ -static int qemuMonitorParseExtraBalloonInfo(char *text, - virDomainMemoryStatPtr stats, - unsigned int nr_stats) +static int qemuMonitorParseBalloonInfo(char *text, + virDomainMemoryStatPtr stats, + unsigned int nr_stats) { char *p = text; unsigned int nr_stats_found = 0; while (*p && nr_stats_found < nr_stats) { - if (parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_SWAP_IN, + if (parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, + "actual=", &stats[nr_stats_found]) || + parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_SWAP_IN, ",mem_swapped_in=", &stats[nr_stats_found]) || parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, ",mem_swapped_out=", &stats[nr_stats_found]) || @@ -584,9 +590,7 @@ static int qemuMonitorParseExtraBalloonInfo(char *text, parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_UNUSED, ",free_mem=", &stats[nr_stats_found]) || parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_AVAILABLE, - ",total_mem=", &stats[nr_stats_found]) || - parseMemoryStat(&p, VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, - ",actual=", &stats[nr_stats_found])) + ",total_mem=", &stats[nr_stats_found])) nr_stats_found++; /* Skip to the next label. When *p is ',' the last match attempt @@ -602,7 +606,7 @@ static int qemuMonitorParseExtraBalloonInfo(char *text, /* The reply from QEMU contains 'ballon: actual=421' where value is in MB */ -#define BALLOON_PREFIX "balloon: actual=" +#define BALLOON_PREFIX "balloon: " /* * Returns: 0 if balloon not supported, +1 if balloon query worked @@ -625,13 +629,22 @@ int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, unsigned int memMB; char *end; offset += strlen(BALLOON_PREFIX); - if (virStrToLong_ui(offset, &end, 10, &memMB) < 0) { - qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not parse memory balloon allocation from '%s'"), reply); - goto cleanup; + + if (STRPREFIX(offset, "actual=")) { + offset += strlen("actual="); + + if (virStrToLong_ui(offset, &end, 10, &memMB) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("could not parse memory balloon allocation from '%s'"), reply); + goto cleanup; + } + *currmem = memMB * 1024; + ret = 1; + } else { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected balloon information '%s'"), reply); + ret = -1; } - *currmem = memMB * 1024; - ret = 1; } else { /* We don't raise an error here, since its to be expected that * many QEMU's don't support ballooning @@ -660,9 +673,7 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) { offset += strlen(BALLOON_PREFIX); - if ((offset = strchr(offset, ',')) != NULL) { - ret = qemuMonitorParseExtraBalloonInfo(offset, stats, nr_stats); - } + ret = qemuMonitorParseBalloonInfo(offset, stats, nr_stats); } VIR_FREE(reply); -- 1.7.6

4 11

[libvirt] [PATCH] build: fix compilation on mingw64
by Eric Blake 19 Aug '11

19 Aug '11

* .gnulib: Update to latest, for getcwd fixes. --- Spurred by a gnulib bug report by Marc-André Lureau. Fedora currently uses the mingw32 cross-compiler, but is aiming to switch to the mingw64 cross-compiler; once that is done, failure to upgrade gnulib would trip up cross-compilation during ./autobuild.sh. * .gnulib 4470580...56d6664 (21): > getcwd: fix test failures on mingw > getcwd-lgpl: fix m4 to match relaxed test for BSD > getcwd: fix compilation on mingw64 > pipe2: silence compiler warning > autoupdate > relocatable-prog: fix link error > getaddrinfo: fix sh typo in gai_strerrorA decl checking > base64: Reference latest RFC. > * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch. > po/Makefile.in.in: fix make -q problem > configmake: fix make -q problem > git-version-gen: correct the advice in a comment > base64: fix off-by-one buffer size bug > closein: correct comments > More tests for 'fseeko'. > ChangeLog: fix wrong attribution in last commit > fseeko: remove unneeded hack > fseeko: fix bug on glibc > unictype/base: Fix interoperability with preinstalled libunistring. > iswblank: Detect declaration correctly. > tcgetsid: Detect declaration correctly. .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 4470580..56d6664 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4470580881a7b821b52fb5635102ef3e27aa5af4 +Subproject commit 56d6664559f449af25f0d331457b014b02324d65 -- 1.7.4.4

2 2

[libvirt] [RFC] Add a new feild to qemud_save_header to tell if the saved image is corrupt
by Osier Yang 19 Aug '11

19 Aug '11

If one tries to restore a domain from a corrupt save image, we blindly goes forward to restore from it, this can cause many different errors, depending on how much the image is saved. E.g. https://bugzilla.redhat.com/show_bug.cgi?id=730750 So I'm thinking if we can introduce a new feild to struct qemud_save_header, such as "bool complete;", and set it true if succeeded to save the image, false if not. So that could do some checking while trying to open the image (qemuDomainSaveImageOpen), and quit early if "complete" is false, with a sensiable error message. Thought? Thanks Osier

3 9

[libvirt] [PATCH] storage: Flush host cache after write
by Michal Privoznik 19 Aug '11

19 Aug '11

Although we are flushing cache after some critical writes (e.g. volume creation), after some others we do not (e.g. volume cloning). This patch fix this issue. That is for volume cloning, writing header of logical volume, and storage wipe. --- src/storage/storage_backend.c | 8 ++++++++ src/storage/storage_backend_logical.c | 7 +++++++ src/storage/storage_driver.c | 8 ++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 6243d1e..889f530 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -208,6 +208,14 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } while ((amtleft -= interval) > 0); } + if (fdatasync(fd) < 0) { + ret = -errno; + virReportSystemError(errno, _("cannot sync data to file '%s'"), + vol->target.path); + goto cleanup; + } + + if (VIR_CLOSE(inputfd) < 0) { ret = -errno; virReportSystemError(errno, diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index c622d2a..ca4166d 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -424,6 +424,13 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_FORCE_CLOSE(fd); goto cleanup; } + if (fsync(fd) < 0) { + virReportSystemError(errno, + _("cannot flush header of device'%s'"), + pool->def->source.devices[i].path); + VIR_FORCE_CLOSE(fd); + goto cleanup; + } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot close device '%s'"), diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 6715790..68cac1f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1777,6 +1777,14 @@ storageWipeExtent(virStorageVolDefPtr vol, remaining -= written; } + if (fdatasync(fd) < 0) { + ret = -errno; + virReportSystemError(errno, + _("cannot sync data to volume with path '%s'"), + vol->target.path); + goto out; + } + VIR_DEBUG("Wrote %zu bytes to volume with path '%s'", *bytes_wiped, vol->target.path); -- 1.7.3.4

3 4

[libvirt] [PATCH v2] daemon: initialize GnuTLS
by Michal Privoznik 19 Aug '11

19 Aug '11

When spice_tls is set but listen_tls is not, we don't initialize GnuTLS library. So any later gnutls call (e.g. during migration, where we initialize a certificate) will access uninitialized GnuTLS internal structs and throws an error. Although, we might now initialize GnuTLS twice, it is safe according to the documentation: This function can be called many times, but will only do something the first time. This patch creates 2 functions: virNetTLSInit and virNetTLSDeinit with respect to written above. --- diff to v1: - moved from qemu to daemon - created special init function daemon/libvirtd.c | 2 ++ src/rpc/virnettlscontext.c | 25 ++++++++++++++++++++++--- src/rpc/virnettlscontext.h | 3 +++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b99c637..0530ba5 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1516,6 +1516,7 @@ int main(int argc, char **argv) { virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_START, 0, "start", NULL); + virNetTLSInit(); if (daemonSetupNetworking(srv, config, sock_file, sock_file_ro, ipsock, privileged) < 0) { @@ -1554,6 +1555,7 @@ cleanup: virNetServerProgramFree(qemuProgram); virNetServerClose(srv); virNetServerFree(srv); + virNetTLSDeinit(); if (statuswrite != -1) { if (ret != 0) { /* Tell parent of daemon what failed */ diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 19a9b25..8482eaf 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -679,9 +679,6 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert, ctxt->refs = 1; - /* Initialise GnuTLS. */ - gnutls_global_init(); - if ((gnutlsdebug = getenv("LIBVIRT_GNUTLS_DEBUG")) != NULL) { int val; if (virStrToLong_i(gnutlsdebug, NULL, 10, &val) < 0) @@ -1399,3 +1396,25 @@ void virNetTLSSessionFree(virNetTLSSessionPtr sess) virMutexDestroy(&sess->lock); VIR_FREE(sess); } + +/* + * This function MUST be called before any + * virNetTLS* because it initializes + * underlying GnuTLS library. According to + * it's documentation, it's safe to be called + * many times, but is not thread safe. Each + * call SHOULD be later followed by + * virNetTLSContextDeinit. + */ +void virNetTLSInit(void) +{ + gnutls_global_init(); +} + +/* + * See virNetTLSInit + */ +void virNetTLSDeinit(void) +{ + gnutls_global_deinit(); +} diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index 641d67e..99f31b9 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -30,6 +30,9 @@ typedef struct _virNetTLSSession virNetTLSSession; typedef virNetTLSSession *virNetTLSSessionPtr; +void virNetTLSInit(void); +void virNetTLSDeinit(void); + virNetTLSContextPtr virNetTLSContextNewServerPath(const char *pkipath, bool tryUserPkiPath, const char *const*x509dnWhitelist, -- 1.7.3.4

2 2