- Devel - libvirt List Archives

[libvirt] [PATCH] Avoid using "devname" as an identifier.
by Peter Krempa 16 Sep '11

16 Sep '11

/usr/lib/stdlib.h in Mac OS X and probably also in BSD's exports this symbol :( --- src/conf/domain_audit.c | 8 +++--- src/driver.h | 2 +- src/libvirt.c | 12 +++++----- src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 6 ++-- src/network/bridge_driver.c | 14 ++++++------ src/qemu/qemu_command.c | 28 +++++++++++++------------- src/qemu/qemu_driver.c | 14 ++++++------ src/qemu/qemu_monitor.c | 36 +++++++++++++++++----------------- src/qemu/qemu_monitor.h | 8 +++--- src/qemu/qemu_monitor_json.c | 26 ++++++++++++------------ src/qemu/qemu_monitor_json.h | 8 +++--- src/qemu/qemu_monitor_text.c | 30 ++++++++++++++-------------- src/qemu/qemu_monitor_text.h | 8 +++--- src/storage/storage_backend_disk.c | 14 ++++++------ src/storage/storage_backend_mpath.c | 8 +++--- src/uml/uml_driver.c | 8 +++--- src/util/util.c | 6 ++-- src/util/util.h | 2 +- src/xen/xen_driver.c | 6 ++-- tools/console.c | 4 +- tools/console.h | 2 +- 22 files changed, 127 insertions(+), 127 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 581be70..16937dc 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -202,7 +202,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, char uuidstr[VIR_UUID_STRING_BUFLEN]; char macstr[VIR_MAC_STRING_BUFLEN]; char *vmname; - char *devname; + char *dev_name; char *rdev; const char *virt; @@ -211,7 +211,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, rdev = virDomainAuditGetRdev(device); if (!(vmname = virAuditEncode("vm", vmDef->name)) || - !(devname = virAuditEncode("path", device))) { + !(dev_name = virAuditEncode("path", device))) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } @@ -223,11 +223,11 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, "virt=%s resrc=net reason=open %s uuid=%s net='%s' %s rdev=%s", - virt, vmname, uuidstr, macstr, devname, VIR_AUDIT_STR(rdev)); + virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)); cleanup: VIR_FREE(vmname); - VIR_FREE(devname); + VIR_FREE(dev_name); VIR_FREE(rdev); } diff --git a/src/driver.h b/src/driver.h index fc7a931..3792003 100644 --- a/src/driver.h +++ b/src/driver.h @@ -612,7 +612,7 @@ typedef virDomainPtr typedef int (*virDrvDomainOpenConsole)(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags); diff --git a/src/libvirt.c b/src/libvirt.c index c32c7a6..66c2327 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16312,13 +16312,13 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) /** * virDomainOpenConsole: * @dom: a domain object - * @devname: the console, serial or parallel port device alias, or NULL + * @dev_name: the console, serial or parallel port device alias, or NULL * @st: a stream to associate with the console * @flags: unused, pass 0 * * This opens the backend associated with a console, serial or * parallel port device on a guest, if the backend is supported. - * If the @devname is omitted, then the first console or serial + * If the @dev_name is omitted, then the first console or serial * device is opened. The console is associated with the passed * in @st stream, which should have been opened in non-blocking * mode for bi-directional I/O. @@ -16326,14 +16326,14 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) * returns 0 if the console was opened, -1 on error */ int virDomainOpenConsole(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "devname=%s, st=%p, flags=%x", - NULLSTR(devname), st, flags); + VIR_DOMAIN_DEBUG(dom, "dev_name=%s, st=%p, flags=%x", + NULLSTR(dev_name), st, flags); virResetLastError(); @@ -16351,7 +16351,7 @@ int virDomainOpenConsole(virDomainPtr dom, if (conn->driver->domainOpenConsole) { int ret; - ret = conn->driver->domainOpenConsole(dom, devname, st, flags); + ret = conn->driver->domainOpenConsole(dom, dev_name, st, flags); if (ret < 0) goto error; return ret; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 5028251..52d382e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -67,7 +67,7 @@ struct cgroup_device_policy { }; -static int lxcGetLoopFD(char **devname) +static int lxcGetLoopFD(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -122,7 +122,7 @@ static int lxcGetLoopFD(char **devname) cleanup: if (fd != -1) { VIR_DEBUG("Got free loop device %s %d", looppath, fd); - *devname = looppath; + *dev_name = looppath; } else { VIR_DEBUG("No free loop devices available"); VIR_FREE(looppath); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 6b716c1..6cf7203 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2837,7 +2837,7 @@ cleanup: static int lxcDomainOpenConsole(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags) { @@ -2864,7 +2864,7 @@ lxcDomainOpenConsole(virDomainPtr dom, goto cleanup; } - if (devname) { + if (dev_name) { /* XXX support device aliases in future */ lxcError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Named device aliases are not supported")); @@ -2884,7 +2884,7 @@ lxcDomainOpenConsole(virDomainPtr dom, if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { lxcError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), devname); + _("character device %s is not using a PTY"), dev_name); goto cleanup; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index cea8771..9960745 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3142,7 +3142,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) virNetworkIpDefPtr ipdef; virSocketAddr addr; virSocketAddrPtr addrptr = NULL; - char *devname = NULL; + char *dev_name = NULL; *netaddr = NULL; networkDriverLock(driver); @@ -3172,7 +3172,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr) break; case VIR_NETWORK_FORWARD_BRIDGE: - if ((devname = netdef->bridge)) + if ((dev_name = netdef->bridge)) break; /* * fall through if netdef->bridge wasn't set, since this is @@ -3182,9 +3182,9 @@ networkGetNetworkAddress(const char *netname, char **netaddr) case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_PASSTHROUGH: if ((netdef->nForwardIfs > 0) && netdef->forwardIfs) - devname = netdef->forwardIfs[0].dev; + dev_name = netdef->forwardIfs[0].dev; - if (!devname) { + if (!dev_name) { networkReportError(VIR_ERR_INTERNAL_ERROR, _("network '%s' has no associated interface or bridge"), netdef->name); @@ -3192,11 +3192,11 @@ networkGetNetworkAddress(const char *netname, char **netaddr) break; } - if (devname) { - if (ifaceGetIPAddress(devname, &addr)) { + if (dev_name) { + if (ifaceGetIPAddress(dev_name, &addr)) { virReportSystemError(errno, _("Failed to get IP address for '%s' (network '%s')"), - devname, netdef->name); + dev_name, netdef->name); } else { addrptr = &addr; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 153647a..5f0de40 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -422,20 +422,20 @@ int qemuDomainNetVLAN(virDomainNetDefPtr def) /* Names used before -drive existed */ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk) { - char *devname; + char *dev_name; if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && STREQ(disk->dst, "hdc")) - devname = strdup("cdrom"); + dev_name = strdup("cdrom"); else - devname = strdup(disk->dst); + dev_name = strdup(disk->dst); - if (!devname) { + if (!dev_name) { virReportOOMError(); return -1; } - disk->info.alias = devname; + disk->info.alias = dev_name; return 0; } @@ -465,7 +465,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) { int busid, devid; int ret; - char *devname; + char *dev_name; if (virDiskNameToBusDeviceIndex(disk, &busid, &devid) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -477,24 +477,24 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: if (disk->device== VIR_DOMAIN_DISK_DEVICE_DISK) - ret = virAsprintf(&devname, "ide%d-hd%d", busid, devid); + ret = virAsprintf(&dev_name, "ide%d-hd%d", busid, devid); else - ret = virAsprintf(&devname, "ide%d-cd%d", busid, devid); + ret = virAsprintf(&dev_name, "ide%d-cd%d", busid, devid); break; case VIR_DOMAIN_DISK_BUS_SCSI: if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) - ret = virAsprintf(&devname, "scsi%d-hd%d", busid, devid); + ret = virAsprintf(&dev_name, "scsi%d-hd%d", busid, devid); else - ret = virAsprintf(&devname, "scsi%d-cd%d", busid, devid); + ret = virAsprintf(&dev_name, "scsi%d-cd%d", busid, devid); break; case VIR_DOMAIN_DISK_BUS_FDC: - ret = virAsprintf(&devname, "floppy%d", devid); + ret = virAsprintf(&dev_name, "floppy%d", devid); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - ret = virAsprintf(&devname, "virtio%d", devid); + ret = virAsprintf(&dev_name, "virtio%d", devid); break; case VIR_DOMAIN_DISK_BUS_XEN: - ret = virAsprintf(&devname, "xenblk%d", devid); + ret = virAsprintf(&dev_name, "xenblk%d", devid); break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -508,7 +508,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) return -1; } - disk->info.alias = devname; + disk->info.alias = dev_name; return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d2626ff..c73b2ec 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10334,7 +10334,7 @@ cleanup: static int qemuDomainOpenConsole(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags) { @@ -10362,16 +10362,16 @@ qemuDomainOpenConsole(virDomainPtr dom, goto cleanup; } - if (devname) { + if (dev_name) { if (vm->def->console && - STREQ(devname, vm->def->console->info.alias)) + STREQ(dev_name, vm->def->console->info.alias)) chr = vm->def->console; for (i = 0 ; !chr && i < vm->def->nserials ; i++) { - if (STREQ(devname, vm->def->serials[i]->info.alias)) + if (STREQ(dev_name, vm->def->serials[i]->info.alias)) chr = vm->def->serials[i]; } for (i = 0 ; !chr && i < vm->def->nparallels ; i++) { - if (STREQ(devname, vm->def->parallels[i]->info.alias)) + if (STREQ(dev_name, vm->def->parallels[i]->info.alias)) chr = vm->def->parallels[i]; } } else { @@ -10384,14 +10384,14 @@ qemuDomainOpenConsole(virDomainPtr dom, if (!chr) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character device %s"), - NULLSTR(devname)); + NULLSTR(dev_name)); goto cleanup; } if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("character device %s is not using a PTY"), - NULLSTR(devname)); + NULLSTR(dev_name)); goto cleanup; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fca8fa4..b4c43ae 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1217,7 +1217,7 @@ int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -1229,7 +1229,7 @@ int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, long long *errs) { int ret; - VIR_DEBUG("mon=%p dev=%s", mon, devname); + VIR_DEBUG("mon=%p dev=%s", mon, dev_name); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1238,7 +1238,7 @@ int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, } if (mon->json) - ret = qemuMonitorJSONGetBlockStatsInfo(mon, devname, + ret = qemuMonitorJSONGetBlockStatsInfo(mon, dev_name, rd_req, rd_bytes, rd_total_times, wr_req, wr_bytes, @@ -1247,7 +1247,7 @@ int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, flush_total_times, errs); else - ret = qemuMonitorTextGetBlockStatsInfo(mon, devname, + ret = qemuMonitorTextGetBlockStatsInfo(mon, dev_name, rd_req, rd_bytes, rd_total_times, wr_req, wr_bytes, @@ -1282,17 +1282,17 @@ int qemuMonitorGetBlockStatsParamsNumber(qemuMonitorPtr mon, } int qemuMonitorGetBlockExtent(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, unsigned long long *extent) { int ret; - VIR_DEBUG("mon=%p, fd=%d, devname=%p", - mon, mon->fd, devname); + VIR_DEBUG("mon=%p, fd=%d, dev_name=%p", + mon, mon->fd, dev_name); if (mon->json) - ret = qemuMonitorJSONGetBlockExtent(mon, devname, extent); + ret = qemuMonitorJSONGetBlockExtent(mon, dev_name, extent); else - ret = qemuMonitorTextGetBlockExtent(mon, devname, extent); + ret = qemuMonitorTextGetBlockExtent(mon, dev_name, extent); return ret; } @@ -1439,11 +1439,11 @@ int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, int online) int qemuMonitorEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force) { int ret; - VIR_DEBUG("mon=%p devname=%s force=%d", mon, devname, force); + VIR_DEBUG("mon=%p dev_name=%s force=%d", mon, dev_name, force); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1452,21 +1452,21 @@ int qemuMonitorEjectMedia(qemuMonitorPtr mon, } if (mon->json) - ret = qemuMonitorJSONEjectMedia(mon, devname, force); + ret = qemuMonitorJSONEjectMedia(mon, dev_name, force); else - ret = qemuMonitorTextEjectMedia(mon, devname, force); + ret = qemuMonitorTextEjectMedia(mon, dev_name, force); return ret; } int qemuMonitorChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format) { int ret; - VIR_DEBUG("mon=%p devname=%s newmedia=%s format=%s", - mon, devname, newmedia, format); + VIR_DEBUG("mon=%p dev_name=%s newmedia=%s format=%s", + mon, dev_name, newmedia, format); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1475,9 +1475,9 @@ int qemuMonitorChangeMedia(qemuMonitorPtr mon, } if (mon->json) - ret = qemuMonitorJSONChangeMedia(mon, devname, newmedia, format); + ret = qemuMonitorJSONChangeMedia(mon, dev_name, newmedia, format); else - ret = qemuMonitorTextChangeMedia(mon, devname, newmedia, format); + ret = qemuMonitorTextChangeMedia(mon, dev_name, newmedia, format); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 390eeff..477767f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -213,7 +213,7 @@ int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -227,7 +227,7 @@ int qemuMonitorGetBlockStatsParamsNumber(qemuMonitorPtr mon, int *nparams); int qemuMonitorGetBlockExtent(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, unsigned long long *extent); @@ -250,10 +250,10 @@ int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, int online); * this when doing the QMP implementation */ int qemuMonitorEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force); int qemuMonitorChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3a81ec8..e38c2ed 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1338,7 +1338,7 @@ cleanup: int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -1405,12 +1405,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, /* New QEMU has separate names for host & guest side of the disk * and libvirt gives the host side a 'drive-' prefix. The passed - * in devname is the guest side though + * in dev_name is the guest side though */ if (STRPREFIX(thisdev, QEMU_DRIVE_HOST_PREFIX)) thisdev += strlen(QEMU_DRIVE_HOST_PREFIX); - if (STRNEQ(thisdev, devname)) + if (STRNEQ(thisdev, dev_name)) continue; found = 1; @@ -1485,7 +1485,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, if (!found) { qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find statistics for device '%s'"), devname); + _("cannot find statistics for device '%s'"), dev_name); goto cleanup; } ret = 0; @@ -1570,7 +1570,7 @@ cleanup: } int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, unsigned long long *extent) { int ret = -1; @@ -1620,12 +1620,12 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, /* New QEMU has separate names for host & guest side of the disk * and libvirt gives the host side a 'drive-' prefix. The passed - * in devname is the guest side though + * in dev_name is the guest side though */ if (STRPREFIX(thisdev, QEMU_DRIVE_HOST_PREFIX)) thisdev += strlen(QEMU_DRIVE_HOST_PREFIX); - if (STRNEQ(thisdev, devname)) + if (STRNEQ(thisdev, dev_name)) continue; found = 1; @@ -1653,7 +1653,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, if (!found) { qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find statistics for device '%s'"), devname); + _("cannot find statistics for device '%s'"), dev_name); goto cleanup; } ret = 0; @@ -1840,12 +1840,12 @@ cleanup: int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force) { int ret; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("eject", - "s:device", devname, + "s:device", dev_name, "b:force", force ? 1 : 0, NULL); virJSONValuePtr reply = NULL; @@ -1864,7 +1864,7 @@ int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format) { @@ -1872,13 +1872,13 @@ int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon, virJSONValuePtr cmd; if (format) cmd = qemuMonitorJSONMakeCommand("change", - "s:device", devname, + "s:device", dev_name, "s:target", newmedia, "s:arg", format, NULL); else cmd = qemuMonitorJSONMakeCommand("change", - "s:device", devname, + "s:device", dev_name, "s:target", newmedia, NULL); diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index dfeba7e..673444f 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -61,7 +61,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -74,7 +74,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, int *nparams); int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, unsigned long long *extent); @@ -92,10 +92,10 @@ int qemuMonitorJSONSetBalloon(qemuMonitorPtr mon, int qemuMonitorJSONSetCPU(qemuMonitorPtr mon, int cpu, int online); int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force); int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0b50ba2..cedf582 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -751,7 +751,7 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -766,7 +766,7 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, int ret = -1; char *dummy; const char *p, *eol; - int devnamelen = strlen(devname); + int devnamelen = strlen(dev_name); if (qemuMonitorHMPCommand (mon, "info blockstats", &info) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, @@ -808,12 +808,12 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, while (*p) { /* New QEMU has separate names for host & guest side of the disk * and libvirt gives the host side a 'drive-' prefix. The passed - * in devname is the guest side though + * in dev_name is the guest side though */ if (STRPREFIX(p, QEMU_DRIVE_HOST_PREFIX)) p += strlen(QEMU_DRIVE_HOST_PREFIX); - if (STREQLEN (p, devname, devnamelen) + if (STREQLEN (p, dev_name, devnamelen) && p[devnamelen] == ':' && p[devnamelen+1] == ' ') { eol = strchr (p, '\n'); @@ -880,7 +880,7 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, /* If we reach here then the device was not found. */ qemuReportError (VIR_ERR_INVALID_ARG, - _("no stats found for device %s"), devname); + _("no stats found for device %s"), dev_name); cleanup: VIR_FREE(info); @@ -959,7 +959,7 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, } int qemuMonitorTextGetBlockExtent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - const char *devname ATTRIBUTE_UNUSED, + const char *dev_name ATTRIBUTE_UNUSED, unsigned long long *extent ATTRIBUTE_UNUSED) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1163,21 +1163,21 @@ int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online) int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force) { char *cmd = NULL; char *reply = NULL; int ret = -1; - if (virAsprintf(&cmd, "eject %s%s", force ? "-f " : "", devname) < 0) { + if (virAsprintf(&cmd, "eject %s%s", force ? "-f " : "", dev_name) < 0) { virReportOOMError(); goto cleanup; } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not eject media on %s"), devname); + _("could not eject media on %s"), dev_name); goto cleanup; } @@ -1186,7 +1186,7 @@ int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, * No message is printed on success it seems */ if (c_strcasestr(reply, "device ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not eject media on %s: %s"), devname, reply); + _("could not eject media on %s: %s"), dev_name, reply); goto cleanup; } @@ -1200,7 +1200,7 @@ cleanup: int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format ATTRIBUTE_UNUSED) { @@ -1214,14 +1214,14 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, goto cleanup; } - if (virAsprintf(&cmd, "change %s \"%s\"", devname, safepath) < 0) { + if (virAsprintf(&cmd, "change %s \"%s\"", dev_name, safepath) < 0) { virReportOOMError(); goto cleanup; } if (qemuMonitorHMPCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not change media on %s"), devname); + _("could not change media on %s"), dev_name); goto cleanup; } @@ -1230,14 +1230,14 @@ int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, * No message is printed on success it seems */ if (c_strcasestr(reply, "device ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not change media on %s: %s"), devname, reply); + _("could not change media on %s: %s"), dev_name, reply); goto cleanup; } /* Could not open message indicates bad filename */ if (strstr(reply, "Could not open ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("could not change media on %s: %s"), devname, reply); + _("could not change media on %s: %s"), dev_name, reply); goto cleanup; } diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 7cc3172..4651a17 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -58,7 +58,7 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats); int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, long long *rd_req, long long *rd_bytes, long long *rd_total_times, @@ -71,7 +71,7 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, int *nparams); int qemuMonitorTextGetBlockExtent(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, unsigned long long *extent); int qemuMonitorTextSetVNCPassword(qemuMonitorPtr mon, @@ -88,10 +88,10 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon, int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, int online); int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, bool force); int qemuMonitorTextChangeMedia(qemuMonitorPtr mon, - const char *devname, + const char *dev_name, const char *newmedia, const char *format); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index c08a10b..80f9dd1 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -649,7 +649,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, { char *part_num = NULL; char *devpath = NULL; - char *devname, *srcname; + char *dev_name, *srcname; virCommandPtr cmd = NULL; bool isDevMapperDevice; int rc = -1; @@ -663,26 +663,26 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } - devname = basename(devpath); + dev_name = basename(devpath); srcname = basename(pool->def->source.devices[0].path); - VIR_DEBUG("devname=%s, srcname=%s", devname, srcname); + VIR_DEBUG("dev_name=%s, srcname=%s", dev_name, srcname); isDevMapperDevice = virIsDevMapperDevice(devpath); - if (!isDevMapperDevice && !STRPREFIX(devname, srcname)) { + if (!isDevMapperDevice && !STRPREFIX(dev_name, srcname)) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("Volume path '%s' did not start with parent " - "pool source device name."), devname); + "pool source device name."), dev_name); goto cleanup; } if (!isDevMapperDevice) { - part_num = devname + strlen(srcname); + part_num = dev_name + strlen(srcname); if (*part_num == 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse partition number from target " - "'%s'"), devname); + "'%s'"), dev_name); goto cleanup; } diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index f2e1419..4f3add3 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -125,7 +125,7 @@ cleanup: static int -virStorageBackendIsMultipath(const char *devname) +virStorageBackendIsMultipath(const char *dev_name) { int ret = 0; struct dm_task *dmt = NULL; @@ -140,7 +140,7 @@ virStorageBackendIsMultipath(const char *devname) goto out; } - if (dm_task_set_name(dmt, devname) == 0) { + if (dm_task_set_name(dmt, dev_name) == 0) { ret = -1; goto out; } @@ -172,7 +172,7 @@ out: static int -virStorageBackendGetMinorNumber(const char *devname, uint32_t *minor) +virStorageBackendGetMinorNumber(const char *dev_name, uint32_t *minor) { int ret = -1; struct dm_task *dmt; @@ -182,7 +182,7 @@ virStorageBackendGetMinorNumber(const char *devname, uint32_t *minor) goto out; } - if (!dm_task_set_name(dmt, devname)) { + if (!dm_task_set_name(dmt, dev_name)) { goto out; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 32f09d2..2b7219a 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2235,7 +2235,7 @@ cleanup: static int umlDomainOpenConsole(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags) { @@ -2262,7 +2262,7 @@ umlDomainOpenConsole(virDomainPtr dom, goto cleanup; } - if (devname) { + if (dev_name) { /* XXX support device aliases in future */ umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Named device aliases are not supported")); @@ -2276,13 +2276,13 @@ umlDomainOpenConsole(virDomainPtr dom, if (!chr) { umlReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find character device %s"), devname); + _("cannot find character device %s"), dev_name); goto cleanup; } if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { umlReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), devname); + _("character device %s is not using a PTY"), dev_name); goto cleanup; } diff --git a/src/util/util.c b/src/util/util.c index 9556bdb..1ff287d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2455,11 +2455,11 @@ virTimeMs(unsigned long long *ms) #if HAVE_LIBDEVMAPPER_H bool -virIsDevMapperDevice(const char *devname) +virIsDevMapperDevice(const char *dev_name) { struct stat buf; - if (!stat(devname, &buf) && + if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && dm_is_dm_major(major(buf.st_rdev))) return true; @@ -2467,7 +2467,7 @@ virIsDevMapperDevice(const char *devname) return false; } #else -bool virIsDevMapperDevice(const char *devname ATTRIBUTE_UNUSED) +bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED) { return false; } diff --git a/src/util/util.h b/src/util/util.h index 908ba7b..c55e852 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -255,7 +255,7 @@ char *virTimestamp(void); int virTimeMs(unsigned long long *ms) ATTRIBUTE_NONNULL(1); -bool virIsDevMapperDevice(const char *devname) ATTRIBUTE_NONNULL(1); +bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); int virEmitXMLWarning(int fd, const char *name, diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 2c66143..9c96fca 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2119,7 +2119,7 @@ out: static int xenUnifiedDomainOpenConsole(virDomainPtr dom, - const char *devname, + const char *dev_name, virStreamPtr st, unsigned int flags) { @@ -2135,7 +2135,7 @@ xenUnifiedDomainOpenConsole(virDomainPtr dom, goto cleanup; } - if (devname) { + if (dev_name) { /* XXX support device aliases in future */ xenUnifiedError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Named device aliases are not supported")); @@ -2159,7 +2159,7 @@ xenUnifiedDomainOpenConsole(virDomainPtr dom, if (chr->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { xenUnifiedError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), devname); + _("character device %s is not using a PTY"), dev_name); goto cleanup; } diff --git a/tools/console.c b/tools/console.c index 82ef537..0f85bc7 100644 --- a/tools/console.c +++ b/tools/console.c @@ -278,7 +278,7 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, } -int vshRunConsole(virDomainPtr dom, const char *devname) +int vshRunConsole(virDomainPtr dom, const char *dev_name) { int ret = -1; struct termios ttyattr, rawattr; @@ -331,7 +331,7 @@ int vshRunConsole(virDomainPtr dom, const char *devname) if (!con->st) goto cleanup; - if (virDomainOpenConsole(dom, devname, con->st, 0) < 0) + if (virDomainOpenConsole(dom, dev_name, con->st, 0) < 0) goto cleanup; con->stdinWatch = virEventAddHandle(STDIN_FILENO, diff --git a/tools/console.h b/tools/console.h index 580268d..9b05ff1 100644 --- a/tools/console.h +++ b/tools/console.h @@ -25,7 +25,7 @@ # ifndef WIN32 -int vshRunConsole(virDomainPtr dom, const char *devname); +int vshRunConsole(virDomainPtr dom, const char *dev_name); # endif /* !WIN32 */ -- 1.7.3.4

2 1

[libvirt] [PATCH v2] doc: Add statment about permissions needed to do a core dump
by Peter Krempa 16 Sep '11

16 Sep '11

Documentation did not specify, that some permissions are required on target path for coredump for the user running the hypervisor. Diff to v1: - reword statements --- src/libvirt.c | 3 ++- tools/virsh.pod | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index c32c7a6..4fb200d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2777,7 +2777,8 @@ error: * * This method will dump the core of a domain on a given file for analysis. * Note that for remote Xen Daemon the file path will be interpreted in - * the remote host. + * the remote host. Hypervisors may require the user to manually ensure + * proper permissions on the file named by @to. * * If @flags includes VIR_DUMP_CRASH, then leave the guest shut off with * a crashed state after the dump completes. If @flags includes diff --git a/tools/virsh.pod b/tools/virsh.pod index 5114580..02726f3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -621,6 +621,9 @@ rather than merely left in a paused state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +NOTE: Some hypervisors may require the user to manually ensure proper +permissions on file and path specified by argument I<corefilepath>. + =item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] -- 1.7.3.4

2 1

[libvirt] libvirt(-java): How to make vm.getDomain().getJobInfo() thread safe?
by Thomas Treutner 16 Sep '11

16 Sep '11

Hi, this is kind of a follow-up to an older question/discussion: https://www.redhat.com/archives/libvir-list/2010-July/msg00267.html As a result of that, I use a second thread for monitoring the live migration, taking actions (setting maxdowntime to a value that fits the situation) if necessary. Although I call getJobInfo() with a quite low frequency (once a second), problems are occuring frequently, like every 10th or 15th live migration. Problems range from exceptions that the domain is not running anymore to complete JVM crashes -> http://pastebin.com/jT6sXubu Recovery from exceptions doesn't seem to work perfectly, as they seem to trigger that connections to a host can't be shut down properly because there are still open references. Of course, in my monitoring thread I'm checking in every monitoring iteration if the domain object is not null, is still active, if the jobInfo is available yet etc. But, as I can not synchronize with vm.migrate(), there still a reasonable chance that migrate() just invalidates the current domain while I'm accessing it, no matter what I do. Do I miss something or is that correct? Any ideas how to reliably solve it? Is there some experience from virt-manager, where (in my quite old version) I assume at least the domain is read for cpu etc. stats while live migrating... regards, thomas

2 4

[libvirt] [PATCH 0/8] Add virDomainMigrateGetMaxSpeed API
by Jim Fehlig 16 Sep '11

16 Sep '11

As per previous request [1], this patch series introduces virDomainMigrateGetMaxSpeed API. Patches 1-5 contain usual new API stuff. In patch 6, qemuDomainMigrateSetMaxSpeed is made to work with inactive domains and set the new value in domain conf. Patch 7 changes migration speed to unlimited when target is a file *and* no user defined migration speed is set, and reverts to previous value after migration completes. Patch 8 considers user-defined migration speed in qemuMigrationRun() when explicit bandwidth is not provided in 'resource' paramter. Note that a patch to fix the remote protocol generator [2] is required for this patch series. [1] https://www.redhat.com/archives/libvir-list/2011-August/msg00224.html [2] https://www.redhat.com/archives/libvir-list/2011-August/msg01367.html Jim Fehlig (8): Add on_migrate element to domainXML Add public API for getting migration speed Add max migration bandwidth to domain_conf Impl virDomainMigrateGetMaxSpeed in qemu driver virsh: Expose virDomainMigrateGetMaxSpeed API Save migration speed to domain conf in qemuDomainMigrateSetMaxSpeed Set qemu migration speed unlimited when migrating to file Use max speed specified in domain conf when migrating docs/apibuild.py | 3 +- docs/formatdomain.html.in | 21 +++++++ docs/schemas/domain.rng | 13 +++++ include/libvirt/libvirt.h.in | 4 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 ++ python/libvirt-override.c | 24 ++++++++ src/conf/domain_conf.c | 11 ++++ src/conf/domain_conf.h | 2 + src/driver.h | 6 ++ src/libvirt.c | 51 ++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 76 ++++++++++++++++++++------- src/qemu/qemu_migration.c | 28 +++++++++- src/qemu/qemu_migration.h | 3 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++- src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 1 + tests/domainschemadata/migration-params.xml | 34 ++++++++++++ tools/virsh.c | 41 ++++++++++++++ tools/virsh.pod | 4 ++ 22 files changed, 333 insertions(+), 24 deletions(-) create mode 100644 tests/domainschemadata/migration-params.xml -- 1.7.5.4

4 26

[libvirt] domain shutdown requests
by Christian Benvenuti (benve) 16 Sep '11

16 Sep '11

When you shutdown a domain that is in PAUSED state, the shutdown will not take effect until you issue a resume cmd: # virsh suspend <domain_name> <domain_name> is now PAUSED # virsh shutdown <domain_name> <domain_name> does not shutdown, with the reason being that, for example in the case of a Linux Guest, the guest is not running and therefore there is no acpid running and able to process the shutdown request. Right? If now we issue a resume #virsh resume <domain_name> the guest initiates the (pending) shutdown (ie, acpid processes the pending request). Is this the expected behavior? Shouldn't virsh do something like this when it issues a shutdown request? if (domain.state == PAUSED) resume(domain) shutdown(domain) If yes, then I guess this logic should go - into the cmdShutdown routine if we want to make it available to virsh only, or - inside the driver's domainShutdown fn if we want to make it available to any libvirt user. One more minor comment. As of now, "virsh list" (or 'virsh domstate <domain>') does not provide any way of knowing if - a domain is being shutdown or - a domain has a pending shutdown request (like in the example above). Would it make any sense to enhance the output of list/domstate , for example to show something like this when libvirt issues a shutdown to a running domain Id Name State ---------------------------------- 3 FC15-2 running (shutdown in progress) Or something like this when it issues a shutdown to a PAUSED domain? Id Name State ---------------------------------- 3 FC15-2 PAUSED (shutdown request pending) Thanks /Chris

3 5

[libvirt] [test-API][PATCH] Fix typos for existing problems
by Wayne Sun 16 Sep '11

16 Sep '11

--- cases/basic_nodedevice.conf | 2 +- lib/nodedevAPI.py | 2 +- lib/storageAPI.py | 2 +- repos/nodedevice/detach.py | 22 +++++++++++----------- repos/storage/define_scsi_pool.py | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cases/basic_nodedevice.conf b/cases/basic_nodedevice.conf index cea431e..85a68f7 100644 --- a/cases/basic_nodedevice.conf +++ b/cases/basic_nodedevice.conf @@ -1,4 +1,4 @@ -nodedevice:dettach +nodedevice:detach pciaddress $testpci diff --git a/lib/nodedevAPI.py b/lib/nodedevAPI.py index 8d588c4..cc96909 100644 --- a/lib/nodedevAPI.py +++ b/lib/nodedevAPI.py @@ -185,7 +185,7 @@ class NodedevAPI: code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def connect(self, name) + def connect(self, name): try: obj = self.lookup_by_name(name) return obj.connect() diff --git a/lib/storageAPI.py b/lib/storageAPI.py index 2d75a0b..6c9d286 100644 --- a/lib/storageAPI.py +++ b/lib/storageAPI.py @@ -231,7 +231,7 @@ class StorageAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def delete_pool(self, poolname, flags = 1): + def delete_pool(self, poolname, flags = 0): try: pool_obj = self.get_pool_obj(poolname) return pool_obj.delete(flags) diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py index ac9aa89..18e792e 100644 --- a/repos/nodedevice/detach.py +++ b/repos/nodedevice/detach.py @@ -1,13 +1,13 @@ #!/usr/bin/env python """this test case is used for testing - dettach a specific node device + detach a specific node device """ __author__ = 'Alex Jia: ajia(a)redhat.com' __date__ = 'Tue Apr 6, 2010' __version__ = '0.1.0' __credits__ = 'Copyright (C) 2009 Red Hat, Inc.' -__all__ = ['usage', 'check_node_dettach', 'dettach'] +__all__ = ['usage', 'check_node_detach', 'detach'] import os @@ -45,8 +45,8 @@ def usage(params): else: pass -def check_node_dettach(pciaddress): - """Check node device dettach result, if dettachment is successful, the +def check_node_detach(pciaddress): + """Check node device detach result, if detachment is successful, the device host driver should be hided and the device should be bound to pci-stub driver, argument 'address' is a address of the node device """ @@ -64,7 +64,7 @@ def check_node_dettach(pciaddress): driver = os.path.basename(retval) return driver -def dettach(dicts): +def detach(dicts): """Dettach a specific node device and bind it to pci-stub driver, argument 'dicts' is a dictionary type and includes 'pciaddress' key, whose value uniquely identify a pci address of the node device @@ -78,7 +78,7 @@ def dettach(dicts): pciaddress = dicts['pciaddress'] - original_driver = check_node_dettach(pciaddress) + original_driver = check_node_detach(pciaddress) logger.info("original device driver: %s" % original_driver) util = utils.Utils() @@ -120,22 +120,22 @@ def dettach(dicts): try: try: - logger.info("dettach the node device") + logger.info("detach the node device") nodeobj.dettach(device_name) - current_driver = check_node_dettach(pciaddress) + current_driver = check_node_detach(pciaddress) logger.info("current device driver: %s" % current_driver) if current_driver != original_driver and current_driver == pciback: - logger.info("the node %s device dettach is successful" \ + logger.info("the node %s device detach is successful" \ % device_name) test_result = True else: - logger.info("the node %s device dettach is failed" % device_name) + logger.info("the node %s device detach is failed" % device_name) test_result = False return 1 except LibvirtAPI, e: logger.error("API error message: %s, error code is %s" \ % (e.response()['message'], e.response()['code'])) - logger.error("Error: fail to dettach %s node device" % device_name) + logger.error("Error: fail to detach %s node device" % device_name) test_result = False return 1 finally: diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py index a5193e2..6afbe01 100644 --- a/repos/storage/define_scsi_pool.py +++ b/repos/storage/define_scsi_pool.py @@ -140,7 +140,7 @@ def define_scsi_pool(params): logger.error("API error message: %s, error code is %s" \ % (e.response()['message'], e.response()['code'])) return 1 - finally + finally: conn.close() logger.info("closed hypervisor connection") -- 1.7.1

2 1

[libvirt] [test-API][PATCH v4] Add test module ownership_test
by Wayne Sun 16 Sep '11

16 Sep '11

* repos/domain/ownership_test.py Setting the dynamic_ownership value in /etc/libvirt/qemu.conf, check the ownership of file after domain save and restore. Test could be on local or root_squash nfs. The default owner of the saved domain file is qemu:qemu in this case. --- repos/domain/ownership_test.py | 316 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 316 insertions(+), 0 deletions(-) create mode 100644 repos/domain/ownership_test.py diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py new file mode 100644 index 0000000..74620f4 --- /dev/null +++ b/repos/domain/ownership_test.py @@ -0,0 +1,316 @@ +#!/usr/bin/env python +"""Setting the dynamic_ownership in /etc/libvirt/qemu.conf, + check the ownership of saved domain file. Test could be on + local or root_squash nfs. The default owner of the saved + domain file is qemu:qemu in this case. + domain:ownership_test + guestname + #GUESTNAME# + dynamic_ownership + enable|disable + use_nfs + enable|disable +""" + +__author__ = 'Wayne Sun: gsun(a)redhat.com' +__date__ = 'Mon Jul 25, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['ownership_test'] + +import os +import re +import sys + +QEMU_CONF = "/etc/libvirt/qemu.conf" +SAVE_FILE = "/mnt/test.save" +TEMP_FILE = "/tmp/test.save" + +def append_path(path): + """Append root path of package""" + if path not in sys.path: + sys.path.append(path) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from exception import LibvirtAPI + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +def return_close(conn, logger, ret): + """close hypervisor connection and return the given value""" + conn.close() + logger.info("closed hypervisor connection") + return ret + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'dynamic_ownership', 'use_nfs'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + return 0 + +def check_domain_running(domobj, guestname, logger): + """ check if the domain exists, may or may not be active """ + guest_names = domobj.get_list() + + if guestname not in guest_names: + logger.error("%s doesn't exist or not running" % guestname) + return 1 + else: + return 0 + +def nfs_setup(util, logger): + """setup nfs on localhost + """ + logger.info("set nfs service") + cmd = "echo /tmp *$rw,root_squash$ >> /etc/exports" + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to config nfs export") + return 1 + + logger.info("restart nfs service") + cmd = "service nfs restart" + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to restart nfs service") + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + return 0 + +def chown_file(util, filepath, logger): + """touch a file and setting the chown + """ + if os.path.exists(filepath): + os.remove(filepath) + + touch_cmd = "touch %s" % filepath + logger.info(touch_cmd) + ret, out = util.exec_cmd(touch_cmd, shell=True) + if ret: + logger.error("failed to touch a new file") + logger.error(out[0]) + return 1 + + logger.info("set chown of %s as 107:107" % filepath) + chown_cmd = "chown 107:107 %s" % filepath + ret, out = util.exec_cmd(chown_cmd, shell=True) + if ret: + logger.error("failed to set the ownership of %s" % filepath) + return 1 + + logger.info("set %s mode as 664" % filepath) + cmd = "chmod 664 %s" % filepath + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to set the mode of %s" % filepath) + return 1 + + return 0 + +def prepare_env(util, dynamic_ownership, use_nfs, logger): + """configure dynamic_ownership in /etc/libvirt/qemu.conf, + set chown of the file to save + """ + if dynamic_ownership == 'enable': + d_ownership = 1 + elif dynamic_ownership == 'disable': + d_ownership = 0 + else: + logger.error("wrong dynamic_ownership value") + return 1 + + logger.info("set the dynamic ownership in %s as %s" % \ + (QEMU_CONF, d_ownership)) + set_cmd = "echo dynamic_ownership = %s >> %s" % \ + (d_ownership, QEMU_CONF) + ret, out = util.exec_cmd(set_cmd, shell=True) + if ret: + logger.error("failed to set dynamic ownership") + return 1 + + logger.info("restart libvirtd") + restart_cmd = "service libvirtd restart" + ret, out = util.exec_cmd(restart_cmd, shell=True) + if ret: + logger.error("failed to restart libvirtd") + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + if use_nfs == 'enable': + filepath = TEMP_FILE + elif use_nfs == 'disable': + filepath = SAVE_FILE + else: + logger.error("wrong use_nfs value") + return 1 + + ret = chown_file(util, filepath, logger) + if ret: + return 1 + + if use_nfs == 'enable': + ret = nfs_setup(util, logger) + if ret: + return 1 + + cmd = "setsebool virt_use_nfs 1" + logger.info(cmd) + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("Failed to setsebool virt_use_nfs") + return 1 + + logger.info("mount the nfs path to /mnt") + mount_cmd = "mount -o vers=3 127.0.0.1:/tmp /mnt" + ret, out = util.exec_cmd(mount_cmd, shell=True) + if ret: + logger.error("Failed to mount the nfs path") + for i in range(len(out)): + logger.info(out[i]) + return 1 + + return 0 + +def ownership_get(logger): + """check the ownership of file""" + + statinfo = os.stat(SAVE_FILE) + uid = statinfo.st_uid + gid = statinfo.st_gid + + logger.info("the uid and gid of %s is %s:%s" %(SAVE_FILE, uid, gid)) + + return 0, uid, gid + +def ownership_test(params): + """Save a domain to a file, check the ownership of + the file after save and restore + """ + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + + logger = params['logger'] + guestname = params['guestname'] + dynamic_ownership = params['dynamic_ownership'] + use_nfs = params['use_nfs'] + + util = utils.Utils() + + # set env + logger.info("prepare the environment") + ret = prepare_env(util, dynamic_ownership, use_nfs, logger) + if ret: + logger.error("failed to prepare the environment") + return 1 + + # Connect to local hypervisor connection URI + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + # save domain to the file + logger.info("save domain %s to the file %s" % (guestname, SAVE_FILE)) + domobj = domainAPI.DomainAPI(virconn) + + logger.info("check the domain state") + ret = check_domain_running(domobj, guestname, logger) + if ret: + return return_close(conn, logger, 1) + + try: + domobj.save(guestname, SAVE_FILE) + logger.info("Success save domain %s to %s" % (guestname, SAVE_FILE)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to save domain %s to %s" % \ + (guestname, SAVE_FILE)) + return return_close(conn, logger, 1) + + logger.info("check the ownership of %s after save" % SAVE_FILE) + ret, uid, gid = ownership_get(logger) + if use_nfs == 'enable': + if uid == 107 and gid == 107: + logger.info("As expected, the chown not change.") + else: + logger.error("The chown of %s is %s:%s, it's not as expected" % \ + (SAVE_FILE, uid, gid)) + return return_close(conn, logger, 1) + elif use_nfs == 'disable': + if dynamic_ownership == 'enable': + if uid == 0 and gid == 0: + logger.info("As expected, the chown changed to root:root") + else: + logger.error("The chown of %s is %s:%s, it's not as expected" % \ + (SAVE_FILE, uid, gid)) + return return_close(conn, logger, 1) + elif dynamic_ownership == 'disable': + if uid == 107 and gid == 107: + logger.info("As expected, the chown not change.") + else: + logger.error("The chown of %s is %s:%s, it's not as expected" % \ + (SAVE_FILE, uid, gid)) + return return_close(conn, logger, 1) + + # restore domain from file + logger.info("restore the domain from the file") + try: + domobj.restore(guestname, SAVE_FILE) + logger.info("Success restore domain %s from %s" % \ + (guestname, SAVE_FILE)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to restore domain %s from %s" % \ + (guestname, SAVE_FILE)) + return return_close(conn, logger, 1) + + logger.info("check the ownership of %s after restore" % SAVE_FILE) + ret, uid, gid = ownership_get(logger) + if uid == 107 and gid == 107: + logger.info("As expected, the chown not change.") + else: + logger.error("The chown of %s is %s:%s, not change back as expected" % \ + (SAVE_FILE, uid, gid)) + return return_close(conn, logger, 1) + + return return_close(conn, logger, 0) + +def ownership_test_clean(params): + """clean testing environment""" + logger = params['logger'] + use_nfs = params['use_nfs'] + + util = utils.Utils() + + if use_nfs == 'enable': + if os.path.ismount("/mnt"): + umount_cmd = "umount /mnt" + ret, out = util.exec_cmd(umount_cmd, shell=True) + if ret: + logger.error("Failed to unmount the nfs path") + for i in range(len(out)): + logger.error(out[i]) + + filepath = TEMP_FILE + elif use_nfs == 'disable': + filepath = SAVE_FILE + + if os.path.exists(filepath): + os.remove(filepath) + -- 1.7.1

2 1

[libvirt] [PATCH] Fix typos for snapshot-create-as in virsh help cmd and doc
by Nan Zhang 15 Sep '11

15 Sep '11

* tools/virsh.c: Using VSH_OT_STRING instead of VSH_OT_ARGV for diskspec * tools/virsh.pod: Fix missing -- tag for snapshot-create-as in docs --- tools/virsh.c | 2 +- tools/virsh.pod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..5c4610e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12630,7 +12630,7 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { {"no-metadata", VSH_OT_BOOL, 0, N_("take snapshot but create no metadata")}, {"halt", VSH_OT_BOOL, 0, N_("halt domain after snapshot is created")}, {"disk-only", VSH_OT_BOOL, 0, N_("capture disk state but not vm state")}, - {"diskspec", VSH_OT_ARGV, 0, + {"diskspec", VSH_OT_STRING, 0, N_("disk attributes: disk[,snapshot=type][,driver=type][,file=name]")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..c82cc45 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1773,7 +1773,7 @@ by command such as B<destroy> or by internal guest action). =item B<snapshot-create-as> I<domain> {[I<--print-xml>] | [I<--no-metadata>] [I<--halt>]} [I<name>] [I<description>] -[I<--disk-only> [I<diskspec>]...] +[I<--disk-only>] [I<--diskspec>]... Create a snapshot for domain I<domain> with the given <name> and <description>; if either value is omitted, libvirt will choose a @@ -1784,8 +1784,8 @@ inactive state after the snapshot is created, and if I<--disk-only> is specified, the snapshot will not include vm state. The I<--disk-only> flag is used to request a disk-only snapshot. When -this flag is in use, the command can also take additional I<diskspec> -arguments to add <disk> elements to the xml. Each <diskspec> is in the +this flag is in use, the command can also take additional I<--diskspec> +arguments to add <disk> elements to the xml. Each I<--diskspec> is in the form B<disk[,snapshot=type][,driver=type][,file=name]>. To include a literal comma in B<disk> or in B<file=name>, escape it with a second comma. For example, a diskspec of "vda,snapshot=external,file=/path/to,,new" -- 1.7.4.4

3 8

[libvirt] [PATCH] doc: Add statment about permissions needed to do a core dump
by Peter Krempa 15 Sep '11

15 Sep '11

Documentation did not specify, that some permissions are required on target path for coredump for the user running the hypervisor. --- src/libvirt.c | 4 +++- tools/virsh.pod | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index c32c7a6..ee88d87 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2777,7 +2777,9 @@ error: * * This method will dump the core of a domain on a given file for analysis. * Note that for remote Xen Daemon the file path will be interpreted in - * the remote host. + * the remote host. Hypervisors may require execute and/or write permissions + * for destination path specified by argument @to for user running the + * hypervisor. * * If @flags includes VIR_DUMP_CRASH, then leave the guest shut off with * a crashed state after the dump completes. If @flags includes diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..ba7af15 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -621,6 +621,9 @@ rather than merely left in a paused state. If I<--bypass-cache> is specified, the save will avoid the file system cache, although this may slow down the operation. +NOTE: Some hypervisors may require execute and/or write permissions on +I<corefilepath> for user running the hypervisor. + =item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] -- 1.7.3.4

2 2

[libvirt] [PATCH] python: Fix libvirt.py generation to include virterror info
by Cole Robinson 15 Sep '11

15 Sep '11

Recent generator refactoring broke libvirt.py. With this patch, libvirt.py is generated exactly the same as before the offending commit. --- python/generator.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 327e1d5..d855d6b 100755 --- a/python/generator.py +++ b/python/generator.py @@ -120,7 +120,8 @@ class docParser(xml.sax.handler.ContentHandler): if attrs.has_key('field'): self.function_return_field = attrs['field'] elif tag == 'enum': - if attrs['file'] == "libvirt": + if (attrs['file'] == "libvirt" or + attrs['file'] == "virterror"): enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-qemu": qemu_enum(attrs['type'],attrs['name'],attrs['value']) @@ -130,7 +131,9 @@ class docParser(xml.sax.handler.ContentHandler): print "end %s" % tag if tag == 'function': if self.function != None: - if self.function_module == "libvirt": + if (self.function_module == "libvirt" or + self.function_module == "event" or + self.function_module == "virterror"): function(self.function, self.function_descr, self.function_return, self.function_args, self.function_file, self.function_module, -- 1.7.4.4

2 3

[libvirt] [PATCH 0/7] Expose QEMU APIs to Python binding
by Osier Yang 15 Sep '11

15 Sep '11

This patchset is to expose QEMU APIs to Python binding, as we don't intend to support the QEMU APIs officially, it's exposed seperately with general libvirt APIs with standalone libvirt_qemu.py and libvirtmod_qemu.so. And there is no class for QEMU APIs, there are written directly as function in libvirt_qemu.py. How to use the APIs. #! /usr/bin/python -u import libvirt import libvirt_qemu conn = libvirt.open(None) dom = conn.lookupByName('test') print libvirt_qemu.qemuMonitorCommand(dom, 'info blockstats', 1) libvirt_qemu.qemuAttach(conn, 2307, 0) PS: make check/make dist/make rpm are passed. [PATCH 1/7] qemu_api: Modify apibuild.py to generate docs for QEMU [PATCH 2/7] qemu_api: Update Makefile for subdir docs [PATCH 3/7] qemu_api: Add comments for API [PATCH 4/7] qemu_api: Add override XML and C files for QEMU APIs [PATCH 5/7] qemu_api: Update Py binding generator to generate files [PATCH 6/7] qemu_api: Update Makefile to generate libvirtmod_qemu [PATCH 7/7] qemu_api: Update libvirt spec file Regards, Osier

5 29

[libvirt] [PATCH] doc: virsh: Fix command name in man page
by Peter Krempa 15 Sep '11

15 Sep '11

Fix cut&paste error having command named domif-setlink instead of domif-getlink. --- tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..27d8f42 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -518,7 +518,7 @@ Modify link state of the domain's virtual interface. Possible values for state are "up" and "down. If --persistent is specified, only the persistent configuration of the domain is modified. -=item B<domif-setlink> I<domain> I<interface-MAC> I<--persistent> +=item B<domif-getlink> I<domain> I<interface-MAC> I<--persistent> Query link state of the domain's virtual interface. If --persistent is specified, query the persistent configuration. -- 1.7.3.4

2 1

[libvirt] [PATCH] sanlock: add missing test command in virt-sanlock-cleanup.in
by ajia＠redhat.com 15 Sep '11

15 Sep '11

From: Alex Jia <ajia(a)redhat.com> * tools/virt-sanlock-cleanup.in: fix missing test command when judging second condition. https://bugzilla.redhat.com/show_bug.cgi?id=738534 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virt-sanlock-cleanup.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in index d8a40a5..72cd5e0 100644 --- a/tools/virt-sanlock-cleanup.in +++ b/tools/virt-sanlock-cleanup.in @@ -29,7 +29,7 @@ cd "$LOCKDIR" || exit 1 for MD5 in * do - if test $MD5 != '*' && $MD5 != $LOCKSPACE ; then + if test $MD5 != '*' && test $MD5 != $LOCKSPACE ; then RESOURCE="$LOCKSPACE:$MD5:$LOCKDIR/$MD5:0" notify -n "Cleanup: $RESOURCE " sanlock client command -r $RESOURCE -c /bin/rm -f "$LOCKDIR/$MD5" 2>/dev/null -- 1.7.1

2 1

[libvirt] libvirt(-java): virDomainMigrateSetMaxDowntime
by Thomas Treutner 15 Sep '11

15 Sep '11

Hi, I'm facing some troubles with virDomainMigrate & virDomainMigrateSetMaxDowntime. The core problem is that KVM's default value for the maximum allowed downtime is 30ms (max_downtime in migration.c, it's nanoseconds there; 0.12.3) which is too low for my VMs when they're busy (~50% CPU util and above). Migrations then take literally forever, I had to abort them after 15 minutes or so. I'm using GBit Ethernet, so plenty bandwidth should be available. Increasing the allowed downtime to 50ms seems to help, but I have not tested situations where the VM is completely utilized. Anyways, the default value is too low for me, so I tried virDomainMigrateSetMaxDowntime resp. the Java wrapper function. Here I'm facing a problem I can overcome only with a quite crude hack: org.libvirt.Domain.migrate(..) blocks until the migration is done, which is of course reasonable. So I tried calling migrateSetMaxDowntime(..) before migrating, causing an error: "Requested operation is not valid: domain is not being migrated" This tells me that calling migrateSetMaxDowntime is only allowed during migrations. As I'm migrating VMs automatically and without any user intervention I'd need to create some glue code that runs in an extra thread, waiting "some time" hoping that the migration was kicked off in the main thread yet and then calling migrateSetMaxDowntime. I'd like to avoid such quirks in the long run, if possible. So my question: Would it be possible to extend the migrate() method resp. virDomainMigrate() function with an optional maxDowntime parameter that is passed down as QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME so that qemuDomainWaitForMigrationComplete would set the value? Or are there easier ways? Thanks and regards, -t

3 5

[libvirt] [PATCH] qemu: Prevent disk corruption on domain shutdown
by Jiri Denemark 15 Sep '11

15 Sep '11

Ever since we introduced fake reboot, we call qemuProcessKill as a reaction to SHUTDOWN event. Unfortunately, qemu doesn't guarantee it flushed all internal buffers before sending SHUTDOWN, in which case killing the process forcibly may result in (virtual) disk corruption. By sending SIGQUIT instead of SIGTERM followed by SIGKILL we tell qemu to flush all buffers and exit. Once qemu exits, we will see an EOF on monitor connection and tear down the domain. In case qemu ignores SIGQUIT or just hangs there, the process stays running but that's not any different from a possible hang anytime during the shutdown process so I think it's just fine. --- src/qemu/qemu_process.c | 21 +++++++++++++++++++-- src/qemu/qemu_process.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8a8475..8a12e2a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -445,12 +445,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm); + qemuProcessQuit(vm); if (virDomainObjUnref(vm) == 0) vm = NULL; } } else { - qemuProcessKill(vm); + qemuProcessQuit(vm); } if (vm) virDomainObjUnlock(vm); @@ -3182,6 +3182,23 @@ cleanup: } +void qemuProcessQuit(virDomainObjPtr vm) +{ + VIR_DEBUG("vm=%s pid=%d", vm->def->name, vm->pid); + + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("VM '%s' not active", vm->def->name); + return; + } + + if (virKillProcess(vm->pid, SIGQUIT) < 0 && errno != ESRCH) { + char ebuf[1024]; + VIR_WARN("Failed to kill process %d: %s", + vm->pid, virStrerror(errno, ebuf, sizeof(ebuf))); + } +} + + void qemuProcessKill(virDomainObjPtr vm) { int i; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 96ba3f3..ad14cf7 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -68,6 +68,7 @@ int qemuProcessAttach(virConnectPtr conn, virDomainChrSourceDefPtr monConfig, bool monJSON); +void qemuProcessQuit(virDomainObjPtr vm); void qemuProcessKill(virDomainObjPtr vm); int qemuProcessAutoDestroyInit(struct qemud_driver *driver); -- 1.7.6.1

3 3

[libvirt] [PATCH v2 0/2] add blkio.weight_device support
by Hu Tao 15 Sep '11

15 Sep '11

This series adds support for blkio.weight_device. changes from v1: - update remote_protocol-structs to make `make check` pass - fix some memleaks - compared the sizes of remote_typed_param before and after patch 1 using pdwtags, doesn't change - libvirtd(before patch) returns an error message error: Unable to decode message payload if connect to it and send a remote_typed_param(after patch) via virsh(after patch) Hu Tao (2): Add VIR_TYPED_PARAM_STRING add interface for blkio.weight_device daemon/remote.c | 20 +++++ include/libvirt/libvirt.h.in | 13 +++- src/conf/domain_conf.c | 142 ++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 15 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_cgroup.c | 22 ++++++ src/qemu/qemu_driver.c | 170 +++++++++++++++++++++++++++++++++++++++++- src/remote/remote_driver.c | 15 ++++ src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/util/cgroup.c | 33 ++++++++ src/util/cgroup.h | 3 + tools/virsh.c | 31 ++++++++ tools/virsh.pod | 5 +- 14 files changed, 467 insertions(+), 7 deletions(-) -- 1.7.3.1

3 8

[libvirt] [test-API][PATCH v2] Add test case for start domain on nfs storage
by Wayne Sun 15 Sep '11

15 Sep '11

* This test is for start a domain with img file on nfs storage. Under SElinux boolean virt_use_nfs on or off, combine with setting the dynamic_ownership in /etc/libvirt/qemu.conf, check whether the guest can be started or not. The nfs could be root_squash or no_root_squash. SElinux should be enabled and enforcing on host. --- repos/sVirt/domain_nfs_start.py | 485 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 485 insertions(+), 0 deletions(-) create mode 100644 repos/sVirt/__init__.py create mode 100644 repos/sVirt/domain_nfs_start.py diff --git a/repos/sVirt/__init__.py b/repos/sVirt/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py new file mode 100644 index 0000000..e4bc867 --- /dev/null +++ b/repos/sVirt/domain_nfs_start.py @@ -0,0 +1,485 @@ +#!/usr/bin/env python +"""This test is for start a guest with img file on nfs storage. + Under SElinux boolean virt_use_nfs on or off, combine with + setting the dynamic_ownership in /etc/libvirt/qemu.conf, + check whether the guest can be started or not. The nfs could + be root_squash or no_root_squash. SElinux should be enabled + and enforcing on host. + sVirt:domain_nfs_start + guestname + #GUESTNAME# + dynamic_ownership + enable|disable + virt_use_nfs + on|off + root_squash + yes|no +""" + +__author__ = 'Wayne Sun: gsun(a)redhat.com' +__date__ = 'Mon Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['domain_nfs_start'] + +import os +import re +import sys + +QEMU_CONF = "/etc/libvirt/qemu.conf" + +def append_path(path): + """Append root path of package""" + if path not in sys.path: + sys.path.append(path) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from exception import LibvirtAPI +from shutil import copy + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +def return_close(conn, logger, ret): + """close hypervisor connection and return the given value""" + conn.close() + logger.info("closed hypervisor connection") + return ret + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'dynamic_ownership', 'virt_use_nfs', 'root_squash'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + return 1 + return 0 + +def nfs_setup(util, root_squash, logger): + """setup nfs on localhost + """ + logger.info("set nfs service") + if root_squash == "yes": + option = "root_squash" + elif root_squash == "no": + option = "no_root_squash" + else: + logger.error("wrong root_squash value") + return 1 + + cmd = "echo /tmp *$rw,%s$ >> /etc/exports" % option + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to config nfs export") + return 1 + + logger.info("restart nfs service") + cmd = "service nfs restart" + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to restart nfs service") + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + return 0 + +def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \ + disk_file, img_dir, logger): + """set virt_use_nfs SElinux boolean, configure + dynamic_ownership in /etc/libvirt/qemu.conf + """ + logger.info("set virt_use_nfs selinux boolean") + cmd = "setsebool virt_use_nfs %s" % virt_use_nfs + ret, out = util.exec_cmd(cmd, shell=True) + if ret: + logger.error("failed to set virt_use_nfs SElinux boolean") + return 1 + + logger.info("set the dynamic ownership in %s as %s" % \ + (QEMU_CONF, d_ownership)) + if d_ownership == "enable": + option = 1 + elif d_ownership == "disable": + option = 0 + else: + logger.error("wrong dynamic_ownership value") + return 1 + + set_cmd = "echo dynamic_ownership = %s >> %s" % \ + (option, QEMU_CONF) + ret, out = util.exec_cmd(set_cmd, shell=True) + if ret: + logger.error("failed to set dynamic ownership") + return 1 + + logger.info("restart libvirtd") + restart_cmd = "service libvirtd restart" + ret, out = util.exec_cmd(restart_cmd, shell=True) + if ret: + logger.error("failed to restart libvirtd") + for i in range(len(out)): + logger.info(out[i]) + return 1 + else: + for i in range(len(out)): + logger.info(out[i]) + + file_name = os.path.basename(disk_file) + filepath = "/tmp/%s" % file_name + if os.path.exists(filepath): + os.remove(filepath) + + logger.info("copy %s img file to nfs path" % guestname) + copy(disk_file, "/tmp") + + logger.info("set up nfs service on localhost") + ret = nfs_setup(util, root_squash, logger) + if ret: + return 1 + + logger.info("mount nfs to img dir path") + mount_cmd = "mount -o vers=3 127.0.0.1:/tmp %s" % img_dir + ret, out = util.exec_cmd(mount_cmd, shell=True) + if ret: + logger.error("Failed to mount the nfs path") + for i in range(len(out)): + logger.info(out[i]) + return 1 + + return 0 + +def domain_nfs_start(params): + """start domain with img on nfs""" + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + + logger = params['logger'] + guestname = params['guestname'] + dynamic_ownership = params['dynamic_ownership'] + virt_use_nfs = params['virt_use_nfs'] + root_squash = params['root_squash'] + + util = utils.Utils() + + # Connect to local hypervisor connection URI + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + logger.info("get the domain state") + try: + state = domobj.get_state(guestname) + logger.info("domain %s is %s" % (guestname, state)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s state" % guestname) + return return_close(conn, logger, 1) + + if state != "shutoff": + logger.info("shut down the domain %s" % guestname) + try: + domobj.destroy(guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to destroy domain %s" % guestname) + return return_close(conn, logger, 1) + + logger.info("get guest img file path") + try: + dom_xml = domobj.get_xml_desc(guestname) + disk_file = util.get_disk_path(dom_xml) + logger.info("%s disk file path is %s" % (guestname, disk_file)) + img_dir = os.path.dirname(disk_file) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s xml" % guestname) + return return_close(conn, logger, 1) + + # close connection before restart libvirtd + conn.close() + + # set env + logger.info("prepare the environment") + ret = prepare_env(util, dynamic_ownership, virt_use_nfs, guestname,\ + root_squash, disk_file, img_dir, logger) + if ret: + logger.error("failed to prepare the environment") + return return_close(conn, logger, 1) + + # reconnect + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + logger.info("begin to test start domain from nfs storage") + logger.info("First, start the domain without chown the img file to qemu") + logger.info("start domain %s" % guestname) + if root_squash == "yes": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif root_squash == "no": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + logger.info("get the domain state") + try: + state = domobj.get_state(guestname) + logger.info("domain %s is %s" % (guestname, state)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to get domain %s state" % guestname) + return return_close(conn, logger, 1) + + if state != "shutoff": + logger.info("shut down the domain %s" % guestname) + try: + domobj.destroy(guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Error: fail to destroy domain %s" % guestname) + return return_close(conn, logger, 1) + + logger.info("Second, start the domain after chown the img file to qemu") + + file_name = os.path.basename(disk_file) + filepath = "/tmp/%s" % file_name + logger.info("set chown of %s as 107:107" % filepath) + chown_cmd = "chown 107:107 %s" % filepath + ret, out = util.exec_cmd(chown_cmd, shell=True) + if ret: + logger.error("failed to chown %s to qemu:qemu" % filepath) + return return_close(conn, logger, 1) + + logger.info("start domain %s" % guestname) + if root_squash == "yes": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + elif root_squash == "no": + if virt_use_nfs == "on": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.info("Success start domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.info("Success start Domain %s" % guestname) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.error("Fail to start domain %s" % guestname) + return return_close(conn, logger, 1) + + elif virt_use_nfs == "off": + if dynamic_ownership == "enable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + elif dynamic_ownership == "disable": + try: + domobj.start(guestname) + logger.error("Domain %s started, this is not expected" % \ + guestname) + return return_close(conn, logger, 1) + except LibvirtAPI, e: + logger.info("API error message: %s, error code is %s" % \ + (e.response()['message'], e.response()['code'])) + logger.info("Fail to start domain %s, this is expected" % \ + guestname) + + return return_close(conn, logger, 0) + +def domain_nfs_start_clean(params): + """clean testing environment""" + logger = params['logger'] + guestname = params['guestname'] + + util = utils.Utils() + + # Connect to local hypervisor connection URI + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + domobj = domainAPI.DomainAPI(virconn) + + if domobj.get_state(guestname) != "shutoff": + domobj.destroy(guestname) + + dom_xml = domobj.get_xml_desc(guestname) + disk_file = util.get_disk_path(dom_xml) + img_dir = os.path.dirname(disk_file) + file_name = os.path.basename(disk_file) + temp_file = "/tmp/%s" % file_name + + if os.path.ismount(img_dir): + umount_cmd = "umount -f %s" % img_dir + ret, out = util.exec_cmd(umount_cmd, shell=True) + if ret: + logger.error("failed to umount %s" % img_dir) + + if os.path.exists(temp_file): + os.remove(temp_file) + + conn.close() + -- 1.7.1

3 2

[libvirt] [test-API][PATCH v2 1/4] Add init module under libvirtd
by Wayne Sun 15 Sep '11

15 Sep '11

* repos/libvirtd/__init__.py --- 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 repos/libvirtd/__init__.py diff --git a/repos/libvirtd/__init__.py b/repos/libvirtd/__init__.py new file mode 100644 index 0000000..e69de29 -- 1.7.1

3 9

[libvirt] [PATCH] Fix build after commit 829bce17
by Jim Fehlig 15 Sep '11

15 Sep '11

Pushing under build-breaker rule. --- src/qemu/qemu_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ecd257..d2626ff 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8881,6 +8881,7 @@ qemuDomainMigrateGetMaxSpeed(virDomainPtr dom, { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; + qemuDomainObjPrivatePtr priv; int ret = -1; virCheckFlags(0, -1); @@ -8897,7 +8898,8 @@ qemuDomainMigrateGetMaxSpeed(virDomainPtr dom, goto cleanup; } - *bandwidth = vm->privateData->migMaxBandwidth; + priv = vm->privateData; + *bandwidth = priv->migMaxBandwidth; ret = 0; cleanup: -- 1.7.5.4

1 0

[libvirt] [PATCH 0/5] Implement virDomainMigrateGetMaxSpeed in qemu driver
by Jim Fehlig 14 Sep '11

14 Sep '11

This is a rebase of uncommitted patches in the series originally posted here https://www.redhat.com/archives/libvir-list/2011-August/msg01373.html Jim Fehlig (5): Store max migration bandwidth in qemuDomainObjPrivate struct Impl virDomainMigrateGetMaxSpeed in qemu driver Save migration speed in qemuDomainMigrateSetMaxSpeed Set qemu migration speed unlimited when migrating to file Use max bandwidth from qemuDomainObjPrivate struct when migrating src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 5 +++ src/qemu/qemu_driver.c | 65 +++++++++++++++++++++++++++++++------------- src/qemu/qemu_migration.c | 21 +++++++++++++- 4 files changed, 72 insertions(+), 21 deletions(-) -- 1.7.5.4

2 7

[libvirt] [PATCH] conf: add missing break in virDomainAuditRedirdev
by Marc-André Lureau 14 Sep '11

14 Sep '11

Also initialize to NULL a few variables that might get free before being set. --- src/conf/domain_audit.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index ef0f47a..c9c6003 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -250,8 +250,8 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - char *address; - char *device; + char *address = NULL; + char *device = NULL; const char *virt; virUUIDFormat(vm->def->uuid, uuidstr); @@ -323,8 +323,8 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - char *address; - char *device; + char *address = NULL; + char *device = NULL; const char *virt; virUUIDFormat(vm->def->uuid, uuidstr); @@ -344,6 +344,7 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, VIR_WARN("OOM while encoding audit message"); goto cleanup; } + break; default: VIR_WARN("Unexpected redirdev bus while encoding audit message: %d", redirdev->bus); -- 1.7.6

2 1

[libvirt] [PATCH] network: add missing exports
by Eric Blake 14 Sep '11

14 Sep '11

Commit c246b025 added new functions, but forgot to export them, resulting in a build failure when using modules. * src/libvirt_private.syms (network.h): Export new functions. --- Pushing under the build-breaker rule. src/libvirt_private.syms | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0780f2d..e45965e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -742,6 +742,7 @@ virBandwidthDefFree; virBandwidthDefParseNode; virBandwidthDisable; virBandwidthEnable; +virBandwidthEqual; virSocketAddrBroadcast; virSocketAddrBroadcastByPrefix; virSocketAddrIsNetmask; @@ -757,6 +758,7 @@ virSocketParseAddr; virSocketParseIpv4Addr; virSocketParseIpv6Addr; virSocketSetPort; +virVirtualPortProfileEqual; virVirtualPortProfileFormat; virVirtualPortProfileParseXML; -- 1.7.4.4

1 0

[libvirt] [PATCH] snapshot: ABI stability must include memory sizing
by Eric Blake 14 Sep '11

14 Sep '11

Commit 973fcd8f introduced the ability for qemu to reject snapshot reversion on an ABI incompatibility; but the very example that was first proposed on-list[1] as a demonstration of an ABI incompatibility, namely that of changing the max memory allocation, was not being checked for, resulting in a cryptic failure when running with larger max mem than what the snapshot was created with: error: operation failed: Error -22 while loading VM state This commit merely protects the three variables within mem that are referenced by qemu_command.c, rather than all 7 (the other 4 variables affect cgroup handling, but have no visible effect to the qemu guest). [1] https://www.redhat.com/archives/libvir-list/2010-December/msg00331.html * src/conf/domain_conf.c (virDomainDefCheckABIStability): Add memory sizing checks. --- See also https://bugzilla.redhat.com/show_bug.cgi?id=735553#c5 src/conf/domain_conf.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 11755fe..996e0d5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8229,6 +8229,26 @@ bool virDomainDefCheckABIStability(virDomainDefPtr src, goto cleanup; } + if (src->mem.max_balloon != dst->mem.max_balloon) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain max memory %ld does not match source %ld"), + dst->mem.max_balloon, src->mem.max_balloon); + goto cleanup; + } + if (src->mem.cur_balloon != dst->mem.cur_balloon) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain current memory %ld does not match source %ld"), + dst->mem.cur_balloon, src->mem.cur_balloon); + goto cleanup; + } + if (src->mem.hugepage_backed != dst->mem.hugepage_backed) { + virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain huge page backing %ld does not match source %ld"), + dst->mem.hugepage_backed, + src->mem.hugepage_backed); + goto cleanup; + } + if (src->vcpus != dst->vcpus) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain vpu count %d does not match source %d"), -- 1.7.4.4

2 2

[libvirt] [PATCH v5] virsh: Increase device-detach intelligence
by Michal Privoznik 14 Sep '11

14 Sep '11

From: Michal Prívozník <mprivozn(a)redhat.com> Up to now users have to give a full XML description on input when device-detaching. If they omitted something it lead to unclear error messages (like generated MAC wasn't found, etc.). With this patch users can specify only those information which specify one device sufficiently precise. Remaining information is completed from domain. --- diff to v4: -Eric's review suggestions tools/virsh.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 268 insertions(+), 16 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 430168c..0caa360 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -59,6 +59,7 @@ #include "threads.h" #include "command.h" #include "virkeycode.h" +#include "util/bitmap.h" static char *progname; @@ -10986,6 +10987,243 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) return true; } +/** + * Check if n1 is superset of n2, meaning n1 contains all elements and + * attributes as n2 at least. Including children. + * @n1 first node + * @n2 second node + * return 1 in case n1 covers n2, 0 otherwise. + */ +static bool +vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { + xmlNodePtr child1, child2; + xmlAttrPtr attr; + char *prop1, *prop2; + bool found; + bool visited; + bool ret = false; + unsigned long n1_child_size, n1_iter; + virBitmapPtr bitmap; + + if (!n1 && !n2) + return true; + + if (!n1 || !n2) + return false; + + if (!xmlStrEqual(n1->name, n2->name)) + return false; + + /* Iterate over n2 attributes and check if n1 contains them*/ + attr = n2->properties; + while (attr) { + if (attr->type == XML_ATTRIBUTE_NODE) { + prop1 = virXMLPropString(n1, (const char *) attr->name); + prop2 = virXMLPropString(n2, (const char *) attr->name); + if (STRNEQ_NULLABLE(prop1, prop2)) { + xmlFree(prop1); + xmlFree(prop2); + return false; + } + xmlFree(prop1); + xmlFree(prop2); + } + attr = attr->next; + } + + n1_child_size = xmlChildElementCount(n1); + if (!n1_child_size) { + return !xmlChildElementCount(n2); + } + + if (!(bitmap = virBitmapAlloc(n1_child_size))) { + virReportOOMError(); + return false; + } + + child2 = n2->children; + while (child2) { + if (child2->type != XML_ELEMENT_NODE) { + child2 = child2->next; + continue; + } + + child1 = n1->children; + n1_iter = 0; + found = false; + while (child1) { + if (child1->type != XML_ELEMENT_NODE) { + child1 = child1->next; + continue; + } + + if (virBitmapGetBit(bitmap, n1_iter, &visited) < 0) { + vshError(NULL, "%s", _("Bad child elements counting.")); + goto cleanup; + } + + if (visited) { + child1 = child1->next; + n1_iter++; + continue; + } + + if (xmlStrEqual(child1->name, child2->name)) { + found = true; + if (virBitmapSetBit(bitmap, n1_iter) < 0) { + vshError(NULL, "%s", _("Bad child elements counting.")); + goto cleanup; + } + + if (!vshNodeIsSuperset(child1, child2)) + goto cleanup; + + break; + } + + child1 = child1->next; + n1_iter++; + } + + if (!found) + goto cleanup; + + child2 = child2->next; + } + + ret = true; + +cleanup: + virBitmapFree(bitmap); + return ret; +} + +/** + * vshCompleteXMLFromDomain: + * @ctl vshControl for error messages printing + * @dom domain + * @oldXML device XML before + * @newXML and after completion + * + * For given domain and (probably incomplete) device XML specification try to + * find such device in domain and complete missing parts. This is however + * possible only when given device XML is sufficiently precise so it addresses + * only one device. + * + * Returns -2 when no such device exists in domain, -3 when given XML selects many + * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML + * is touched only in case of success. + */ +static int +vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, + char **newXML) { + int funcRet = -1; + char *domXML = NULL; + xmlDocPtr domDoc = NULL, devDoc = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr domCtxt = NULL, devCtxt = NULL; + xmlNodePtr *devices = NULL; + xmlSaveCtxtPtr sctxt = NULL; + int devices_size; + char *xpath; + xmlBufferPtr buf = NULL; + int i = 0; + int indx = -1; + + if (!(domXML = virDomainGetXMLDesc(dom, 0))) { + vshError(ctl, _("couldn't get XML description of domain %s"), + virDomainGetName(dom)); + goto cleanup; + } + + domDoc = virXMLParseStringCtxt(domXML, _("(domain_definition)"), &domCtxt); + if (!domDoc) { + vshError(ctl, _("Failed to parse domain definition xml")); + goto cleanup; + } + + devDoc = virXMLParseStringCtxt(oldXML, _("(device_definition)"), &devCtxt); + if (!devDoc) { + vshError(ctl, _("Failed to parse device definition xml")); + goto cleanup; + } + + node = xmlDocGetRootElement(devDoc); + + buf = xmlBufferCreate(); + if (!buf) { + vshError(ctl, "%s", _("out of memory")); + goto cleanup; + } + + /* Get all possible devices */ + virAsprintf(xpath, "/domain/devices/%s", node->name); + if (!xpath) { + virReportOOMError(); + goto cleanup; + } + devices_size = virXPathNodeSet(xpath, domCtxt, &devices); + + if (devices_size < 0) { + /* error */ + vshError(ctl, "%s", _("error when selecting nodes")); + goto cleanup; + } else if (devices_size == 0) { + /* no such device */ + funcRet = -2; + goto cleanup; + } + + /* and refine */ + for (i = 0; i < devices_size; i++) { + if (vshNodeIsSuperset(devices[i], node)) { + if (indx >= 0) { + funcRet = -3; /* ambiguous */ + goto cleanup; + } + indx = i; + } + } + + if (indx < 0) { + funcRet = -2; /* no such device */ + goto cleanup; + } + + vshDebug(ctl, VSH_ERR_DEBUG, "Found device at pos %d\n", indx); + + if (newXML) { + sctxt = xmlSaveToBuffer(buf, NULL, 0); + if (!sctxt) { + vshError(ctl, "%s", _("failed to create document saving context")); + goto cleanup; + } + + xmlSaveTree(sctxt, devices[indx]); + xmlSaveClose(sctxt); + *newXML = (char *) xmlBufferContent(buf); + if (!*newXML) { + virReportOOMError(); + goto cleanup; + } + buf->content = NULL; + } + + vshDebug(ctl, VSH_ERR_DEBUG, "Old xml:\n%s\nNew xml:\n%s\n", oldXML, + newXML ? NULLSTR(*newXML) : "(null)"); + + funcRet = 0; + +cleanup: + xmlBufferFree(buf); + VIR_FREE(devices); + xmlXPathFreeContext(devCtxt); + xmlXPathFreeContext(domCtxt); + xmlFreeDoc(devDoc); + xmlFreeDoc(domDoc); + VIR_FREE(domXML); + return funcRet; +} /* * "detach-device" command @@ -11006,10 +11244,11 @@ static const vshCmdOptDef opts_detach_device[] = { static bool cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; + virDomainPtr dom = NULL; const char *from = NULL; - char *buffer; + char *buffer = NULL, *new_buffer = NULL; int ret; + bool funcRet = false; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -11018,37 +11257,50 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { - virDomainFree(dom); - return false; - } + if (vshCommandOptString(cmd, "file", &from) <= 0) + goto cleanup; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - virDomainFree(dom); - return false; + goto cleanup; + } + + ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); + if (ret < 0) { + if (ret == -2) { + vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); + } else if (ret == -3) { + vshError(ctl, "%s", _("given XML selects too many devices. " + "Please, be more specific")); + } else { + /* vshCompleteXMLFromDomain() already printed error message, + * so nothing to do here. */ + } + goto cleanup; } if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, buffer, flags); + ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); } else { - ret = virDomainDetachDevice(dom, buffer); + ret = virDomainDetachDevice(dom, new_buffer); } - VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); - virDomainFree(dom); - return false; - } else { - vshPrint(ctl, "%s", _("Device detached successfully\n")); + goto cleanup; } + vshPrint(ctl, "%s", _("Device detached successfully\n")); + funcRet = true; + +cleanup: + VIR_FREE(new_buffer); + VIR_FREE(buffer); virDomainFree(dom); - return true; + return funcRet; } -- 1.7.3.4

1 0

[libvirt] [PATCH v2] xml: Clean up rest of virtual XML document names for XML strings
by Peter Krempa 14 Sep '11

14 Sep '11

Commit 498d783 cleans up some of virtual file names for parsing strings in memory. This patch cleans up (hopefuly) the rest forgotten by the first patch. This patch also changes all of the previously modified "filenames" to valid URI's replacing spaces for underscores. Changes to v1: - Replace all spaces for underscores, so that the strings form valid URI's - Replace spaces in places changed by commit 498d783 --- src/conf/domain_conf.c | 6 +++--- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/secret_conf.c | 2 +- src/conf/storage_conf.c | 6 +++--- src/cpu/cpu.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/security/virt-aa-helper.c | 2 +- tools/virsh.c | 20 ++++++++++---------- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 11755fe..c4fbdd5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5739,7 +5739,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, xmlXPathContextPtr ctxt = NULL; virDomainDeviceDefPtr dev = NULL; - if (!(xml = virXMLParseStringCtxt(xmlStr, "device.xml", &ctxt))) { + if (!(xml = virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt))) { goto error; } node = ctxt->node; @@ -7461,7 +7461,7 @@ virDomainDefParse(const char *xmlStr, xmlDocPtr xml; virDomainDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, _("(domain definition)")))) { + if ((xml = virXMLParse(filename, xmlStr, _("(domain_definition)")))) { def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml), expectedVirtTypes, flags); xmlFreeDoc(xml); @@ -11573,7 +11573,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, int active; char *tmp; - xml = virXMLParseCtxt(NULL, xmlStr, "domainsnapshot.xml", &ctxt); + xml = virXMLParseCtxt(NULL, xmlStr, _("(domain_snapshot)"), &ctxt); if (!xml) { return NULL; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 10377e7..fd8d1ae 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -864,7 +864,7 @@ virInterfaceDefParse(const char *xmlStr, xmlDocPtr xml; virInterfaceDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "interface.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(interface_definition)")))) { def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e055094..b98ffad 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1084,7 +1084,7 @@ virNetworkDefParse(const char *xmlStr, xmlDocPtr xml; virNetworkDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "network.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)")))) { def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 6b0ef50..fc284e0 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1231,7 +1231,7 @@ virNodeDeviceDefParse(const char *str, xmlDocPtr xml; virNodeDeviceDefPtr def = NULL; - if ((xml = virXMLParse(filename, str, "device.xml"))) { + if ((xml = virXMLParse(filename, str, _("(node_device_definition)")))) { def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), create); xmlFreeDoc(xml); } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 04bfa22..08ede48 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2119,7 +2119,7 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterDefPtr def = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "nwfilter.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition")))) { def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 105afbe..b33ce98 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -195,7 +195,7 @@ virSecretDefParse(const char *xmlStr, xmlDocPtr xml; virSecretDefPtr ret = NULL; - if ((xml = virXMLParse(filename, xmlStr, "secret.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(definition_of_secret)")))) { ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 1e7da69..e893b2d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -505,7 +505,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, xmlXPathContextPtr xpath_ctxt = NULL; virStoragePoolSourcePtr def = NULL, ret = NULL; - if (!(doc = virXMLParseStringCtxt(srcSpec, "srcSpec.xml", &xpath_ctxt))) { + if (!(doc = virXMLParseStringCtxt(srcSpec, _("(storage_source_specification)"), &xpath_ctxt))) { goto cleanup; } @@ -765,7 +765,7 @@ virStoragePoolDefParse(const char *xmlStr, virStoragePoolDefPtr ret = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(storage_pool_definition)")))) { ret = virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } @@ -1146,7 +1146,7 @@ virStorageVolDefParse(virStoragePoolDefPtr pool, virStorageVolDefPtr ret = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(storage_volume_definition)")))) { ret = virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index b47f078..2906be9 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -76,7 +76,7 @@ cpuCompareXML(virCPUDefPtr host, VIR_DEBUG("host=%p, xml=%s", host, NULLSTR(xml)); - if (!(doc = virXMLParseStringCtxt(xml, "cpu.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xml, _("(CPU_definition)"), &ctxt))) goto cleanup; cpu = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_AUTO); @@ -304,7 +304,7 @@ cpuBaselineXML(const char **xmlCPUs, goto no_memory; for (i = 0; i < ncpus; i++) { - if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], "cpu.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], _("(CPU_definition)"), &ctxt))) goto error; cpus[i] = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_HOST); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f4033eb..2d9890c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -911,7 +911,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->responseCode == 500 || (*response)->responseCode == 200) { (*response)->document = virXMLParseStringCtxt((*response)->content, - "esx.xml", + _("(esx execute response)"), &xpathContext); if ((*response)->document == NULL) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f849d05..7fd4192 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -603,7 +603,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, VIR_DEBUG("xml=%s", NULLSTR(xml)); - if (!(doc = virXMLParseStringCtxt(xml, "qemumigration.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xml, _("(qemu_migration_cookie)"), &ctxt))) goto cleanup; ret = qemuMigrationCookieXMLParse(mig, ctxt, flags); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index b9e551a..66608f8 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -641,7 +641,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; - if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain definition)"), + if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain_definition)"), &ctxt))) { goto cleanup; } diff --git a/tools/virsh.c b/tools/virsh.c index 430168c..3c6e65a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1307,7 +1307,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) flags = VIR_DOMAIN_AFFECT_CONFIG; /* extract current network device description */ - xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1454,7 +1454,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) goto cleanup; } - xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1663,7 +1663,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, _("(domain definition)"), &ctxt); + xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt); if (!xmldoc) goto cleanup; @@ -9042,7 +9042,7 @@ makeCloneXML(const char *origxml, const char *newname) xmlChar *newxml = NULL; int size; - doc = virXMLParseStringCtxt(origxml, _("(volume definition)"), &ctxt); + doc = virXMLParseStringCtxt(origxml, _("(volume_definition)"), &ctxt); if (!doc) goto cleanup; @@ -10833,7 +10833,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -10901,7 +10901,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -11288,7 +11288,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get interface information")); @@ -11755,7 +11755,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get disk information")); @@ -13025,7 +13025,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (!doc) continue; - xml = virXMLParseStringCtxt(doc, _("(domain snapshot)"), &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain_snapshot)"), &ctxt); if (!xml) continue; @@ -13186,7 +13186,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, _("(domain snapshot)"), &ctxt); + xmldoc = virXMLParseStringCtxt(xml, _("(domain_snapshot)"), &ctxt); if (!xmldoc) goto cleanup; -- 1.7.3.4

3 2

[libvirt] [PATCH v4] virsh: Increase device-detach intelligence
by Michal Privoznik 14 Sep '11

14 Sep '11

From: Michal Prívozník <mprivozn(a)redhat.com> Up to now users have to give a full XML description on input when device-detaching. If they omitted something it lead to unclear error messages (like generated MAC wasn't found, etc.). With this patch users can specify only those information which specify one device sufficiently precise. Remaining information is completed from domain. --- diff to v3: -change the superset search -tweak little snippets acording to Eric's review tools/virsh.c | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 262 insertions(+), 16 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 430168c..3e87dbb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -59,6 +59,7 @@ #include "threads.h" #include "command.h" #include "virkeycode.h" +#include "util/bitmap.h" static char *progname; @@ -10986,6 +10987,237 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) return true; } +/** + * Check if n1 is superset of n2, meaning n1 contains all elements and + * attributes as n2 at lest. Including children. + * @n1 first node + * @n2 second node + * return 1 in case n1 covers n2, 0 otherwise. + */ +static bool +vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { + xmlNodePtr child1, child2; + xmlAttrPtr attr; + char *prop1, *prop2; + bool found; + bool visited; + bool ret = false; + unsigned long n1_child_size, n1_iter; + virBitmapPtr bitmap; + + if (!n1 && !n2) + return true; + + if (!n1 || !n2) + return false; + + if (!xmlStrEqual(n1->name, n2->name)) + return true; + + /* Iterate over n2 attributes and check if n1 contains them*/ + attr = n2->properties; + while (attr) { + if (attr->type == XML_ATTRIBUTE_NODE) { + prop1 = virXMLPropString(n1, (const char *) attr->name); + prop2 = virXMLPropString(n2, (const char *) attr->name); + if (STRNEQ_NULLABLE(prop1, prop2)){ + xmlFree(prop1); + xmlFree(prop2); + return false; + } + xmlFree(prop1); + xmlFree(prop2); + } + attr = attr->next; + } + + n1_child_size = xmlChildElementCount(n1); + if (!n1_child_size) { + return (n1->type == XML_ELEMENT_NODE) ? true : false; + } + + if (!(bitmap = virBitmapAlloc(n1_child_size))) { + virReportOOMError(); + return false; + } + + child2 = n2->children; + while (child2) { + if (child2->type != XML_ELEMENT_NODE) { + child2 = child2->next; + continue; + } + + child1 = n1->children; + n1_iter = 0; + found = false; + while (child1) { + if (child1->type != XML_ELEMENT_NODE) { + child1 = child1->next; + continue; + } + + if (virBitmapGetBit(bitmap, n1_iter, &visited) < 0) { + vshError(NULL, "%s", _("Bad child elements counting.")); + goto cleanup; + } + + if (visited) { + child1 = child1->next; + n1_iter++; + continue; + } + + if (xmlStrEqual(child1->name, child2->name)) { + found = true; + if (virBitmapSetBit(bitmap, n1_iter) < 0) { + vshError(NULL, "%s", _("Bad child elements counting.")); + goto cleanup; + } + + if (!vshNodeIsSuperset(child1, child2)) + goto cleanup; + + break; + } + + child1 = child1->next; + n1_iter++; + } + + if (!found) + goto cleanup; + + child2 = child2->next; + } + + ret = true; + +cleanup: + virBitmapFree(bitmap); + return ret; +} + +/** + * vshCompleteXMLFromDomain: + * @ctl vshControl for error messages printing + * @dom domain + * @oldXML device XML before + * @newXML and after completion + * + * To given domain and (probably incomplete) device XML specification try to + * find such device in domain and complete missing parts. This is however + * possible only when given device XML is sufficiently precise so it addresses + * only one device. + * + * Returns -2 when no such device exists in domain, -3 when given XML selects many + * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML + * is touched only in case of success. + */ +static int +vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, + char **newXML) { + int funcRet = -1; + char *domXML = NULL; + xmlDocPtr domDoc = NULL, devDoc = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr domCtxt = NULL, devCtxt = NULL; + xmlNodePtr *devices = NULL; + xmlSaveCtxtPtr sctxt = NULL; + int devices_size; + char *xpath; + xmlBufferPtr buf = NULL; + + if (!(domXML = virDomainGetXMLDesc(dom, 0))) { + vshError(ctl, _("couldn't get XML description of domain %s"), + virDomainGetName(dom)); + goto cleanup; + } + + domDoc = virXMLParseStringCtxt(domXML, _("(domain definition)"), &domCtxt); + if (!domDoc) { + vshError(ctl, _("Failed to parse domain definition xml")); + goto cleanup; + } + + devDoc = virXMLParseStringCtxt(oldXML, _("(device definition)"), &devCtxt); + if (!devDoc) { + vshError(ctl, _("Failed to parse device definition xml")); + goto cleanup; + } + + node = xmlDocGetRootElement(devDoc); + + buf = xmlBufferCreate(); + if (!buf) { + vshError(ctl, "%s", _("out of memory")); + goto cleanup; + } + + xmlBufferCat(buf, BAD_CAST "/domain/devices/"); + xmlBufferCat(buf, node->name); + xpath = (char *) xmlBufferContent(buf); + /* Get all possible devices */ + devices_size = virXPathNodeSet(xpath, domCtxt, &devices); + xmlBufferEmpty(buf); + + if (devices_size < 0) { + /* error */ + vshError(ctl, "%s", _("error when selecting nodes")); + goto cleanup; + } else if (devices_size == 0) { + /* no such device */ + funcRet = -2; + goto cleanup; + } + + /* and refine */ + int i = 0; + int indx = -1; + for (i = 0; i < devices_size; i++) { + if (vshNodeIsSuperset(devices[i], node)) { + if (indx >= 0) { + funcRet = -3; /* ambiguous */ + goto cleanup; + } + indx = i; + } + } + + if (indx < 0) { + funcRet = -2; /* no such device */ + goto cleanup; + } + + vshDebug(ctl, VSH_ERR_DEBUG, "Found device at pos %d\n", indx); + + if (newXML) { + sctxt = xmlSaveToBuffer(buf, NULL, 0); + if (!sctxt) { + vshError(ctl, "%s", _("failed to create document saving context")); + goto cleanup; + } + + xmlSaveTree(sctxt, devices[indx]); + xmlSaveClose(sctxt); + *newXML = (char *) xmlBufferContent(buf); + buf->content = NULL; + } + + vshDebug(ctl, VSH_ERR_DEBUG, "Old xml:\n%s\nNew xml:\n%s\n", oldXML, *newXML); + + funcRet = 0; + +cleanup: + xmlBufferFree(buf); + VIR_FREE(devices); + xmlXPathFreeContext(devCtxt); + xmlXPathFreeContext(domCtxt); + xmlFreeDoc(devDoc); + xmlFreeDoc(domDoc); + VIR_FREE(domXML); + return funcRet; +} /* * "detach-device" command @@ -11006,10 +11238,11 @@ static const vshCmdOptDef opts_detach_device[] = { static bool cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; + virDomainPtr dom = NULL; const char *from = NULL; - char *buffer; + char *buffer = NULL, *new_buffer = NULL; int ret; + bool funcRet = false; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -11018,37 +11251,50 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { - virDomainFree(dom); - return false; - } + if (vshCommandOptString(cmd, "file", &from) <= 0) + goto cleanup; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - virDomainFree(dom); - return false; + goto cleanup; + } + + ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); + if (ret < 0) { + if (ret == -2) { + vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); + } else if (ret == -3) { + vshError(ctl, "%s", _("given XML selects too many devices. " + "Please, be more specific")); + } else { + /* vshCompleteXMLFromDomain() already printed error message, + * so nothing to do here. */ + } + goto cleanup; } if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, buffer, flags); + ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); } else { - ret = virDomainDetachDevice(dom, buffer); + ret = virDomainDetachDevice(dom, new_buffer); } - VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); - virDomainFree(dom); - return false; - } else { - vshPrint(ctl, "%s", _("Device detached successfully\n")); + goto cleanup; } + vshPrint(ctl, "%s", _("Device detached successfully\n")); + funcRet = true; + +cleanup: + VIR_FREE(new_buffer); + VIR_FREE(buffer); virDomainFree(dom); - return true; + return funcRet; } -- 1.7.3.4

2 1

[libvirt] [PATCH] make: Fix 'make syntax-check' failing.
by Peter Krempa 14 Sep '11

14 Sep '11

Commit 2a0d75e5 added file python/libvirt-qemu-override.c that contains code that does not pass "make syntax-check". This patch adds an exception for this file and the check. prohibit_always_true_header_tests python/libvirt-qemu-override.c:17:#undef HAVE_PTHREAD_H maint.mk: do not test the above HAVE_<header>_H symbol(s); with the corresponding gnulib module, they are always true make: *** [sc_prohibit_always_true_header_tests] Error 1 --- cfg.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index 1bd9891..39eb49e 100644 --- a/cfg.mk +++ b/cfg.mk @@ -689,7 +689,7 @@ exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \ exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/util\.c$$ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ - ^python/(libvirt-override|typewrappers)\.c$$ + ^python/(libvirt-override|libvirt-qemu-override|typewrappers)\.c$$ exclude_file_name_regexp--sc_prohibit_asprintf = \ ^(bootstrap.conf$$|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$) -- 1.7.3.4

3 3

[libvirt] [PATCH] xml: Clean up rest of virtual XML document names for XML strings
by Peter Krempa 14 Sep '11

14 Sep '11

Commit 498d783387389bfd74437bf84374583f5a3d3bf6 cleans up some of virtual file names for parsing strings in memory. This patch cleans up (hopefuly) the rest forgotten by the first patch. --- src/conf/domain_conf.c | 4 ++-- src/conf/interface_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/conf/secret_conf.c | 2 +- src/conf/storage_conf.c | 6 +++--- src/cpu/cpu.c | 4 ++-- src/esx/esx_vi.c | 2 +- src/qemu/qemu_migration.c | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 11755fe..886aa53 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5739,7 +5739,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, xmlXPathContextPtr ctxt = NULL; virDomainDeviceDefPtr dev = NULL; - if (!(xml = virXMLParseStringCtxt(xmlStr, "device.xml", &ctxt))) { + if (!(xml = virXMLParseStringCtxt(xmlStr, _("(device definition)"), &ctxt))) { goto error; } node = ctxt->node; @@ -11573,7 +11573,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, int active; char *tmp; - xml = virXMLParseCtxt(NULL, xmlStr, "domainsnapshot.xml", &ctxt); + xml = virXMLParseCtxt(NULL, xmlStr, _("(domain snapshot)"), &ctxt); if (!xml) { return NULL; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 10377e7..d320c81 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -864,7 +864,7 @@ virInterfaceDefParse(const char *xmlStr, xmlDocPtr xml; virInterfaceDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "interface.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(interface definition)")))) { def = virInterfaceDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e055094..487d28c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1084,7 +1084,7 @@ virNetworkDefParse(const char *xmlStr, xmlDocPtr xml; virNetworkDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "network.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(network definition)")))) { def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 6b0ef50..b584356 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1231,7 +1231,7 @@ virNodeDeviceDefParse(const char *str, xmlDocPtr xml; virNodeDeviceDefPtr def = NULL; - if ((xml = virXMLParse(filename, str, "device.xml"))) { + if ((xml = virXMLParse(filename, str, _("(node device definition)")))) { def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), create); xmlFreeDoc(xml); } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 04bfa22..035f7e4 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2119,7 +2119,7 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED, virNWFilterDefPtr def = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "nwfilter.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter definition")))) { def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 105afbe..39b20bf 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -195,7 +195,7 @@ virSecretDefParse(const char *xmlStr, xmlDocPtr xml; virSecretDefPtr ret = NULL; - if ((xml = virXMLParse(filename, xmlStr, "secret.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(definition of secret)")))) { ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 1e7da69..2279a20 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -505,7 +505,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, xmlXPathContextPtr xpath_ctxt = NULL; virStoragePoolSourcePtr def = NULL, ret = NULL; - if (!(doc = virXMLParseStringCtxt(srcSpec, "srcSpec.xml", &xpath_ctxt))) { + if (!(doc = virXMLParseStringCtxt(srcSpec, _("(storage source specification)"), &xpath_ctxt))) { goto cleanup; } @@ -765,7 +765,7 @@ virStoragePoolDefParse(const char *xmlStr, virStoragePoolDefPtr ret = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(storage pool definition)")))) { ret = virStoragePoolDefParseNode(xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } @@ -1146,7 +1146,7 @@ virStorageVolDefParse(virStoragePoolDefPtr pool, virStorageVolDefPtr ret = NULL; xmlDocPtr xml; - if ((xml = virXMLParse(filename, xmlStr, "storage.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(storage volume definition)")))) { ret = virStorageVolDefParseNode(pool, xml, xmlDocGetRootElement(xml)); xmlFreeDoc(xml); } diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index b47f078..5158bb8 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -76,7 +76,7 @@ cpuCompareXML(virCPUDefPtr host, VIR_DEBUG("host=%p, xml=%s", host, NULLSTR(xml)); - if (!(doc = virXMLParseStringCtxt(xml, "cpu.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xml, _("(CPU definition)"), &ctxt))) goto cleanup; cpu = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_AUTO); @@ -304,7 +304,7 @@ cpuBaselineXML(const char **xmlCPUs, goto no_memory; for (i = 0; i < ncpus; i++) { - if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], "cpu.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xmlCPUs[i], _("(CPU definition)"), &ctxt))) goto error; cpus[i] = virCPUDefParseXML(ctxt->node, ctxt, VIR_CPU_TYPE_HOST); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f4033eb..2d9890c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -911,7 +911,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->responseCode == 500 || (*response)->responseCode == 200) { (*response)->document = virXMLParseStringCtxt((*response)->content, - "esx.xml", + _("(esx execute response)"), &xpathContext); if ((*response)->document == NULL) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f849d05..42324b0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -603,7 +603,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, VIR_DEBUG("xml=%s", NULLSTR(xml)); - if (!(doc = virXMLParseStringCtxt(xml, "qemumigration.xml", &ctxt))) + if (!(doc = virXMLParseStringCtxt(xml, _("(qemu migration cookie)"), &ctxt))) goto cleanup; ret = qemuMigrationCookieXMLParse(mig, ctxt, flags); -- 1.7.3.4

2 2

[libvirt] libvirt on Android
by Stefan Scheglmann 14 Sep '11

14 Sep '11

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, i am new to this list and i am wondering if anybody already tried to port libvirt to android via ndk. To be able to implement a virt-manager like app for android based systems. Greets & thx Stefan - -- Stefan Scheglmann WeST Research Group University of Koblenz-Landau Universitaetsstrasse 1 D-56070 Koblenz Tel.: + 49 261 287 2718 Fax: + 49 261 287 100 2718 schegi(a)uni-koblenz.de http://west.uni-koblenz.de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJOcKU3AAoJEIaCIv/n5qljS7YIAJ4QG95COQf2wq+ujzOSLtkf gEbfKVACJo6sVIj/hcqhCCWuwsljk/Fc9vGE43oBTCjs7pk5OW5ama5A8C2VIXn6 aLWm/KIWSezciVtr4GNliQ4DDcSzC6OKgiE1dNWkDf3+J+x3NpGeUNE3nlSvRBUg QmOqky1XF1CmduMPiAmqR/5mKOJS2imfPBtAF50sWx1pDemYbV2u32GAdntQRuy+ vDhD78KLmI2sRZi3jYLblFpaFKoG2Movu1QxhmVBJFe/lxaqtr25iwnoUdVIxHFU scki3ybMWBosTm7Na5mvCKE1MeFg+6/ZoswpUHJb5F2gN4v3byLcSOEgJtnNWig= =aDzr -----END PGP SIGNATURE-----

4 3

[libvirt] [PATCH RFC v2] virsh: Add option to undefine storage with domains
by Peter Krempa 13 Sep '11

13 Sep '11

Add an option for virsh undefine command, to remove associated storage volumes while undefining a domain. This patch alows the user to remove associated (libvirt managed ) storage volumes while undefining a domain. The new option --storage for the undefine command takes a string argument that consists of comma separated list of target volumes to be undefined. Each of the volumes is removed from the domain definition and afterwards removed from storage pools. If a volume is not part of a storage pool, the user is warned to remove the volume in question himself. Option --wipe-storage may be specified along with this, that ensures the image is wiped before removing. --- tools/virsh.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 12 ++++ 2 files changed, 179 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3b060bf..67125c9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1858,6 +1858,9 @@ static const vshCmdInfo info_undefine[] = { static const vshCmdOptDef opts_undefine[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name or uuid")}, {"managed-save", VSH_OT_BOOL, 0, N_("remove domain managed state file")}, + {"storage", VSH_OT_DATA, VSH_OFLAG_NONE, + N_("remove associated storage volumes (comma separated list of targets) (see domblklist)")}, + {"wipe-storage", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("wipe data on the removed volumes")}, {"snapshots-metadata", VSH_OT_BOOL, 0, N_("remove all domain snapshot metadata, if inactive")}, {NULL, 0, 0, NULL} @@ -1874,6 +1877,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* User-requested actions. */ bool managed_save = vshCommandOptBool(cmd, "managed-save"); bool snapshots_metadata = vshCommandOptBool(cmd, "snapshots-metadata"); + bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); + bool remove_volumes = false; /* Positive if these items exist. */ int has_managed_save = 0; int has_snapshots_metadata = 0; @@ -1883,6 +1888,25 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) bool snapshots_safe = false; int rc = -1; int running; + /* list of volumes to remove along with this domain */ + const char *volumes_arg = NULL; + char *volumes = NULL; + const char *volume; + char *saveptr = NULL; + char *def = NULL; + char *xpath_str = NULL; + char *volume_path = NULL; + char *device_desc = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr ctxt_dom = NULL; + xmlXPathContextPtr ctxt_dev = NULL; + xmlBufferPtr xml_buf = NULL; + xmlDocPtr xml_dom = NULL; + xmlDocPtr xml_dev = NULL; + virStorageVolPtr vol = NULL; + bool wipe_failed; + + virBuffer xpath = VIR_BUFFER_INITIALIZER; if (managed_save) { flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; @@ -1893,12 +1917,19 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) snapshots_safe = true; } + if (!vshConnectionUsability(ctl, ctl->conn)) return false; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; + /* check if a string that should contain list of volumes to remove is present */ + if (vshCommandOptString(cmd, "storage", &volumes_arg) > 0) { + remove_volumes = true; + volumes = vshStrdup(ctl, volumes_arg); + } + /* Do some flag manipulation. The goal here is to disable bits * from flags to reduce the likelihood of a server rejecting * unknown flag bits, as well as to track conditions which are @@ -1961,6 +1992,138 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) snapshots_safe = true; } + /* try to undefine storage volumes associated with this domain, if it's requested */ + if (remove_volumes) { + if (running) { + vshError(ctl, _("Refusing to remove storage for running domain")); + goto cleanup; + } + + /* check if managed save is being removed, as the domain removal + * might fail and leave it without storage */ + if (has_managed_save && !managed_save) { + vshError(ctl, "%s", + _("Refusing to undefine with storage volumes while domain managed save " + "image exists")); + goto cleanup; + } + + /* get domain description */ + if (!(def = virDomainGetXMLDesc(dom, 0))) + goto cleanup; + + xml_dom = virXMLParseStringCtxt(def, _("(domain definition)"), &ctxt_dom); + VIR_FREE(def); + + if (!xml_dom) + goto cleanup; + + xml_buf = xmlBufferCreate(); + if (!xml_buf) + goto cleanup; + + /* tokenize the string of devices to remove */ + volume = strtok_r(volumes, ",", &saveptr); + + while (volume) { + + /* find and try to remove each volume selected by the user */ + virBufferAsprintf(&xpath, "/domain/devices/disk[target[@dev='%s']]", volume); + xpath_str = virBufferContentAndReset(&xpath); + + node = virXPathNode(xpath_str, ctxt_dom); + VIR_FREE(xpath_str); + if (!node) { + vshPrint(ctl, _("Volume %s not found. Skipping\n"), volume); + goto next_volume; + } + + xmlBufferEmpty(xml_buf); + + /* dump and detatch the device from persistent conf. */ + + if (xmlNodeDump(xml_buf, xml_dom, node, 0, 0) < 0) { + vshError(ctl, _("Failed to create device description")); + goto cleanup; + } + + device_desc = (char *) xmlBufferContent(xml_buf); + + if (virDomainDetachDeviceFlags(dom, device_desc, VIR_DOMAIN_AFFECT_CURRENT) < 0) { + vshError(ctl, + _("Failed to remove storage device '%s' from definition. " + "If domain undefinition fails, this domain may remain inconsistent"), + volume); + } + + xml_dev = virXMLParseStringCtxt(device_desc, + _("(storage volume definition)"), + &ctxt_dev); + + /* find the target and lookup the image in storage pools */ + if (!xml_dev) + goto cleanup; + + volume_path = virXPathString("string(//disk/source/@file" + "| //disk/source/@dev" + "| //disk/source/@dir" + "| //disk/source/@name)", ctxt_dev); + + if (!volume_path) { + vshPrint(ctl, + _("Virtual storage device '%s' has no associated volume. Skipping."), + volume); + goto next_volume; + } + + vol = virStorageVolLookupByPath(ctl->conn, volume_path); + + if (!vol) { + vshPrint(ctl, + _("Storage volume '%s' is not managed by libvirt. Remove it manualy.\n"), + volume_path); + goto next_volume; + } + + wipe_failed = false; + + /* wipe the volume */ + if (wipe_storage) { + vshPrint(ctl, _("Wiping volume '%s' ... "), volume_path); + if (virStorageVolWipe(vol, 0) < 0) { + vshPrint(ctl, _("Failed!\n")); + wipe_failed = true; + } else { + vshPrint(ctl, _("Done.\n")); + } + } + + + /* delete the volume */ + if (wipe_failed || virStorageVolDelete(vol, 0) < 0) { + vshError(ctl, + _("Failed to remove storage volume '%s'. Remove it manualy."), + volume_path); + } else { + vshPrint(ctl, _("Volume '%s' deleted.\n"), volume_path); + } + + +next_volume: + VIR_FREE(volume_path); + if (vol) + virStorageVolFree(vol); + vol = NULL; + xmlXPathFreeContext(ctxt_dev); + ctxt_dev = NULL; + xmlFreeDoc(xml_dev); + xml_dev = NULL; + + volume = strtok_r(NULL, ",", &saveptr); + } + /* domain's storage removed */ + } + /* Generally we want to try the new API first. However, while * virDomainUndefineFlags was introduced at the same time as * VIR_DOMAIN_UNDEFINE_MANAGED_SAVE in 0.9.4, the @@ -2013,6 +2176,10 @@ out: } cleanup: + xmlFreeDoc(xml_dom); + xmlBufferFree(xml_buf); + xmlXPathFreeContext(ctxt_dom); + VIR_FREE(volumes); virDomainFree(dom); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..87a1e7d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1067,6 +1067,7 @@ Output the device used for the TTY console of the domain. If the information is not available the processes will provide an exit code of 1. =item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata] +[I<--storage volumes>] [I<--wipe-storage>] Undefine a domain. If the domain is running, this converts it to a transient domain, without stopping it. If the domain is inactive, @@ -1082,6 +1083,17 @@ domain. Without the flag, attempts to undefine an inactive domain with snapshot metadata will fail. If the domain is active, this flag is ignored. +The I<--storage> flag takes a parameter volumes, that is a comma separated +list of volume target names of storage volumes to be removed along with +the undefined domain. This operation is valid only for a inactive domain. +If one or more of the operations while removing disk storage fail, the +domain may still be undefined and some volumes may remain undeleted. +(See B<domblklist> for list of target names associated to a domain). +Example: --storage vda,vdb,vdc + +The Flag I<--wipe-storage> specifies, that the storage volumes should be +wiped before removal. + NOTE: For an inactive domain, the domain name or UUID must be used as the I<domain-id>. -- 1.7.3.4

2 1

[libvirt] [PATCH 1/2] Add VIR_TYPED_PARAM_STRING
by Hu Tao 13 Sep '11

13 Sep '11

--- daemon/remote.c | 15 +++++++++++++++ include/libvirt/libvirt.h.in | 4 +++- src/remote/remote_driver.c | 15 +++++++++++++++ src/remote/remote_protocol.x | 2 ++ 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 0f088c6..afceab7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -615,6 +615,13 @@ remoteSerializeTypedParameters(virTypedParameterPtr params, case VIR_TYPED_PARAM_BOOLEAN: val[i].value.remote_typed_param_value_u.b = params[i].value.b; break; + case VIR_TYPED_PARAM_STRING: + val[i].value.remote_typed_param_value_u.s = strdup(params[i].value.s); + if (val[i].value.remote_typed_param_value_u.s == NULL) { + virReportOOMError(); + goto cleanup; + } + break; default: virNetError(VIR_ERR_RPC, _("unknown parameter type: %d"), params[i].type); @@ -693,6 +700,14 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, params[i].value.b = args_params_val[i].value.remote_typed_param_value_u.b; break; + case VIR_TYPED_PARAM_STRING: + params[i].value.s = + strdup(args_params_val[i].value.remote_typed_param_value_u.s); + if (params[i].value.s == NULL) { + virReportOOMError(); + goto cleanup; + } + break; default: virNetError(VIR_ERR_INTERNAL_ERROR, _("unknown parameter type: %d"), params[i].type); diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 53a2f7d..da2080e 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -481,7 +481,8 @@ typedef enum { VIR_TYPED_PARAM_LLONG = 3, /* long long case */ VIR_TYPED_PARAM_ULLONG = 4, /* unsigned long long case */ VIR_TYPED_PARAM_DOUBLE = 5, /* double case */ - VIR_TYPED_PARAM_BOOLEAN = 6 /* boolean(character) case */ + VIR_TYPED_PARAM_BOOLEAN = 6, /* boolean(character) case */ + VIR_TYPED_PARAM_STRING = 7 /* string case */ } virTypedParameterType; /** @@ -512,6 +513,7 @@ struct _virTypedParameter { unsigned long long int ul; /* type is ULLONG */ double d; /* type is DOUBLE */ char b; /* type is BOOLEAN */ + char *s; /* type is STRING */ } value; /* parameter value */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 603d589..8f9d09c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1276,6 +1276,13 @@ remoteSerializeTypedParameters(virTypedParameterPtr params, case VIR_TYPED_PARAM_BOOLEAN: val[i].value.remote_typed_param_value_u.b = params[i].value.b; break; + case VIR_TYPED_PARAM_STRING: + val[i].value.remote_typed_param_value_u.s = strdup(params[i].value.s); + if (val[i].value.remote_typed_param_value_u.s == NULL) { + virReportOOMError(); + goto cleanup; + } + break; default: remoteError(VIR_ERR_RPC, _("unknown parameter type: %d"), params[i].type); @@ -1347,6 +1354,14 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, params[i].value.b = ret_params_val[i].value.remote_typed_param_value_u.b; break; + case VIR_TYPED_PARAM_STRING: + params[i].value.s = + strdup(ret_params_val[i].value.remote_typed_param_value_u.s); + if (params[i].value.s == NULL) { + virReportOOMError(); + goto cleanup; + } + break; default: remoteError(VIR_ERR_RPC, _("unknown parameter type: %d"), params[i].type); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 8f68808..c22a566 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -314,6 +314,8 @@ union remote_typed_param_value switch (int type) { double d; case VIR_TYPED_PARAM_BOOLEAN: int b; + case VIR_TYPED_PARAM_STRING: + remote_nonnull_string s; }; struct remote_typed_param { -- 1.7.3.1

4 6

[libvirt] [PATCH v3] virsh: Increase device-detach intelligence
by Michal Privoznik 13 Sep '11

13 Sep '11

From: Michal Prívozník <mprivozn(a)redhat.com> Up to now users have to give a full XML description on input when device-detaching. If they omitted something it lead to unclear error messages (like generated MAC wasn't found, etc.). With this patch users can specify only those information which specify one device sufficiently precise. Remaining information is completed from domain. --- diff to v2: -rebase to current HEAD diff to v1: -rebase to current HEAD -add a little bit comments tools/virsh.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 250 insertions(+), 16 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1ad84a2..aae8e4e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10351,6 +10351,226 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) return true; } +/** + * Check if n1 is superset of n2, meaning n1 contains all elements and + * attributes as n2 at lest. Including children. + * @n1 first node + * @n2 second node + * return 1 in case n1 covers n2, 0 otherwise. + */ +static int +vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { + xmlNodePtr child1, child2; + xmlAttrPtr attr1, attr2; + int found; + + if (!n1 && !n2) + return 1; + + if (!n1 || !n2) + return 0; + + if (!xmlStrEqual(n1->name, n2->name)) + return 0; + + /* Iterate over n2 attributes and check if n1 contains them*/ + attr2 = n2->properties; + while (attr2) { + if (attr2->type == XML_ATTRIBUTE_NODE) { + attr1 = n1->properties; + found = 0; + while (attr1) { + if (xmlStrEqual(attr1->name, attr2->name)) { + found = 1; + break; + } + attr1 = attr1->next; + } + if (!found) + return 0; + if (!xmlStrEqual(BAD_CAST virXMLPropString(n1, (const char *) attr1->name), + BAD_CAST virXMLPropString(n2, (const char *) attr2->name))) + return 0; + } + attr2 = attr2->next; + } + + /* and now iterate over n2 children */ + child2 = n2->children; + while (child2) { + if (child2->type == XML_ELEMENT_NODE) { + child1 = n1->children; + found = 0; + while (child1) { + if (child1->type == XML_ELEMENT_NODE && + xmlStrEqual(child1->name, child2->name)) { + found = 1; + break; + } + child1 = child1->next; + } + if (!found) + return 0; + if (!vshNodeIsSuperset(child1, child2)) + return 0; + } + child2 = child2->next; + } + + return 1; +} + +/** + * To given domain and (probably incomplete) device XML specification try to + * find such device in domain and complete missing parts. This is however + * possible when given device XML is sufficiently precise so it addresses only + * one device. + * @ctl vshControl for error messages printing + * @dom domain + * @oldXML device XML before + * @newXML and after completion + * Returns -2 when no such device exists in domain, -3 when given XML selects many + * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML + * is touched only in case of success. + */ +static int +vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, + char **newXML) { + int funcRet = -1; + char *domXML = NULL; + xmlDocPtr domDoc = NULL, devDoc = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr domCtxt = NULL, devCtxt = NULL; + xmlNodePtr *devices = NULL; + xmlSaveCtxtPtr sctxt = NULL; + int devices_size; + char *xpath; + xmlBufferPtr buf = NULL; + + if (!(domXML = virDomainGetXMLDesc(dom, 0))) { + vshError(ctl, _("couldn't get XML description of domain %s"), + virDomainGetName(dom)); + goto cleanup; + } + + if (!(domDoc = xmlReadDoc(BAD_CAST domXML, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + vshError(ctl, "%s", _("could not parse domain XML")); + goto cleanup; + } + + if (!(devDoc = xmlReadDoc(BAD_CAST oldXML, "device.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + vshError(ctl, "%s", _("could not parse device XML")); + goto cleanup; + } + + node = xmlDocGetRootElement(domDoc); + if (!node) { + vshError(ctl, "%s", _("failed to get domain root element")); + goto cleanup; + } + + domCtxt = xmlXPathNewContext(domDoc); + if (!domCtxt) { + vshError(ctl, "%s", _("failed to create context on domain XML")); + goto cleanup; + } + domCtxt->node = node; + + node = xmlDocGetRootElement(devDoc); + if (!node) { + vshError(ctl, "%s", _("failed to get device root element")); + goto cleanup; + } + + devCtxt = xmlXPathNewContext(devDoc); + if (!devCtxt) { + vshError(ctl, "%s", _("failed to create context on device XML")); + goto cleanup; + } + devCtxt->node = node; + + buf = xmlBufferCreate(); + if (!buf) { + vshError(ctl, "%s", _("out of memory")); + goto cleanup; + } + + xmlBufferCat(buf, BAD_CAST "/domain/devices/"); + xmlBufferCat(buf, node->name); + xpath = (char *) xmlBufferContent(buf); + /* Get all possible devices */ + devices_size = virXPathNodeSet(xpath, domCtxt, &devices); + xmlBufferEmpty(buf); + + if (devices_size < 0) { + /* error */ + vshError(ctl, "%s", _("error when selecting nodes")); + goto cleanup; + } else if (devices_size == 0) { + /* no such device */ + funcRet = -2; + goto cleanup; + } + + /* and refine */ + int i = 0; + while (i < devices_size) { + if (!vshNodeIsSuperset(devices[i], node)) { + if (devices_size == 1) { + VIR_FREE(devices); + devices_size = 0; + } else { + memmove(devices + i, devices + i + 1, + sizeof(*devices) * (devices_size-i-1)); + devices_size--; + if (VIR_REALLOC_N(devices, devices_size) < 0) { + /* ignore, harmless */ + } + } + } else { + i++; + } + } + + if (!devices_size) { + /* no such device */ + funcRet = -2; + goto cleanup; + } else if (devices_size > 1) { + /* ambiguous */ + funcRet = -3; + goto cleanup; + } + + if (newXML) { + sctxt = xmlSaveToBuffer(buf, NULL, 0); + if (!sctxt) { + vshError(ctl, "%s", _("failed to create document saving context")); + goto cleanup; + } + + xmlSaveTree(sctxt, devices[0]); + xmlSaveClose(sctxt); + *newXML = (char *) xmlBufferContent(buf); + buf->content = NULL; + } + + funcRet = 0; + +cleanup: + xmlBufferFree(buf); + VIR_FREE(devices); + xmlXPathFreeContext(devCtxt); + xmlXPathFreeContext(domCtxt); + xmlFreeDoc(devDoc); + xmlFreeDoc(domDoc); + VIR_FREE(domXML); + return funcRet; +} /* * "detach-device" command @@ -10371,10 +10591,11 @@ static const vshCmdOptDef opts_detach_device[] = { static bool cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; + virDomainPtr dom = NULL; const char *from = NULL; - char *buffer; + char *buffer = NULL, *new_buffer = NULL; int ret; + bool funcRet = false; unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -10383,37 +10604,50 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "file", &from) <= 0) { - virDomainFree(dom); - return false; - } + if (vshCommandOptString(cmd, "file", &from) <= 0) + goto cleanup; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - virDomainFree(dom); - return false; + goto cleanup; + } + + ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); + if (ret < 0) { + if (ret == -2) { + vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); + } else if (ret == -3) { + vshError(ctl, "%s", _("given XML selects too many devices. " + "Please, be more specific")); + } else { + /* vshCompleteXMLFromDomain() already printed error message, + * so nothing to do here. */ + } + goto cleanup; } if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, buffer, flags); + ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); } else { - ret = virDomainDetachDevice(dom, buffer); + ret = virDomainDetachDevice(dom, new_buffer); } - VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); - virDomainFree(dom); - return false; - } else { - vshPrint(ctl, "%s", _("Device detached successfully\n")); + goto cleanup; } + vshPrint(ctl, "%s", _("Device detached successfully\n")); + funcRet = true; + +cleanup: + VIR_FREE(new_buffer); + VIR_FREE(buffer); virDomainFree(dom); - return true; + return funcRet; } -- 1.7.3.4

2 2

[libvirt] [PATCH] snapshot: fix double free issue for qemuImgBinary value in qemu_driver
by Guannan Ren 13 Sep '11

13 Sep '11

*src/qemu/qemu_driver.c: in qemuDomainSnapshotForEachQcow() it will free up the memory of qemu_driver->qemuImgBinary in the cleanup tag which leads to the garbage value of qemuImgBinary and libvirtd crash when running "virsh snapshot-create" command next time. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b94d1c4..bbe113f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1735,7 +1735,7 @@ qemuDomainSnapshotForEachQcow2(struct qemud_driver *driver, ret = skipped ? 1 : 0; cleanup: - VIR_FREE(qemuimgarg[0]); + qemuimgarg[0] = NULL; return ret; } -- 1.7.1

2 2

[libvirt] [PATCH] Do not log invalid operations in libvirtd logs
by Daniel Veillard 13 Sep '11

13 Sep '11

This is a bit painful for example when starting virt-manager it tends to clutter libvirtd.log with invalid operation on cpu pinning for defined but not running domains. A priori those kind of errors don't indicate an error when executing the command but on a precondition for running the API, and honnestly while the application should report it, logging it as an error in libvirtd.log is not really useful, Related bug: https://bugzilla.redhat.com/show_bug.cgi?id=590807 Daniel diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 1a9fd82..c708ff7 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -357,6 +357,7 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority) case VIR_ERR_NO_NWFILTER: case VIR_ERR_NO_SECRET: case VIR_ERR_NO_DOMAIN_SNAPSHOT: + case VIR_ERR_OPERATION_INVALID: return VIR_LOG_DEBUG; } -- 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/

2 2

[libvirt] [PATCH v5] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 12 Sep '11

12 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. This patch also fixes "error: unknown procedure: 243" while communicating with an old libvirtd. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v4: - Fields are printed in order established by previous versions - Fix translation macros - Run old api unconditionaly (while comunicating with old libvirtd "error: unknown procedure: 243" occured) - Remove redundant field description from command help and add reference to man page. - Fix formating (unnecessary space after function name) - Fix man page, mentioning that fields may be missig. Changes to v3: - Add units to duration values - Add missing write doc/stranslation - Add translation from new api names to legacy names used in previous versions in virsh Changes to v2: - Modify for new fields in virDomainBlockStatsFlags Changes to v1: - Rebase to current head --- tools/virsh.c | 234 +++++++++++++++++++++++++++++++++++++++++++------------ tools/virsh.pod | 20 +++++- 2 files changed, 204 insertions(+), 50 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3b060bf..766c9be 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -369,6 +369,8 @@ static const char *vshDomainStateReasonToString(int state, int reason); static const char *vshDomainControlStateToString(int state); static const char *vshDomainVcpuStateToString(int state); static bool vshConnectionUsability(vshControl *ctl, virConnectPtr conn); +static virTypedParameterPtr vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count); +static char *vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item); static char *editWriteToTempFile (vshControl *ctl, const char *doc); static int editFile (vshControl *ctl, const char *filename); @@ -1054,16 +1056,37 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain. See man page or use --human for explanation of fields\n\n")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; +struct _domblkstat_sequence { + const char *field; /* field name */ + const char *legacy; /* legacy name from previous releases */ + const char *human; /* human-friendly explanation */ +}; + +/* sequence of values for output to honor legacy format from previous versions */ +static const struct _domblkstat_sequence domblkstat_output[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, "rd_req", N_("number of read operations: ") }, /* 0 */ + { VIR_DOMAIN_BLOCK_STATS_READ_BYTES, NULL, N_("number of read bytes: ") }, /* 1 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "wr_req", N_("number of write operations: ") }, /* 2 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, NULL, N_("number of bytes written: ") }, /* 3 */ + { VIR_DOMAIN_BLOCK_STATS_ERRS, NULL, N_("error count: ") }, /* 4 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ, NULL, N_("number of flush operations: ") }, /* 5 */ + { VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES, NULL, N_("total duration of reads (ns): ") }, /* 6 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES, NULL, N_("total duration of writes (ns): ") }, /* 7 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES, NULL, N_("total duration of flushes (ns):") }, /* 8 */ + { NULL, NULL, NULL } +}; + static bool cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { @@ -1071,8 +1094,13 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; virTypedParameterPtr params = NULL; + virTypedParameterPtr par = NULL; + char *value = NULL; + const char *field = NULL; int rc, nparams = 0; + int i = 0; bool ret = false; + bool human = vshCommandOptBool(cmd, "human"); /* enable human readable output */ if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1090,76 +1118,105 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) * then. */ if (rc < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { - virshReportError(ctl); + /* try the older api, if the newer returns an error */ + virFreeError(last_error); + last_error = NULL; + + if (virDomainBlockStats (dom, device, &stats, + sizeof stats) == -1) { + vshError(ctl, _("Failed to get block stats %s %s"), + name, device); goto cleanup; - } else { - virFreeError(last_error); - last_error = NULL; + } - if (virDomainBlockStats (dom, device, &stats, - sizeof stats) == -1) { - vshError(ctl, _("Failed to get block stats %s %s"), - name, device); - goto cleanup; - } + if (human) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + vshPrint(ctl, "%s %lld\n", _(domblkstat_output[0].human), stats.rd_req); if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + vshPrint(ctl, "%s %lld\n", _(domblkstat_output[1].human), stats.rd_bytes); if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + vshPrint(ctl, "%s %lld\n", _(domblkstat_output[2].human), stats.wr_req); if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + vshPrint(ctl, "%s %lld\n", _(domblkstat_output[3].human), stats.wr_bytes); if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + vshPrint(ctl, "%s %lld\n", _(domblkstat_output[4].human), stats.errs); + } else { + + if (stats.rd_req >= 0) + vshPrint(ctl, "%s rd_req %lld\n", device, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint(ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint(ctl, "%s wr_req %lld\n", device, stats.wr_req); + + if (stats.wr_bytes >= 0) + vshPrint(ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint(ctl, "%s errs %lld\n", device, stats.errs); } } else { - params = vshMalloc(ctl, sizeof(*params) * nparams); - memset(params, 0, sizeof(*params) * nparams); + params = vshCalloc(ctl, nparams, sizeof(*params)); if (virDomainBlockStatsFlags (dom, device, params, &nparams, 0) < 0) { vshError(ctl, _("Failed to get block stats %s %s"), name, device); goto cleanup; } - int i; - /* XXX: The output sequence will be different. */ + /* set for prettier output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; + } + + /* at first print all known values in desired order */ + for (i = 0; domblkstat_output[i].field != NULL; i++) { + if (!(par = vshFindTypedParamByName(domblkstat_output[i].field, + params, + nparams))) + continue; + + if (!(value = vshGetTypedParamValue(ctl, par))) + continue; + + /* to print other not supported fields, mark the already printed */ + par->field[0] = '\0'; /* set the name to empty string */ + + /* print the value */ + field = NULL; + + if (human) + field = _(domblkstat_output[i].human); + else + field = domblkstat_output[i].legacy; + + if (!field) + field = domblkstat_output[i].field; + + vshPrint(ctl, "%s %s %s\n", device, field, value); + + VIR_FREE(value); + } + + /* go through the fields again, looking for fields that were not printed*/ for (i = 0; i < nparams; i++) { - switch(params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint (ctl, "%s %s %d\n", device, - params[i].field, params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint (ctl, "%s %s %u\n", device, - params[i].field, params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint (ctl, "%s %s %lld\n", device, - params[i].field, params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint (ctl, "%s %s %llu\n", device, - params[i].field, params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint (ctl, "%s %s %f\n", device, - params[i].field, params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint (ctl, "%s %s %s\n", device, - params[i].field, params[i].value.b ? _("yes") : _("no")); - break; - default: - vshError(ctl, _("unimplemented block statistics parameter type")); - } + if (strlen(params[i].field) == 0) + continue; + if (!(value = vshGetTypedParamValue(ctl, params+i))) + continue; + + vshPrint(ctl, "%s %s %s\n", device, params[i].field, value); + VIR_FREE(value); } } @@ -15185,6 +15242,85 @@ vshDomainStateReasonToString(int state, int reason) return N_("unknown"); } +static char * +vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) +{ + int size = 0; + char *str = NULL; + + if (!ctl || !item) + return NULL; + + switch(item->type) { + case VIR_TYPED_PARAM_INT: + size = snprintf(NULL, 0, "%d", item->value.i); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%d", item->value.i); + return str; + break; + + case VIR_TYPED_PARAM_UINT: + size = snprintf(NULL, 0, "%u", item->value.ui); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%u", item->value.ui); + return str; + break; + + case VIR_TYPED_PARAM_LLONG: + size = snprintf(NULL, 0, "%lld", item->value.l); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%lld", item->value.l); + return str; + break; + + case VIR_TYPED_PARAM_ULLONG: + size = snprintf(NULL, 0, "%llu", item->value.ul); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%llu", item->value.ul); + return str; + break; + + case VIR_TYPED_PARAM_DOUBLE: + size = snprintf(NULL, 0, "%f", item->value.d); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%f", item->value.d); + return str; + break; + + case VIR_TYPED_PARAM_BOOLEAN: + size = snprintf(NULL, 0, "%s", item->value.b ? _("yes") : _("no")); + str = vshMalloc(ctl, size+1); + snprintf(str, size+1, "%s", item->value.b ? _("yes") : _("no")); + return str; + break; + + default: + vshError(ctl, _("unimplemented block statistics parameter type")); + } + + return NULL; +} + +static virTypedParameterPtr +vshFindTypedParamByName(const char *name, virTypedParameterPtr list, int count) +{ + int i = count; + virTypedParameterPtr found = list; + + if (!list || !name) + return NULL; + + while (i-- > 0) { + if (STREQ(name, found->field)) + return found; + + found++; /* go to next struct in array */ + } + + /* not found */ + return NULL; +} + static const char * vshDomainControlStateToString(int state) { diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..519e60b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,13 +501,31 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). +Use I<--human> for a more human readable output. + +Availabilty of these fields depends on hypervisor. Unsupported fields are +missing from the output. Other fields may appear if comunicating with a newer +version of libvirtd. + +B<Explanation of fields> (fields appear in the folowing order): + rd_req - count of read operations + rd_bytes - count of read bytes + wr_req - count of write operations + wr_bytes - count of written bytes + errs - error count + flush_operations - count of flush operations + rd_total_times - total time read operations took (ns) + wr_total_times - total time write operations took (ns) + flush_total_times - total time flush operations took (ns) + <-- other fields provided by hypervisor --> + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

1 1

[libvirt] lvm backed storage
by Serge Hallyn 12 Sep '11

12 Sep '11

Hi, When lvm.conf has 'command_names = 1', then all results are prefixed with the command name. This confuses libvirt which does not ignore those. I thought fixing that would be a simple case of detecting those conditions at virStorageBackendLogicalMakeVol() and friends, but I was wrong - those functions are not getting called at all when command_names=1. I'll keep nosing around, but it seemed prudent to ping the list and ask what you think would be the cleanest way to handle this case? thanks, -serge

3 2

[libvirt] Bug 736983 SSH GSSAPI login broken
by Matthias Witte 12 Sep '11

12 Sep '11

Hi, after I upgraded from libvirt-0.9.0 I noticed that GSSAPIAuthentication for openssh was no longer working, I always ended up with the password prompt. stracing and debug logging on the server revealed that gssapi was never tried. Adding KRB5CCNAME to the ssh command's environment solved the problem. https://bugzilla.redhat.com/show_bug.cgi?id=736983 I would like to propose the following patch: Index: libvirt-0.9.5-rc1/src/rpc/virnetsocket.c =================================================================== --- libvirt-0.9.5-rc1.orig/src/rpc/virnetsocket.c 2011-09-08 19:37:31.000000000 +0200 +++ libvirt-0.9.5-rc1/src/rpc/virnetsocket.c 2011-09-08 19:37:54.000000000 +0200 @@ -615,6 +615,7 @@ cmd = virCommandNew(binary ? binary : "ssh"); virCommandAddEnvPassCommon(cmd); + virCommandAddEnvPass(cmd, "KRB5CCNAME"); virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); virCommandAddEnvPass(cmd, "SSH_ASKPASS"); virCommandAddEnvPass(cmd, "DISPLAY"); -- Matthias Witte - witte(a)netzquadrat.de Telefon: +49 (0)211-30 20 33-18 Telefax: +49 (0)211-30 20 33-22 [netzquadrat] GmbH - Gladbacher Str. 74 - 40219 Düsseldorf HRB Düsseldorf 36121 - Geschäftsführer: Thilo Salmon, Tim Mois Steuernummer: 106/5719/1836, Umsatzsteuer-ID: DE246863050

3 3

[libvirt] [BUG,RFC] directory traversal vulnerability / qemu: name→uuid
by Philipp Hahn 12 Sep '11

12 Sep '11

Hello, I just tried the following command with libvirt-0.9.5git: # virsh snapshot-create "$VM" /dev/stdin <<<'<domainsnapshot><name>../../../../../../etc/passwd</name></domainsnapshot>' "Luckily" it adds a .xml suffix, but this still looks like a security problem to me, because you can overwrite any .xml-file with libvirt gibberish. Actually this was found by a user trying to create a snapshot with an embedded /, which didn't work, because the sub-directory didn't exist. I know SELinux can solve this, but I really would prefer the Qemu driver to reject such names. Another problem is, that I sometimes would like to rename a VM to a new name, because the old name doesn't describe the VM good enough. <description> is not an option, because 1) Xen doesn't store it, and 2) virsh list doesn't show it. Renaming a Qemu-VM is currently impossible, since the name of the VM is used for several files and directories and a undefine+define would loose state: /etc/libvirt/qemu/$VM.xml /var/lib/libvirt/qemu/$VM.monitor /var/lib/libvirt/qemu/save/$VM.save /var/lib/libvirt/qemu/snapshot/$VM/$SNAPSHOT.xml (Renaming outside of libvirtd can be done by hand, but requires a restart of libvirtd to get it to reload it's state.) Compared to Xen and VirtualBox (as far as I know) they both use the UUID to name their files and directroy, which looks a lot more sane to me than using the name of the VM. Would it be possible and feasible to convert the Qemu driver to use the UUID instead for file and directory naming? Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/ ---------------------------------------------------------------------------- Treffen Sie Univention auf der IT&Business vom 20. bis 22. September 2011 auf dem Gemeinschaftsstand der Open Source Business Alliance in Stuttgart in Halle 3 Stand 3D27-7.

4 6

Re: [libvirt] [virt-tools-list] Are requests for new virsh commands acceptable?
by Richard W.M. Jones 10 Sep '11

10 Sep '11

On Mon, Aug 22, 2011 at 09:06:29PM +1000, dave bl wrote: > Are requests/patches for new virsh commands acceptable? ... I keep > typing in "boot" instead of "start", If I submit a patch to add > ('boot') this would anyone have anything against it? Certainly I've long wanted better aliases for virsh commands. This should be discussed on libvir-list. I suggest sending patches there instead of here. There was some discussion about 4-8 months ago about this subject. It might be a good idea to search the archives and familiarize yourself with that first. We can't remove the existing commands, and we should be careful about aliases which might clash with future commands. Something to think about ... 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

2 1

[libvirt] how did libvirt manage Virtual Network?
by Wayne Xia 09 Sep '11

09 Sep '11

Working at the network management, I am a bit confused about the VLAN model in libvirt. in the xml definition, there is a section as following: <devices> <interface type='network'> <source network='default'/> </interface> ... <interface type='network'> <source network='default' portgroup='engineering'/> <target dev='vnet7'/> <mac address="00:11:22:33:44:55"/> <virtualport type='802.1Qbg'> <parameters managerid='11' typeid='1193047' typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> </devices> What is the really meaning of its related parameters of "virtualport"? I want to discover informations such as VLAN id, the switch type( software switch or hardware switch), connecting relationship, but from the xml I can only found "managerid". I am not sure how to map these xml information to those I needed, could I consider managerid as VLAN id, and a portgroup as a specified VLAN group? By the way to use virtualport, what components should I install on Linux? -- Best Regards Wayne Xia mail:xiawenc@linux.vnet.ibm.com tel:86-010-82450803 _______________________________________________________ kvm-cstl mailing list <kvm-cstl(a)lists.linux.ibm.com> To unsubscribe from the list, change your list options or if you have forgotten your list password visit: http://lists.linux.ibm.com/mailman/listinfo/kvm-cstl

2 1

[libvirt] [PATCH] Fix URL-escaping for domainDefine
by Philipp Hahn 09 Sep '11

09 Sep '11

'+' in strings get translated to ' ' when editing domains. While xenDaemonDomainCreateXML() did URL-escape the sexpr, xenDaemonDomainDefineXML() did not. Remove the explicit urlencode() in xenDaemonDomainCreateXML() and add the direct encoding calls to xend_op_ext() because it calls xend_post() which uses "Content-Type: application/x-www-form-urlencoded". According to <http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1> this requires all parameters to be url-encoded as specified in rfc1738. Notice: virBufferAsprintf(..., "%s=%s", ...) is again replaced by three calls to virBufferURIEncodeString() and virBufferAddChar() because '=' is a "reserved" character, which would get escaped by virBufferURIEncodeString(), which - by the way - escapes anything not c_isalnum(). Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xend_internal.c | 62 ++++------------------------------------------- 1 files changed, 5 insertions(+), 57 deletions(-)

2 2

[libvirt] [PATCH] selinux: Detect virt_use_nfs boolean set
by Michal Privoznik 09 Sep '11

09 Sep '11

If we fail setting label on a file and this file is on NFS share, it is wise to advise user to set virt_use_nfs selinux boolean variable. --- src/security/security_selinux.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ca54f9b..028f5b2 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -420,8 +420,17 @@ SELinuxSetFilecon(const char *path, char *tcon) * virt_use_{nfs,usb,pci} boolean tunables to allow it... */ if (setfilecon_errno != EOPNOTSUPP) { + const char *errmsg; + if ((virStorageFileIsSharedFSType(path, + VIR_STORAGE_FILE_SHFS_NFS) == 1) && + security_get_boolean_active("virt_use_nfs") != 1) { + errmsg = _("unable to set security context '%s' on '%s'. " + "Consider setting virt_use_nfs"); + } else { + errmsg = _("unable to set security context '%s' on '%s'"); + } virReportSystemError(setfilecon_errno, - _("unable to set security context '%s' on '%s'"), + errmsg, tcon, path); if (security_getenforce() == 1) return -1; -- 1.7.3.4

2 2

[libvirt] [PATCH v2] xml: Change virtual file names of xml documents parsed in memory
by Peter Krempa 08 Sep '11

08 Sep '11

While parsing XML strings from memory, the previous convention in libvirt was to set the virtual file name to "domain.xml" or something similar. This could potentialy trick the user into looking for a file named domain.xml on the disk in an attempt to fix the error. This patch changes these filenames to something that can't be as easily confused for a valid filename. Examples of error messages: --------------------------- Error while loading file from disk: 15:07:59.015: 527: error : catchXMLError:709 : /path/to/domain.xml:1: StartTag: invalid element name <domain type='kvm'>< --------------------^ Error while parsing definintion in memory: 15:08:43.581: 525: error : catchXMLError:709 : (domain definition):2: error parsing attribute name <name>vm1</name> --^ Changes to v1: -------------- - Change strings to nicer lowercase versions (suggested by Eric Blake) - Add translation macros - Add example error messages to commit message --- src/conf/domain_conf.c | 2 +- src/security/virt-aa-helper.c | 2 +- tools/virsh.c | 27 ++++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..a4adef0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7461,7 +7461,7 @@ virDomainDefParse(const char *xmlStr, xmlDocPtr xml; virDomainDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "domain.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, _("(domain definition)")))) { def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml), expectedVirtTypes, flags); xmlFreeDoc(xml); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index bb577d3..39f30de 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -641,7 +641,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; - if (!(xml = virXMLParseStringCtxt(xmlStr, "domain.xml", &ctxt))) { + if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain definition)"), &ctxt))) { goto cleanup; } diff --git a/tools/virsh.c b/tools/virsh.c index cf3e816..f57dc37 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1306,7 +1306,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) flags = VIR_DOMAIN_AFFECT_CONFIG; /* extract current network device description */ - xml = virXMLParseStringCtxt(desc, "domain configuration", &ctxt); + xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1453,7 +1453,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) goto cleanup; } - xml = virXMLParseStringCtxt(desc, "domain configuration", &ctxt); + xml = virXMLParseStringCtxt(desc, _("(domain definition)"), &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1662,7 +1662,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, "domain.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, _("(domain definition)"), &ctxt); if (!xmldoc) goto cleanup; @@ -3492,7 +3492,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - xml = virXMLParseStringCtxt(cap_xml, "node.xml", &ctxt); + xml = virXMLParseStringCtxt(cap_xml, _("(capabilities)"), &ctxt); if (!xml) { vshError(ctl, "%s", _("unable to get node capabilities")); goto cleanup; @@ -9032,7 +9032,8 @@ cleanup: } static xmlChar * -makeCloneXML(const char *origxml, const char *newname) { +makeCloneXML(const char *origxml, const char *newname) +{ xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; @@ -9040,7 +9041,7 @@ makeCloneXML(const char *origxml, const char *newname) { xmlChar *newxml = NULL; int size; - doc = virXMLParseStringCtxt(origxml, "domain.xml", &ctxt); + doc = virXMLParseStringCtxt(origxml, _("(volume definition)"), &ctxt); if (!doc) goto cleanup; @@ -10831,7 +10832,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -10899,7 +10900,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -11286,7 +11287,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get interface information")); @@ -11753,7 +11754,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain definition)"), &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get disk information")); @@ -12904,7 +12905,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) xmlDocPtr xmldoc = NULL; xmlXPathContextPtr ctxt = NULL; - xmldoc = virXMLParseStringCtxt(xml, "domainsnapshot.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, _("(domain snapshot)"), &ctxt); if (!xmldoc) goto cleanup; @@ -13046,7 +13047,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (!doc) continue; - xml = virXMLParseStringCtxt(doc, "domainsnapshot.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, _("(domain snapshot)"), &ctxt); if (!xml) continue; @@ -13207,7 +13208,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, "domainsnapshot.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, _("(domain snapshot)"), &ctxt); if (!xmldoc) goto cleanup; -- 1.7.3.4

2 2

[libvirt] [PATCH v4] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 08 Sep '11

08 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v3: - Add units to duration values - Add missing write doc/stranslation - Add translation from new api names to legacy names used in previous versions in virsh Changes to v2: - Modify for new fields in virDomainBlockStatsFlags Changes to v1: - Rebase to current head --- tools/virsh.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++------- tools/virsh.pod | 15 ++++++- 2 files changed, 123 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cf3e816..f281d7a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1054,16 +1054,53 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain.\n\n" + " Explanation of fields:\n" + " rd_req - count of read operations\n" + " rd_bytes - count of read bytes\n" + " rd_total_times - total time read operations took (ns)\n" + " wr_req - count of write operations\n" + " wr_bytes - count of written bytes\n" + " wr_total_times - total time write operations took (ns)\n" + " flush_operations - count of flush operations\n" + " flush_total_times - total time flush operations took (ns)\n" + " errs - error count")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; +struct _domblkstat_translate { + const char *from; + const char *to; +}; + +/* translations into a more human readable form */ +static const struct _domblkstat_translate domblkstat_human[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_BYTES, N_("number of read bytes: ") }, /* 0 */ + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, N_("number of read operations: ") }, /* 1 */ + { VIR_DOMAIN_BLOCK_STATS_READ_TOTAL_TIMES, N_("total duration of reads: ") }, /* 2 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, N_("number of bytes written: ") }, /* 3 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, N_("number of write operations:") }, /* 4 */ + { VIR_DOMAIN_BLOCK_STATS_WRITE_TOTAL_TIMES, N_("total duration of writes: ") }, /* 5 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ, N_("number of flush operations:") }, /* 6 */ + { VIR_DOMAIN_BLOCK_STATS_FLUSH_TOTAL_TIMES, N_("total duration of flushes: ") }, /* 7 */ + { VIR_DOMAIN_BLOCK_STATS_ERRS, N_("error count: ") }, /* 8 */ + { NULL, NULL } +}; + +/* translations into legacy field values used in previous versions */ +static const struct _domblkstat_translate domblkstat_legacy[] = { + { VIR_DOMAIN_BLOCK_STATS_READ_REQ, "rd_req"}, + { VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "wr_req"}, + { NULL, NULL } +}; + static bool cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) { @@ -1071,8 +1108,11 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; virTypedParameterPtr params = NULL; + const char *field_name = NULL; + int j = 0; int rc, nparams = 0; bool ret = false; + bool human = vshCommandOptBool(cmd, "human"); /* enable human readable output */ if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1104,20 +1144,41 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + if (human) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); + + if (stats.rd_req >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_human[1].to, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_human[0].to, stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_human[4].to, stats.wr_req); + + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_human[3].to, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint (ctl, "%s %lld\n", domblkstat_human[8].to, stats.errs); + } else { + + if (stats.rd_req >= 0) + vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + if (stats.wr_req >= 0) + vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + if (stats.errs >= 0) + vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + } } } else { params = vshMalloc(ctl, sizeof(*params) * nparams); @@ -1129,32 +1190,63 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) } int i; + + /* set for prettier output */ + if (human) { + vshPrint(ctl, N_("Device: %s\n"), device); + device = ""; + } + /* XXX: The output sequence will be different. */ for (i = 0; i < nparams; i++) { + /* translate messages into a human readable form, if requested */ + field_name = NULL; + + if (human) + for (j = 0; domblkstat_human[j].from != NULL; j++) + if (STREQ(params[i].field, domblkstat_human[j].from)) { + field_name = domblkstat_human[j].to; + + break; + } + + /* translate new QEmu style field names into legacy names used by virsh */ + if (!field_name) + for (j = 0; domblkstat_legacy[j].from != NULL; j++) + if (STREQ(params[i].field, domblkstat_legacy[j].from)) { + field_name = domblkstat_legacy[j].to; + + break; + } + + /* translation not found, stick with the default field name */ + if (!field_name) + field_name = params[i].field; + switch(params[i].type) { case VIR_TYPED_PARAM_INT: vshPrint (ctl, "%s %s %d\n", device, - params[i].field, params[i].value.i); + field_name, params[i].value.i); break; case VIR_TYPED_PARAM_UINT: vshPrint (ctl, "%s %s %u\n", device, - params[i].field, params[i].value.ui); + field_name, params[i].value.ui); break; case VIR_TYPED_PARAM_LLONG: vshPrint (ctl, "%s %s %lld\n", device, - params[i].field, params[i].value.l); + field_name, params[i].value.l); break; case VIR_TYPED_PARAM_ULLONG: vshPrint (ctl, "%s %s %llu\n", device, - params[i].field, params[i].value.ul); + field_name, params[i].value.ul); break; case VIR_TYPED_PARAM_DOUBLE: vshPrint (ctl, "%s %s %f\n", device, - params[i].field, params[i].value.d); + field_name, params[i].value.d); break; case VIR_TYPED_PARAM_BOOLEAN: vshPrint (ctl, "%s %s %s\n", device, - params[i].field, params[i].value.b ? _("yes") : _("no")); + field_name, params[i].value.b ? _("yes") : _("no")); break; default: vshError(ctl, _("unimplemented block statistics parameter type")); diff --git a/tools/virsh.pod b/tools/virsh.pod index e82567d..a2f87cd 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,13 +501,26 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see also B<domblklist> for listing these names). +Use I<--human> for a more human readable output. + +B<Explanation of fields:> + rd_req - count of read operations + rd_bytes - count of read bytes + rd_total_times - total time read operations took (ns) + wr_req - count of write operations + wr_bytes - count of written bytes + wr_total_times - total time write operations took (ns) + flush_operations - count of flush operations + flush_total_times - total time flush operations took (ns) + errs - error count + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

2 2

[libvirt] [PATCH] snapshot: fix regression with system checkpoints
by Eric Blake 08 Sep '11

08 Sep '11

Regression introduced in commit d6f6b2d194c. * src/conf/domain_conf.c (virDomainSnapshotDefParseString): Only give error about no disk support when <disk> was found. --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..560c773 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11622,7 +11622,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, goto cleanup; } VIR_FREE(nodes); - } else { + } else if (i) { virDomainReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("unable to handle disk requests in snapshot")); goto cleanup; -- 1.7.4.4

2 2

[libvirt] A question about create image for sheepdog
by chang liu 08 Sep '11

08 Sep '11

Hi everyone: I want to build a VM Manage System, and I use libvirt to create and delete VM. But now I has used sheepdog as the disk, but I have to create sheepdog image by hand. If I have a thousand of servers, how can I create the image? I think if I can write a API for create the sheepdog image by call the qemu-img or kvm-img? (My English is rather poor, please forgive me)

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 08 Sep '11

08 Sep '11

* .gnulib: Update to latest. --- I'm not sure if any of these are essential for libvirt, but it's probably nicer to pick up these fixes before the release than to find out after the release that we wish we had them. * .gnulib a6b16b6...da1717b (63): > Doc about crypt functions. > gc: Fix copyright header. > pthread: Determine $(LIB_PTHREAD) correctly on OSF/1 5.1. > openat: Work around compilation error with OSF/1 5.1 DTK cc. > Revert last commit. > openat: Work around compilation error with OSF/1 5.1 DTK cc. > parse-datetime: document the newly accepted format > autoupdate > acl: Fix a test failure on newer Solaris 10 with ZFS. > acl: Update for AIX >= 5.3 with NFS. > acl: Fix a test failure on AIX >= 5.3 with NFS. > acl: Fix a test failure on IRIX 6.5 with NFS. > openat: port to AIX 7.1 with large files > acl: Avoid errors on NonStop Kernel. > acl: Clean up Solaris code. > acl: Fix a bug with NFSv4 ACLs on Solaris 10 (newer version). > acl: Improve support of NFSv4 ACLs on Solaris 10 (newer version). > copy-file: Try unit tests on more file systems. > acl: Try unit tests on more file systems. > acl: Remove unused code in last commit. > acl: Improve support of NFSv4 ACLs on Solaris 10 (newer version). > openat: test for fstatat (..., 0) bug > openat: test for fstatat (AT_FDCWD, ..., 0) bug > avoid literal : in index entries > Allow the user to override the choice of AR, ARFLAGS, RANLIB. > Find 'ar' program that fits with --host argument. > tests: init.sh: Support any non-GNU diff. > tests: init.sh: work also with any non-GNU diff that supports -u > strtoimax, strtoumax: Document problem on HP-UX 11. > strtoumax: Avoid link error on OSF/1 with DTK cc. > strtoimax: Avoid link error on OSF/1 with DTK cc. > imaxdiv: Avoid link error on OSF/1 with DTK cc. > imaxabs: Avoid link error on OSF/1 with DTK cc. > Tests for module 'strtoumax'. > Tests for module 'strtoimax'. > Tests for module 'imaxdiv'. > Tests for module 'imaxabs'. > pthread: Determine $(LIB_PTHREAD) correctly on IRIX 6.5. > * lib/fstatat.c: Include <sys/types.h> before <sys/stat.h>. > openat: work around AIX 7.1 fstatat issue > sys_select: Avoid a syntax error regarding timespec_t on IRIX 6.5. > tests: avoid spurious assertion failure in test-float.c on ppc64 > maint: indent with spaces, not TABs > test-parse-datetime.c: accommodate a relatively strict gcc warning > parse-datetime: accept ISO 8601 date and time rep with "T" separator > freopen: Documentation. > freopen: Don't crash if the filename argument is NULL. > openat: work around AIX 7.1 fstatat bug > Avoid endless recursions if config.h includes some header files. > autoupdate ylwrap > autoupdate ylwrap > autoupdate > tmpdir: Use a good default directory on native Windows. > autoupdate > doc: fix typo in README-release > fts: do not exhaust memory when processing million-entry directories > maint: fts: move decl of `dp' down into while loop; split a long line > fts: add/use new struct member, fts_dirp > maint: fts: give __opendir2 a new parameter and rename > maint: fts.c: remove __opendir2's now-unused parameter, oflag > maint: fts.c: correct off-by-one indentation > maint: fts.c: move __opendir2 #define "up" out of function body > maint: fts.c: remove #if-0'd FTS_WHITEOUT code .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index a6b16b6..da1717b 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit a6b16b69fe1cad695b270dd5bf3deb2850fc4dd1 +Subproject commit da1717b7f93b77469f980ea5e13178e4e9e7ae09 -- 1.7.4.4

2 2

[libvirt] [PATCH 0/2] snapshot: add getName API
by Eric Blake 08 Sep '11

08 Sep '11

I know I've missed the 0.9.5 RC1 freeze, but think that this new API is worth adding, if only because I noticed that 'virsh snapshot-create dom --no-metadata' currently creates a snapshot with a generated name but then fails in attempting to express that name to the user. Eric Blake (2): snapshot: new APIs for inspecting snapshot object snapshot: use new API for less work include/libvirt/libvirt.h.in | 4 ++ src/libvirt.c | 73 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++- tools/virsh.c | 41 +++++------------------ 4 files changed, 90 insertions(+), 33 deletions(-) -- 1.7.4.4

2 5

[libvirt] [PATCH] Don't treat pci_system_init failure as fatal if no PCI bus is present
by Soren Hansen 08 Sep '11

08 Sep '11

Xen PV domU's have no PCI bus. node_device_udev.c calls pci_system_init which looks for /sys/bus/pci. If it does not find /sys/bus/pci (which it won't in a Xen PV domU) it returns unsuccesfully (ENOENT), which libvirt considers fatal. This makes libvirt unusable in this environment, even though there are plenty of valid virtualisation options that work there (LXC, UML, and QEmu spring to mind) https://bugzilla.redhat.com/show_bug.cgi?id=709471 Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/node_device/node_device_udev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index badf241..08ef856 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1620,7 +1620,7 @@ static int udevDeviceMonitorStartup(int privileged) /* Ignore failure as non-root; udev is not as helpful in that * situation, but a non-privileged user won't benefit much * from udev in the first place. */ - if (privileged || errno != EACCES) { + if (errno != ENOENT && (privileged || errno != EACCES)) { char ebuf[256]; VIR_ERROR(_("Failed to initialize libpciaccess: %s"), virStrerror(pciret, ebuf, sizeof ebuf)); -- 1.7.5.4

3 2

[libvirt] [PATCH rfc] xml: Change virtual file names of xml documents parsed in memory
by Peter Krempa 08 Sep '11

08 Sep '11

While parsing XML strings from memory, the previous convention in libvirt was to set the virtual file name to "domain.xml" or something similar. This could potentialy trick the user into looking for a file named domain.xml on the disk in an attempt to fix the error. This patch changes these filenames to something that can't be as easily confused for a valid filename. --- For the request for comments: Shoud we use translation macros around these filename strings? It might be possible to translate these messages in something meaningful in other languages. Thanks for your comments. Peter src/conf/domain_conf.c | 2 +- src/security/virt-aa-helper.c | 2 +- tools/virsh.c | 27 ++++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74f8d6a..bc04732 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7461,7 +7461,7 @@ virDomainDefParse(const char *xmlStr, xmlDocPtr xml; virDomainDefPtr def = NULL; - if ((xml = virXMLParse(filename, xmlStr, "domain.xml"))) { + if ((xml = virXMLParse(filename, xmlStr, "DOMAIN_DEFINITION_XML"))) { def = virDomainDefParseNode(caps, xml, xmlDocGetRootElement(xml), expectedVirtTypes, flags); xmlFreeDoc(xml); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index bb577d3..e460845 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -641,7 +641,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr) xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; - if (!(xml = virXMLParseStringCtxt(xmlStr, "domain.xml", &ctxt))) { + if (!(xml = virXMLParseStringCtxt(xmlStr, "DOMAIN_DEFINITION_XML", &ctxt))) { goto cleanup; } diff --git a/tools/virsh.c b/tools/virsh.c index 629233f..2da83d0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1309,7 +1309,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) flags = VIR_DOMAIN_AFFECT_CONFIG; /* extract current network device description */ - xml = virXMLParseStringCtxt(desc, "domain configuration", &ctxt); + xml = virXMLParseStringCtxt(desc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1457,7 +1457,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) goto cleanup; } - xml = virXMLParseStringCtxt(desc, "domain configuration", &ctxt); + xml = virXMLParseStringCtxt(desc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(desc); if (!xml) { vshError(ctl, _("Failed to parse domain description xml")); @@ -1666,7 +1666,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, "domain.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, "DOMAIN_DEFINITION_XML", &ctxt); if (!xmldoc) goto cleanup; @@ -3496,7 +3496,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - xml = virXMLParseStringCtxt(cap_xml, "node.xml", &ctxt); + xml = virXMLParseStringCtxt(cap_xml, "CAPABILITIES_XML", &ctxt); if (!xml) { vshError(ctl, "%s", _("unable to get node capabilities")); goto cleanup; @@ -9036,7 +9036,8 @@ cleanup: } static xmlChar * -makeCloneXML(const char *origxml, const char *newname) { +makeCloneXML(const char *origxml, const char *newname) +{ xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; @@ -9044,7 +9045,7 @@ makeCloneXML(const char *origxml, const char *newname) { xmlChar *newxml = NULL; int size; - doc = virXMLParseStringCtxt(origxml, "domain.xml", &ctxt); + doc = virXMLParseStringCtxt(origxml, "VOLUME_DEFINITION_XML", &ctxt); if (!doc) goto cleanup; @@ -10835,7 +10836,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -10903,7 +10904,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(doc); if (!xml) goto cleanup; @@ -11290,7 +11291,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get interface information")); @@ -11757,7 +11758,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!doc) goto cleanup; - xml = virXMLParseStringCtxt(doc, "domain.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, "DOMAIN_DEFINITION_XML", &ctxt); VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get disk information")); @@ -12908,7 +12909,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) xmlDocPtr xmldoc = NULL; xmlXPathContextPtr ctxt = NULL; - xmldoc = virXMLParseStringCtxt(xml, "domainsnapshot.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, "DOMAIN_SNAPSHOT_XML", &ctxt); if (!xmldoc) goto cleanup; @@ -13050,7 +13051,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (!doc) continue; - xml = virXMLParseStringCtxt(doc, "domainsnapshot.xml", &ctxt); + xml = virXMLParseStringCtxt(doc, "DOMAIN_SNAPSHOT_XML", &ctxt); if (!xml) continue; @@ -13211,7 +13212,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - xmldoc = virXMLParseStringCtxt(xml, "domainsnapshot.xml", &ctxt); + xmldoc = virXMLParseStringCtxt(xml, "DOMAIN_SNAPSHOT_XML", &ctxt); if (!xmldoc) goto cleanup; -- 1.7.3.4

2 1