- Devel - libvirt List Archives

[libvirt] [PATCH] add migration support for OpenVZ driver
by Hongbin Lu 11 Sep '14

11 Sep '14

This patch adds initial migration support to the OpenVZ driver, using the VIR_DRV_FEATURE_MIGRATION_PARAMS family of migration functions. --- src/openvz/openvz_conf.h | 5 +- src/openvz/openvz_driver.c | 348 ++++++++++++++++++++++++++++++++++++++++++++ src/openvz/openvz_driver.h | 10 ++ 3 files changed, 361 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index a7de7d2..33998d6 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -35,8 +35,9 @@ /* OpenVZ commands - Replace with wrapper scripts later? */ -# define VZLIST "/usr/sbin/vzlist" -# define VZCTL "/usr/sbin/vzctl" +# define VZLIST "/usr/sbin/vzlist" +# define VZCTL "/usr/sbin/vzctl" +# define VZMIGRATE "/usr/sbin/vzmigrate" # define VZ_CONF_FILE "/etc/vz/vz.conf" # define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 851ed30..0f46872 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2207,6 +2207,348 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, } +static int +openvzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +{ + switch (feature) { + case VIR_DRV_FEATURE_MIGRATION_PARAMS: + case VIR_DRV_FEATURE_MIGRATION_V3: + return 1; + default: + return 0; + } +} + + +static char * +openvzDomainMigrateBegin3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + struct openvz_driver *driver = domain->conn->privateData; + char *xml = NULL; + int status; + + virCheckFlags(OPENVZ_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, OPENVZ_MIGRATION_PARAMETERS) < 0) + return NULL; + + openvzDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + + if (status != VIR_DOMAIN_RUNNING) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domain is not in running state")); + goto cleanup; + } + + xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); + + cleanup: + if (vm) + virObjectUnlock(vm); + return xml; +} + +static int +openvzDomainMigratePrepare3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + char **uri_out, + unsigned int fflags ATTRIBUTE_UNUSED) +{ + struct openvz_driver *driver = dconn->privateData; + const char *dom_xml = NULL; + const char *uri_in = NULL; + virDomainDefPtr def = NULL; + virDomainObjPtr vm = NULL; + char *hostname = NULL; + virURIPtr uri = NULL; + int ret = -1; + + if (virTypedParamsValidate(params, nparams, OPENVZ_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + goto error; + + if (!dom_xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no domain XML passed")); + goto error; + } + + if (!(def = virDomainDefParseString(dom_xml, driver->caps, driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_OPENVZ, + VIR_DOMAIN_XML_INACTIVE))) + goto error; + + if (!(vm = virDomainObjListAdd(driver->domains, def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto error; + def = NULL; + + if (!uri_in) { + if ((hostname = virGetHostname()) == NULL) + goto error; + + if (STRPREFIX(hostname, "localhost")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("hostname on destination resolved to localhost," + " but migration requires an FQDN")); + goto error; + } + } else { + uri = virURIParse(uri_in); + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("unable to parse URI: %s"), + uri_in); + goto error; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing host in migration URI: %s"), + uri_in); + goto error; + } else { + hostname = uri->server; + } + } + + if (virAsprintf(uri_out, "tcp://%s", hostname) < 0) + goto error; + + ret = 0; + goto done; + + error: + virDomainDefFree(def); + if (vm) { + virDomainObjListRemove(driver->domains, vm); + vm = NULL; + } + + done: + virURIFree(uri); + if (vm) + virObjectUnlock(vm); + return ret; +} + +static int +openvzDomainMigratePerform3Params(virDomainPtr domain, + const char *dconnuri ATTRIBUTE_UNUSED, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + struct openvz_driver *driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + const char *uri_str = NULL; + virURIPtr uri = NULL; + virCommandPtr cmd = virCommandNew(VZMIGRATE); + int ret = -1; + + virCheckFlags(OPENVZ_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, OPENVZ_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_str) < 0) + goto cleanup; + + openvzDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + /* parse dst host:port from uri */ + uri = virURIParse(uri_str); + if (uri == NULL || uri->server == NULL) + goto cleanup; + + if (flags & VIR_MIGRATE_LIVE) + virCommandAddArg(cmd, "--live"); + virCommandAddArg(cmd, uri->server); + virCommandAddArg(cmd, vm->def->name); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virCommandFree(cmd); + virURIFree(uri); + if (vm) + virObjectUnlock(vm); + return ret; +} + +static virDomainPtr +openvzDomainMigrateFinish3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + struct openvz_driver *driver = dconn->privateData; + virDomainObjPtr vm = NULL; + const char *dname = NULL; + virDomainPtr dom = NULL; + int status; + + if (cancelled) + goto cleanup; + + virCheckFlags(OPENVZ_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, OPENVZ_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0) + goto cleanup; + + if (!dname || + !(vm = virDomainObjListFindByName(driver->domains, dname))) { + /* Migration obviously failed if the domain doesn't exist */ + virReportError(VIR_ERR_OPERATION_FAILED, + _("Migration failed. No domain on destination host " + "with matching name '%s'"), + NULLSTR(dname)); + goto cleanup; + } + + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + + if (status != VIR_DOMAIN_RUNNING) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domain is not running on destination host")); + goto cleanup; + } + + vm->def->id = strtoI(vm->def->name); + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_MIGRATED); + + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + + cleanup: + if (vm) + virObjectUnlock(vm); + return dom; +} + +static int +openvzDomainMigrateConfirm3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + struct openvz_driver *driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + int status; + int ret = -1; + + virCheckFlags(OPENVZ_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, OPENVZ_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + openvzDriverLock(driver); + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + openvzDriverUnlock(driver); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching uuid")); + goto cleanup; + } + + if (cancelled) { + if (openvzGetVEStatus(vm, &status, NULL) == -1) + goto cleanup; + + if (status == VIR_DOMAIN_RUNNING) { + ret = 0; + } else { + VIR_DEBUG("Domain '%s' does not recover after failed migration", + vm->def->name); + } + + goto cleanup; + } + + vm->def->id = -1; + + VIR_DEBUG("Domain '%s' successfully migrated", vm->def->name); + + virDomainObjListRemove(driver->domains, vm); + vm = NULL; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + + static virDriver openvzDriver = { .no = VIR_DRV_OPENVZ, .name = "OPENVZ", @@ -2265,6 +2607,12 @@ static virDriver openvzDriver = { .connectIsAlive = openvzConnectIsAlive, /* 0.9.8 */ .domainUpdateDeviceFlags = openvzDomainUpdateDeviceFlags, /* 0.9.13 */ .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ + .connectSupportsFeature = openvzConnectSupportsFeature, /* 1.2.8 */ + .domainMigrateBegin3Params = openvzDomainMigrateBegin3Params, /* 1.2.8 */ + .domainMigratePrepare3Params = openvzDomainMigratePrepare3Params, /* 1.2.8 */ + .domainMigratePerform3Params = openvzDomainMigratePerform3Params, /* 1.2.8 */ + .domainMigrateFinish3Params = openvzDomainMigrateFinish3Params, /* 1.2.8 */ + .domainMigrateConfirm3Params = openvzDomainMigrateConfirm3Params, /* 1.2.8 */ }; int openvzRegister(void) diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index b39e81c..0c7a070 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -31,6 +31,16 @@ # include "internal.h" +# define OPENVZ_MIGRATION_FLAGS \ + (VIR_MIGRATE_LIVE) + +/* All supported migration parameters and their types. */ +# define OPENVZ_MIGRATION_PARAMETERS \ + VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ + NULL + int openvzRegister(void); #endif -- 1.7.1

2 3

[libvirt] [PATCH] conf: snapshot: Don't default-snapshot empty floppy drives
by Peter Krempa 11 Sep '14

11 Sep '14

If a floppy drive isn't selected for snapshot explicitly and is empty don't try to snapshot it. For external snapshots this would fail as we can't generate a name for the snapshot from an empty drive. Reported-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/snapshot_conf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index c53a66b..cbaff74 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -561,7 +561,14 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, if (VIR_STRDUP(disk->name, def->dom->disks[i]->dst) < 0) goto cleanup; disk->index = i; - disk->snapshot = def->dom->disks[i]->snapshot; + + /* Don't snapshot empty floppy drives */ + if (def->dom->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY && + !virDomainDiskGetSource(def->dom->disks[i])) + disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; + else + disk->snapshot = def->dom->disks[i]->snapshot; + disk->src->type = VIR_STORAGE_TYPE_FILE; if (!disk->snapshot) disk->snapshot = default_snapshot; -- 2.1.0

2 4

[libvirt] [PATCH 00/26] Resolve more Coverity issues
by John Ferlan 11 Sep '14

11 Sep '14

Sorry for the large dump, but before I got too involved in other things I figured I'd go through the list of the remaining 68 Coverity issues from the new version in order to reduce the pile. Many are benign, some seemingly false positives, and I think most are error paths. The one non error path that does stick out is the qemu_driver.c changes in the qemuDomainSetBlkioParameters() routine where 'param' and 'params' were used differently between LIVE and CONFIG. In particular, in CONFIG the use of 'params->field' instead of 'param->field'. One that does bear looking at more closely and if someone has a better idea is avoiding a false positive resource_leak in remote_driver.c. I left a healthy comment in the code - you'll know when you see it. These patches get the numbers down to 19 issues. Of the remaining issues - some are related to Coverity thinking that 'mgetgroups' could return a negative value with an allocated groups structure (which I'm still scratching my head over). There is also a few calls to virJSONValueObjectGetNumberUlong() in qemu_monitor_json.c that don't check status, but I'm not sure why - just didn't have the research cycles for that. John Ferlan (26): qemu_driver: Resolve Coverity COPY_PASTE_ERROR remote_driver: Resolve Coverity RESOURCE_LEAK storage: Resolve Coverity UNUSED_VALUE vbox: Resolve Coverity UNUSED_VALUE qemu: Resolve Coverity REVERSE_INULL storage: Resolve Coverity OVERFLOW_BEFORE_WIDEN virsh: Resolve Coverity DEADCODE virfile: Resolve Coverity DEADCODE virsh: Resolve Coverity DEADCODE qemu: Resolve Coverity DEADCODE tests: Resolve Coverity DEADCODE virsh: Resolve Coverity DEADCODE qemu: Resolve Coverity FORWARD_NULL lxc: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL network: Resolve Coverity FORWARD_NULL virstring: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL network_conf: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity NEGATIVE_RETURNS nodeinfo: Resolve Coverity NEGATIVE_RETURNS virsh: Resolve Coverity NEGATIVE_RETURNS xen: Resolve Coverity NEGATIVE_RETURNS qemu: Resolve Coverity NEGATIVE_RETURNS qemu: Resolve Coverity NEGATIVE_RETURNS libxl: Resolve Coverity NULL_RETURNS src/conf/network_conf.c | 4 ++-- src/libxl/libxl_migration.c | 1 - src/lxc/lxc_driver.c | 6 ++++-- src/network/leaseshelper.c | 3 +-- src/nodeinfo.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 26 +++++++++++++++----------- src/qemu/qemu_migration.c | 3 ++- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 5 +++-- src/remote/remote_driver.c | 12 ++++++++++++ src/storage/storage_backend_disk.c | 2 +- src/storage/storage_backend_fs.c | 1 - src/util/virfile.c | 5 ++--- src/util/virstring.c | 3 +++ src/vbox/vbox_common.c | 9 +++++++-- src/xen/xend_internal.c | 3 ++- tests/virstringtest.c | 5 +++++ tools/virsh-domain.c | 22 ++++++++-------------- tools/virsh-edit.c | 9 --------- tools/virsh-interface.c | 3 --- tools/virsh-network.c | 12 +++++------- tools/virsh-nwfilter.c | 3 --- tools/virsh-pool.c | 3 --- tools/virsh-snapshot.c | 3 --- 26 files changed, 76 insertions(+), 74 deletions(-) -- 1.9.3

4 60

[libvirt] [PATCH] util/virprocess.c: fix MinGW build
by Pavel Hrdina 11 Sep '14

11 Sep '14

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virprocess.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 15d8309..3dae1bd 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <sys/wait.h> #include <unistd.h> -#include <sys/syscall.h> #if HAVE_SETRLIMIT # include <sys/time.h> # include <sys/resource.h> @@ -78,10 +77,21 @@ VIR_LOG_INIT("util.process"); #endif #ifndef HAVE_SETNS +# ifndef WIN32 +# include <sys/syscall.h> + static inline int setns(int fd, int nstype) { return syscall(__NR_setns, fd, nstype); } +# else +static inline int setns(int fd ATTRIBUTE_UNUSED, int nstype ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Namespaces are not supported on windows.")); + return -1; +} +# endif /* WIN32 */ #endif /* HAVE_SETNS */ /** -- 1.8.5.5

2 4

[libvirt] [PATCH] selinux: Properly check TAP FD label
by Michal Privoznik 11 Sep '14

11 Sep '14

After a4431931 the TAP FDs ale labeled with image label instead of the process label. On the other hand, the commit was incomplete as a few lines above, there's still old check for the process label presence while it should be check for the image label instead. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. After this commit, the function is completely the same as virSecuritySELinuxSetImageFDLabel(). However I'd like to keep them separate because there's an ongoing bug: https://bugzilla.redhat.com/show_bug.cgi?id=1095636 so with fair chance the TapFDLabel() function will be rewritten soon. src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 7064158..bf67fb5 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2347,7 +2347,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelDefPtr secdef; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (!secdef || !secdef->label) + if (!secdef || !secdef->imagelabel) return 0; return virSecuritySELinuxFSetFilecon(fd, secdef->imagelabel); -- 1.8.5.5

1 0

[libvirt] [PATCH] libxl: support domainReset
by Jim Fehlig 10 Sep '14

10 Sep '14

Currently, libxl_send_trigger() does not implement the LIBXL_TRIGGER_RESET option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 67fd7bc6..08018d4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -979,6 +979,62 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) } static int +libxlDomainReset(virDomainPtr dom, unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + libxlDomainObjPrivatePtr priv; + + virCheckFlags(0, -1); + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainResetEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + + /* + * The semantics of reset can be achieved by forcibly destroying + * the domain and starting it again. + */ + priv = vm->privateData; + if (libxl_domain_destroy(priv->ctx, vm->def->id, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reset domain '%d'"), vm->def->id); + goto cleanup; + } + + if (!libxlDomainCleanupJob(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to cleanup domain '%d' after reset"), + vm->def->id); + vm = NULL; + goto cleanup; + } + + if (libxlDomainStart(driver, vm, false, -1) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to start domain '%d' after reset"), + vm->def->id); + goto cleanup; + } + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static int libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { @@ -4758,6 +4814,7 @@ static virDriver libxlDriver = { .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ + .domainReset = libxlDomainReset, /* 1.2.8 */ .domainDestroy = libxlDomainDestroy, /* 0.9.0 */ .domainDestroyFlags = libxlDomainDestroyFlags, /* 0.9.4 */ .domainGetOSType = libxlDomainGetOSType, /* 0.9.0 */ -- 1.8.4.5

5 15

[libvirt] [PATCH] qemu: remove leftover virResetLastError
by Ján Tomko 10 Sep '14

10 Sep '14

As of commit 5d29ca0: qemu: switch PCI address set from hash table to an array There is no error to be reset. --- src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5856fe7..665a590 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1770,7 +1770,6 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video" " device will not be possible without manual" " intervention"); - virResetLastError(); } else if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) { goto cleanup; } -- 1.8.5.5

2 1

[libvirt] [PATCH 0/5] Fix starting of VMs with backing chains containing unknown backing file specification
by Peter Krempa 10 Sep '14

10 Sep '14

When a backing chain element specifies a parent in a format not known to libvirt we'd fail to start the VM as the chain would appear broken. To prevent this happening introduce a new disk type to collect unknow format specs and avoid startup failures with such disk type. Peter Krempa (5): util: storage: Convert disk locality check to switch statement conf: Introduce raw disk string passthrough conf: Mark backing chain ending with "raw" volume as broken tests: Add tests for disk type 'raw' utils: storage: Fall back to "raw" disk on backing store parse failure docs/schemas/domaincommon.rng | 14 ++++ src/conf/domain_conf.c | 12 ++- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 4 + src/storage/storage_driver.c | 8 ++ src/util/virstoragefile.c | 35 +++++++- src/util/virstoragefile.h | 1 + .../qemuxml2argv-disk-backing-chains-raw.xml | 94 +++++++++++++++++++++ .../qemuxml2argv-disk-virtio-raw.args | 9 ++ .../qemuxml2argv-disk-virtio-raw.xml | 45 ++++++++++ tests/qemuxml2argvtest.c | 1 + ...muxml2xmlout-disk-backing-chains-raw-active.xml | 95 ++++++++++++++++++++++ ...xml2xmlout-disk-backing-chains-raw-inactive.xml | 59 ++++++++++++++ tests/qemuxml2xmltest.c | 2 + 14 files changed, 375 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains-raw.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-raw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-raw.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-raw-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-raw-inactive.xml -- 2.0.2

4 17

[libvirt] [PATCH] virsh: desc command in --title mode mentions description instead of title
by Peter Krempa 10 Sep '14

10 Sep '14

Tweak the messages so that they mention "title" rather than "description" when operating in title mode. Also fixes one missing "%s" before non-formatted gettext message. Before: $ virsh desc --title dom No description for domain: dom After: $ virsh desc --title dom No title for domain: dom Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140034 --- tools/virsh-domain.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 86deae6..6aa8631 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7219,7 +7219,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) /* Compare original XML with edited. Has it changed at all? */ if (STREQ(desc, desc_edited)) { - vshPrint(ctl, _("Domain description not changed.\n")); + vshPrint(ctl, "%s", + title ? _("Domain title not changed\n") : + _("Domain description not changed\n")); ret = true; goto cleanup; } @@ -7231,10 +7233,13 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { vshError(ctl, "%s", - _("Failed to set new domain description")); + title ? _("Failed to set new domain title") : + _("Failed to set new domain description")); goto cleanup; } - vshPrint(ctl, "%s", _("Domain description updated successfully")); + vshPrint(ctl, "%s", + title ? _("Domain title updated successfully") : + _("Domain description updated successfully")); } else { desc = vshGetDomainDescription(ctl, dom, title, config?VIR_DOMAIN_XML_INACTIVE:0); @@ -7244,7 +7249,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) if (strlen(desc) > 0) vshPrint(ctl, "%s", desc); else - vshPrint(ctl, _("No description for domain: %s"), + vshPrint(ctl, + title ? _("No title for domain: %s") : + _("No description for domain: %s"), virDomainGetName(dom)); } -- 2.0.2

2 1

[libvirt] lxc: shutdown $domain broken in libvirt 1.2.3
by Steven Wilson 10 Sep '14

10 Sep '14

We recently ran into libvirt lxc shutdown failing because of mount namespaces not being available: # virsh -c lxc:/// start test01 Domain test01 started # virsh -c lxc:/// list Id Name State ---------------------------------------------------- 9336 test01 running # virsh -c lxc:/// shutdown test01 error: Failed to shutdown domain test01 error: Mount namespaces are not available on this platform: Function not implemented /var/log/libvirt/libvirtd.log: 2014-09-03 15:50:50.682+0000: 3030: error : virProcessRunInMountNamespace:999 : Mount namespaces are not available on this platform: Function not implemented We're running Debian wheezy with stock libc6 2.13-38, a custom 3.12.15 kernel (with namespace support) and libvirt 1.2.3. The patch in this previous thread fixes shutdown for us and we'd like to see it merged upstream: https://www.redhat.com/archives/libvir-list/2014-May/msg00175.html Thanks, Steve

3 2

[libvirt] [PATCH 0/2] [RFC] Use the power of SystemTap to get rid of all* deadlocks forever*
by Martin Kletzander 10 Sep '14

10 Sep '14

Many moons ago, I wanted to make locking more debuggable from logs. An idea appeared that this might be better off with SystemTap. I let it rot for a while and some time back I had a deadlock that I wanted to try it on. So I started scripting it and here's the work (in progress). Well, the idea is simple. For each mutex that is about to get locked, append it's symname and pid that locked it into the list A, when it get's locked move it to list B and when it's unlocked, remove it. Then whenever the user presses ^C, the script prints all the locks that were locked (with their particular backtraces) and locks that are waiting to be locked. This could be enhanced that it would print both pieces of information only for the locks that are waiting to be acquired. But I don't really care what color the shed will have. Here are some problems I'd love to get any help with: - I cannot run it against built git version, two problems with that: - When I'm not root, staprun needs setuid bit set and that is, of course, incompatible with the needed LD_LIBRARY_PATH. - Even when I am root, I'm unable to get any backtrace that goes beyond virLogMutex() no matter how I'm loading the debug symbols. - When running with installed libvirtd, I am not getting as nice backtrace as I would in gdb (but that's probably the only way how systemtap will get any backtrace so it's better than nothing). And I'm unable to get line numbers even with addr2line. I'd be interested in hearing how this works for others, or any hints on how to make the script so good that I could post it for the inclusion upstream. Any best practices about systemtap scripts are welcomed as well. _______________________________________________________ (*) Not quite, I just wanted you to notice this mail ;) Martin Kletzander (2): lock-debug.stp DO NOT APPLY: deadlock test daemon/libvirtd.c | 1 + examples/systemtap/lock-debug.stp | 115 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 examples/systemtap/lock-debug.stp -- 2.1.0

2 5

[libvirt] [PATCH 0/4] Few unrelated fixes in save/dump code
by Peter Krempa 10 Sep '14

10 Sep '14

I spent some time in the save/dump code today and found a few nits to fix. Peter Krempa (4): util: process: Don't report OOM errors in helper virsh: domain: Clean up handling of "dom" in "save" command qemu: dump: Fix formatting of function headers and code inline qemu: dump: Resume CPUs only when the VM is still alive src/qemu/qemu_driver.c | 51 ++++++++++++++++++++++++++------------------------ src/util/virprocess.c | 10 +++++----- tools/virsh-domain.c | 6 +++--- 3 files changed, 35 insertions(+), 32 deletions(-) -- 2.0.2

2 6

[libvirt] [PATCH] docs: fix encryption format attribute in example
by Ján Tomko 10 Sep '14

10 Sep '14

The correct attribute name is 'format', not 'type'. https://bugzilla.redhat.com/show_bug.cgi?id=1139910 --- Pushed as trivial. docs/formatstorageencryption.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 2b22237..04c3346 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -35,7 +35,7 @@ </p> <h3><a name="StorageEncryptionDefault">"default" format</a></h3> <p> - <code><encryption type="default"/></code> can be specified only + <code><encryption format="default"/></code> can be specified only when creating a volume. If the volume is successfully created, the encryption formats, parameters and secrets will be auto-generated by libvirt and the attached <code>encryption</code> tag will be updated. -- 1.8.5.5

1 0

[libvirt] [PATCHv2 00/13] vbox: Rewrite vbox network driver
by Taowei 10 Sep '14

10 Sep '14

This series of patches rewrite the vbox network driver, which is a continuance for my GSoC project "Rewriting the vbox driver". The patches removed all version specified network drivers and left a common driver which using vbox's uniformed network API. Diff from v1: *Remove macro VBOX_OBJECT_HOST_CHECK *Code style improvements. Taowei (13): vbox: Rewrite vboxNetworkOpen vbox: Rewrite vboxNetworkClose vbox: Rewrite vboxConnectNumOfNetworks vbox: Rewrite vboxConnectListNetworks vbox: Rewrite vboxConnectNumOfDefinedNetworks vbox: Rewrite vboxConnectListDefinedNetworks vbox: Rewrite vboxNetworkLookupByUUID vbox: Rewrite vboxNetworkLookupByName vbox: Rewrite vboxNetworkDefineCreateXML vbox: Rewrite vboxNetworkUndefineDestroy vbox: Rewrite vboxNetworkCreate vbox: Rewrite vboxNetworkGetXMLDesc vbox: Introducing vboxCommonNetworkDriver src/vbox/vbox_common.c | 942 ++++++++++++++++++++++++++++++ src/vbox/vbox_common.h | 16 + src/vbox/vbox_driver.c | 23 +- src/vbox/vbox_tmpl.c | 1261 +++++++++++------------------------------ src/vbox/vbox_uniformed_api.h | 52 ++ 5 files changed, 1341 insertions(+), 953 deletions(-) -- 1.7.9.5

1 13

[libvirt] [PATCH V1 0/4] xen-xl parser
by Kiarie Kahurani 10 Sep '14

10 Sep '14

Kiarie Kahurani (4): src/xenconfig: Export helper functions src/xenconfig: Xen-xl parser src/xenconfig: Introduce xen-xl on virsh command line tests: Tests for the xen-xl parser configure.ac | 5 +- src/Makefile.am | 21 +- src/libvirt_xenconfig.syms | 4 + src/libxl/libxl_driver.c | 46 ++- src/xenconfig/libxlu_disk_i.h | 28 ++ src/xenconfig/libxlu_disk_l.l | 292 ++++++++++++++ src/xenconfig/xen_common.c | 147 +++---- src/xenconfig/xen_common.h | 24 +- src/xenconfig/xen_xl.c | 476 +++++++++++++++++++++++ src/xenconfig/xen_xl.h | 29 ++ tests/Makefile.am | 9 +- tests/testutilsxen.c | 50 +++ tests/testutilsxen.h | 9 +- tests/xlconfigdata/test-disk-key-value.cfg | 27 ++ tests/xlconfigdata/test-disk-key-value.xml | 48 +++ tests/xlconfigdata/test-fullvirt-cdrom-empty.cfg | 23 ++ tests/xlconfigdata/test-fullvirt-cdrom-empty.xml | 0 tests/xlconfigdata/test-fullvirt-new-disk.cfg | 28 ++ tests/xlconfigdata/test-fullvirt-new-disk.xml | 46 +++ tests/xlconfigdata/test-fullvirt-spice.cfg | 32 ++ tests/xlconfigdata/test-fullvirt-spice.xml | 48 +++ tests/xlconfigdata/test.cfg | 48 +++ tests/xlconfigdata/test.xml | 48 +++ tests/xlconfigtest.c | 222 +++++++++++ 24 files changed, 1613 insertions(+), 97 deletions(-) create mode 100644 src/xenconfig/libxlu_disk_i.h create mode 100644 src/xenconfig/libxlu_disk_l.l create mode 100644 src/xenconfig/xen_xl.c create mode 100644 src/xenconfig/xen_xl.h create mode 100644 tests/xlconfigdata/test-disk-key-value.cfg create mode 100644 tests/xlconfigdata/test-disk-key-value.xml create mode 100644 tests/xlconfigdata/test-fullvirt-cdrom-empty.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-cdrom-empty.xml create mode 100644 tests/xlconfigdata/test-fullvirt-new-disk.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-new-disk.xml create mode 100644 tests/xlconfigdata/test-fullvirt-spice.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-spice.xml create mode 100644 tests/xlconfigdata/test.cfg create mode 100644 tests/xlconfigdata/test.xml create mode 100644 tests/xlconfigtest.c This may not be in a very good shape but a review would be good for me. I will follow up with a finer series. changes since prepost -changed to use a flex based scanner(from xen libxl) instead of parsing disk config by hand -split the patches -- 1.8.4.5

2 5

[libvirt] [PATCH 0/2] bugfix: support dhcp network interfaces
by Gene Czarcinski 09 Sep '14

09 Sep '14

Support for a network such as -N dhcp,source=default was not working in that dhclient was not being started. Although I am not sure what the real problem is, the solution is to use g_spawn_sync() instead of g_spawn_async() to start /sbin/dhclient. The second patch addes "-v" to the dhclient arguments to improve debugging info. The dhclient into will be in /var/log/messages the Secure Contrainer host system and not in the container itself. Gene Czarcinski (2): for dhclient use g_spawn_sync instead of g_spawn_async add -v to dhclient parameter arguments libvirt-sandbox/libvirt-sandbox-init-common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 1.9.3

2 3

[libvirt] DHCP and secure containers
by Gene Czarcinski 09 Sep '14

09 Sep '14

OK, hopefully this mailing list is more active and I can get some response to my questions. --------------------------------------------------------------------------------------------------------------------- I have been "playing with" Secure Containers running a lighttpd server and have it up and running. I used Adam's process (https://www.happyassassin.net/2014/07/23/bridged-networking-for-libvirt-wit…) for getting a bridge defined when also running NetworkManager. I then created a virtual network definition: > <network> > <name>net18</name> > <uuid>8d19a05b-ac85-4e2a-88bc-5ca4cbb29a33</uuid> > <forward mode='bridge'/> > <bridge name='br0'/> > </network> This works fine when I use static addresses such as: > -N > source=net18,address=192.168.18.94/24,route=192.168.18.255%192.168.18.1 but does not work when I specify using dhcp: > -N source=net18,dhcp I have reported this as a bug: https://bugzilla.redhat.com/show_bug.cgi?id=1133686 Since there has not been much of a reaction to the BZ report, I decided to take a look at the source code (it sure would have been nice if the SRPMS were there in the F20 fedora-virt-preview but I get the package from development/21). I see that libvirt-sandbox-init-common.c has the code for starting dhcp and also has main() along with some runtime options for -v verbose and -d debug. OK, how do I go about turning verbose and/or debug on? Any suggestions on how to debug and get dhcp to work? I not only want to find the problem but to fix the problem if needed. Gene

2 4

[libvirt] [PATCH v6 0/3] OVMF exposure
by Michal Privoznik 09 Sep '14

09 Sep '14

Diff to v5: - changed readonly='on|off' to readonly='yes|no' - rebased to current upstream Michal Privoznik (3): conf: Extend <loader/> and introduce <nvram/> qemu: Implement extended loader and nvram qemu: Automatically create NVRAM store docs/formatdomain.html.in | 22 +++- docs/schemas/domaincommon.rng | 28 +++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 96 ++++++++++++++- src/conf/domain_conf.h | 23 +++- src/libvirt_private.syms | 3 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 14 +++ src/qemu/qemu_command.c | 97 ++++++++++++++- src/qemu/qemu_conf.c | 94 ++++++++++++++ src/qemu/qemu_conf.h | 5 + src/qemu/qemu_process.c | 137 +++++++++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 3 + src/security/security_dac.c | 8 ++ src/security/security_selinux.c | 8 ++ src/security/virt-aa-helper.c | 4 +- src/vbox/vbox_common.c | 7 +- src/xenapi/xenapi_driver.c | 3 +- src/xenconfig/xen_common.c | 7 +- src/xenconfig/xen_sxpr.c | 16 +-- tests/domainschemadata/domain-bios-nvram-empty.xml | 40 ++++++ .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 10 ++ tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 40 ++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 +- tests/qemuxml2xmltest.c | 2 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 82 files changed, 705 insertions(+), 82 deletions(-) create mode 100644 tests/domainschemadata/domain-bios-nvram-empty.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml -- 1.8.5.5

2 7

[libvirt] [PATCH] virsh: additional scaled output units
by Eric Blake 09 Sep '14

09 Sep '14

The parser accepts P and E, so the formatter should too. * tools/virsh.c (vshPrettyCapacity): Handle larger units. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 9706acc..64195a4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -151,22 +151,40 @@ vshNameSorter(const void *a, const void *b) double vshPrettyCapacity(unsigned long long val, const char **unit) { - if (val < 1024) { + double limit = 1024; + + if (val < limit) { *unit = "B"; - return (double)val; - } else if (val < (1024.0l * 1024.0l)) { + return val; + } + limit *= 1024; + if (val < limit) { *unit = "KiB"; - return (((double)val / 1024.0l)); - } else if (val < (1024.0l * 1024.0l * 1024.0l)) { + return val / (limit / 1024); + } + limit *= 1024; + if (val < limit) { *unit = "MiB"; - return (double)val / (1024.0l * 1024.0l); - } else if (val < (1024.0l * 1024.0l * 1024.0l * 1024.0l)) { + return val / (limit / 1024); + } + limit *= 1024; + if (val < limit) { *unit = "GiB"; - return (double)val / (1024.0l * 1024.0l * 1024.0l); - } else { + return val / (limit / 1024); + } + limit *= 1024; + if (val < limit) { *unit = "TiB"; - return (double)val / (1024.0l * 1024.0l * 1024.0l * 1024.0l); + return val / (limit / 1024); } + limit *= 1024; + if (val < limit) { + *unit = "PiB"; + return val / (limit / 1024); + } + limit *= 1024; + *unit = "EiB"; + return val / (limit / 1024); } /* -- 1.9.3

2 2

[libvirt] [PATCH] virNetSocketNewConnectUNIX: create socket dir if needed
by Serge Hallyn 09 Sep '14

09 Sep '14

Since 1b807f92dbb617db5b9d551777d3026d8ff0903f, if ~/.cache does not exist, 'virsh -c qemu:///session' fails, because it attempts to bind to ~/.cache/libvirt/libvirt-sock. Create the socket's directory if needed. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/rpc/virnetsocket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 586a0d7..14f8cca 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -598,6 +598,10 @@ int virNetSocketNewConnectUNIX(const char *path, if (pid == 0) { umask(0077); + if (path[0] != '@') { + if (virFileMakeParentPath(path) < 0) + virReportSystemError(errno, "%s", _("Failed to create directory")); + } if (bind(passfd, &remoteAddr.data.sa, remoteAddr.len) < 0) _exit(EXIT_FAILURE); -- 2.1.0

2 2

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

09 Sep '14

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

1 0

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

09 Sep '14

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

2 2

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

09 Sep '14

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

2 16

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

09 Sep '14

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

3 3

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

09 Sep '14

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

3 59