- Devel - libvirt List Archives

[libvirt] libvirt-python: memory leak after GetXMLDesc?
by Junichi Nomura 12 Sep '14

12 Sep '14

Hello, I've observed memory leak in long-running python program and suspects a bug in libvirt-python. libvirt-python contains auto-generated code like this: libvirt_virDomainGetXMLDesc(...) { ... LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetXMLDesc(domain, flags); LIBVIRT_END_ALLOW_THREADS; py_retval = libvirt_charPtrWrap((char *) c_retval); return py_retval; } virDomainGetXMLDesc() expects the caller to free c_retval. Though it used to be freed in libvirt_charPtrWrap(), commit bb3301ba ("Don't free passed in args in libvirt_charPtrWrap / libvirt_charPtrSizeWrap") has moved the responsibility to the outside. So, it seems either GetXMLDesc should not depend on auto-generation or the generator should be fixed. Any comments? -- Jun'ichi Nomura, NEC Corporation

3 3

[libvirt] [PATCH 0/2] Couple of NVRAM fixes
by Michal Privoznik 12 Sep '14

12 Sep '14

*** BLURB HERE *** Michal Privoznik (2): nvram: Fix permissions virDomainUndefineFlags: Allow NVRAM unlinking include/libvirt/libvirt.h.in | 2 ++ libvirt.spec.in | 2 +- src/qemu/qemu_driver.c | 19 ++++++++++++++++++- src/security/security_selinux.c | 5 ++++- tools/virsh-domain.c | 15 ++++++++++++--- tools/virsh.pod | 6 +++++- 6 files changed, 42 insertions(+), 7 deletions(-) -- 1.8.5.5

3 8

[libvirt] QEMU migration with non-shared storage
by Michael Chapman 12 Sep '14

12 Sep '14

Hello, I am trying to understand libvirt's logic for checking whether migration of a VM is safe, and how it determines which disks should be mirrored by QEMU. My particular use case involves VMs that may have disks backed onto LVM or onto Ceph RBD, or both. As far as I can tell, the qemuMigrationIsSafe check is there to ensure that all disks are readonly, or have cache=none, or their backends can guarantee cache coherence. As far as I can tell, however, QEMU flushes *all* block devices when it pauses a VM's CPUs (just before the final part of migration, for instance), so I'm wondering why this check is needed. Is there any possible situation for the source VM to be paused, for its block devices to be flushed, and yet the destination VM can't see all completed writes? Why is RBD is handled specially in this function? The current logic is that an RBD-backed disk is safe to be migrated even if it's got caching enabled, but I'm not sure how RBD is different from other backends in this regard. If VIR_MIGRATE_NON_SHARED_DISK or _INC is specified, should these safety checks be relaxed? It seems to me that if any non-shared disk is going to be *explicitly* copied from the source to the destination VM, then cache coherence in the backend is irrelevant. At the moment, the set of non-shared block devices copied by VIR_MIGRATE_NON_SHARED_* differs depending on whether NBD is being used in the migration: - If NBD can't be used (e.g. with a tunnelled migration), then QEMU will copy *all* non-readonly block devices; - If NBD is being used, then QEMU will only mirror "shareable", "readonly" or "sourceless" disks. A problem arises with RBD disks that have caching enabled. According to qemuMigrationIsSafe, these disks are "safe" to be migrated. However in either the NBD or the non-NBD case, the RBD disk will be copied. This is clearly not desirable. If RBD is a special case in qemuMigrationIsSafe, does it also need to be a special case when configuring the NBD server? Or, if an NBD server is not going to be used, should the migration be considered "unsafe" if an RBD disk is present? I'd very much appreciate some help in understanding all of this. At the moment, I think my only option is to run RBD without caching at all. However, not only does that result in very poor performance, it also doesn't seem to match the qemuMigrationIsSafe check. Regards, Michael

4 3

[libvirt] [PATCH V4 0/3] Testing libvirt XML -> libxl_domain_config conversion
by Jim Fehlig 12 Sep '14

12 Sep '14

This is version 4 of the work started by danpb: https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html This series tests the conversion of libvirt XML to libxl_domain_config objects by the libvirt libxl driver. Changed in V4: - V3 patches 2-4 have been pushed - Patch 1 is unchanged from V3 - Patch 2 is new and adds tests for virJSONStringCompare - Cleanup of ignored context paths definition in patch 3 (was #5 in V3) Daniel P. Berrange (2): util: Introduce virJSONStringCompare for JSON doc comparisons libxl: Add a test suite for libxl option generator Jim Fehlig (1): tests: add tests for virJSONStringCompare configure.ac | 2 + src/libvirt_private.syms | 1 + src/util/virjson.c | 242 +++++++++++++++++++++++++++++++++ src/util/virjson.h | 16 +++ tests/Makefile.am | 25 +++- tests/jsontest.c | 63 ++++++++- tests/libxlxml2jsondata/basic-hvm.json | 217 +++++++++++++++++++++++++++++ tests/libxlxml2jsondata/basic-hvm.xml | 36 +++++ tests/libxlxml2jsondata/basic-pv.json | 163 ++++++++++++++++++++++ tests/libxlxml2jsondata/basic-pv.xml | 28 ++++ tests/libxlxml2jsontest.c | 228 +++++++++++++++++++++++++++++++ tests/virmocklibxl.c | 87 ++++++++++++ 12 files changed, 1102 insertions(+), 6 deletions(-) create mode 100644 tests/libxlxml2jsondata/basic-hvm.json create mode 100644 tests/libxlxml2jsondata/basic-hvm.xml create mode 100644 tests/libxlxml2jsondata/basic-pv.json create mode 100644 tests/libxlxml2jsondata/basic-pv.xml create mode 100644 tests/libxlxml2jsontest.c create mode 100644 tests/virmocklibxl.c -- 1.8.4.5

1 3

[libvirt] [PATCH V3 0/5] Testing libvirt XML -> libxl_domain_config conversion
by Jim Fehlig 12 Sep '14

12 Sep '14

This is version 3 of the work started by danpb: https://www.redhat.com/archives/libvir-list/2014-May/msg01102.html This series tests the conversion of libvirt XML to libxl_domain_config objects by the libvirt libxl driver. Changed in v3: - Change virJSONStringCompare to accept a list of context paths to ignore - Report error in virJSONStringCompare in libyajl is not available - Fix a bug (4/5) exposed by the new tests - Add tests for conversion of both PV and HVM config - Define json context paths to ignore based on features defined in libxl.h Daniel P. Berrange (4): util: Introduce virJSONStringCompare for JSON doc comparisons util: Allow port allocator to skip bind() check tests: Add more test suite mock helpers libxl: Add a test suite for libxl option generator Jim Fehlig (1): libxl: fix mapping of libvirt and libxl lifecycle actions configure.ac | 2 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 62 +++++++- src/libxl/libxl_driver.c | 5 +- src/qemu/qemu_driver.c | 9 +- src/util/virjson.c | 242 +++++++++++++++++++++++++++++++ src/util/virjson.h | 16 +++ src/util/virportallocator.c | 14 +- src/util/virportallocator.h | 7 +- tests/Makefile.am | 25 +++- tests/libxlxml2jsondata/basic-hvm.json | 217 ++++++++++++++++++++++++++++ tests/libxlxml2jsondata/basic-hvm.xml | 36 +++++ tests/libxlxml2jsondata/basic-pv.json | 163 +++++++++++++++++++++ tests/libxlxml2jsondata/basic-pv.xml | 28 ++++ tests/libxlxml2jsontest.c | 251 +++++++++++++++++++++++++++++++++ tests/virfirewalltest.c | 4 +- tests/virmock.h | 54 +++++-- tests/virmocklibxl.c | 87 ++++++++++++ tests/virportallocatortest.c | 4 +- tests/virsystemdtest.c | 4 +- 20 files changed, 1198 insertions(+), 33 deletions(-) create mode 100644 tests/libxlxml2jsondata/basic-hvm.json create mode 100644 tests/libxlxml2jsondata/basic-hvm.xml create mode 100644 tests/libxlxml2jsondata/basic-pv.json create mode 100644 tests/libxlxml2jsondata/basic-pv.xml create mode 100644 tests/libxlxml2jsontest.c create mode 100644 tests/virmocklibxl.c -- 1.8.4.5

2 14

[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

[libvirt] ANNOUNCE: libvirt 1.1.3.6 maintenance release
by Cole Robinson 08 Sep '14

08 Sep '14

libvirt 1.1.3.6 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.6.tar.gz Changes in this version: * fix api changes in xen restore * maint: fix typo in previous patch * maint: cleanup detection of const'ness of selinux ctx * build: fix build with libselinux 2.3 * virerror: Fix an error message typo * storage: Report error from VolOpen by default * storage: Rename VolOpenCheckMode to VolOpen * storage: move block format lookup to shared UpdateVolInfo * storage: Rename UpdateVolInfoFlags to UpdateVolInfo * LXC: fix the problem that libvirt lxc fail to start on latest kernel * Fix pci bus naming for PPC * libxl: Check for control_d string to decide about dom0 * Free ifname in testDomainGenerateIfnames * Don't include @LIBS@ in libvirt.pc.in file * qemu: copy: Accept 'format' parameter when copying to a non-existing img * build: fix 'make check' with newer git * docs: publish correct enum values * qemu: blockcopy: Don't remove existing disk mirror info * LSN-2014-0003: Don't expand entities when parsing XML * libxl: fix framebuffer port setting for HVM domains For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] blockjob: avoid 32-bit compilation warning
by Eric Blake 08 Sep '14

08 Sep '14

Commit c1d75de caused this warning on 32-bit platforms (fatal when -Werror is enabled): 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] Forcing the left side of the < to be ull instead of ul shuts up the 32-bit compiler while still protecting 64-bit code from overflow. * tools/virsh-domain.c (cmdBlockCopy): Add type coercion. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 39ff798..ed2e3ea 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2000,7 +2000,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) if (bandwidth) { /* bandwidth is ulong MiB/s, but the typed parameter is * ullong bytes/s; make sure we don't overflow */ - if (bandwidth > ULLONG_MAX >> 20) { + if (bandwidth + 0ULL > ULLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), ULLONG_MAX >> 20); -- 1.9.3

2 2

[libvirt] [PATCH] util: let virSetSockReuseAddr report unified error message
by Martin Kletzander 08 Sep '14

08 Sep '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/rpc/virnetsocket.c | 7 ++----- src/util/virportallocator.c | 5 +---- src/util/virutil.c | 13 ++++++++++--- src/util/virutil.h | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 586a0d7..2192dc8 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -278,10 +278,8 @@ int virNetSocketNewListenTCP(const char *nodename, goto error; } - if (virSetSockReuseAddr(fd) < 0) { - virReportSystemError(errno, "%s", _("Unable to enable port reuse")); + if (virSetSockReuseAddr(fd, true) < 0) goto error; - } #ifdef IPV6_V6ONLY if (runp->ai_family == PF_INET6) { @@ -493,9 +491,8 @@ int virNetSocketNewConnectTCP(const char *nodename, goto error; } - if (virSetSockReuseAddr(fd) < 0) { + if (virSetSockReuseAddr(fd, false) < 0) VIR_WARN("Unable to enable port reuse"); - } if (connect(fd, runp->ai_addr, runp->ai_addrlen) >= 0) break; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index ff5691a..f1dade3 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -142,11 +142,8 @@ static int virPortAllocatorBindToPort(bool *used, goto cleanup; } - if (virSetSockReuseAddr(fd) < 0) { - virReportSystemError(errno, "%s", - _("Unable to set socket reuse addr flag")); + if (virSetSockReuseAddr(fd, true) < 0) goto cleanup; - } if (ipv6 && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&v6only, sizeof(v6only)) < 0) { diff --git a/src/util/virutil.c b/src/util/virutil.c index 04113bb..8d2f62a 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -148,7 +148,7 @@ int virSetCloseExec(int fd) } #ifdef WIN32 -int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED) +int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED, bool fatal ATTRIBUTE_UNUSED) { /* * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT @@ -163,10 +163,17 @@ int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED) return 0; } #else -int virSetSockReuseAddr(int fd) +int virSetSockReuseAddr(int fd, bool fatal) { int opt = 1; - return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + int ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + + if (ret < 0 && fatal) { + virReportSystemError(errno, "%s", + _("Unable to set socket reuse addr flag")); + } + + return ret; } #endif diff --git a/src/util/virutil.h b/src/util/virutil.h index 89b7923..54f1148 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -43,7 +43,7 @@ int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; int virSetInherit(int fd, bool inherit) ATTRIBUTE_RETURN_CHECK; int virSetCloseExec(int fd) ATTRIBUTE_RETURN_CHECK; -int virSetSockReuseAddr(int fd) ATTRIBUTE_RETURN_CHECK; +int virSetSockReuseAddr(int fd, bool fatal) ATTRIBUTE_RETURN_CHECK; int virPipeReadUntilEOF(int outfd, int errfd, char **outbuf, char **errbuf); -- 2.1.0

2 1

[libvirt] [PATCH v3] esx: Add the actual product version to the error message.
by Richard W.M. Jones 08 Sep '14

08 Sep '14

v3: - Split the long lines. Rich.

1 1

[libvirt] [PATCH v2] esx: Add the actual product version to the error message.
by Richard W.M. Jones 08 Sep '14

08 Sep '14

Ugh, printing the wrong field in the second error message. Try again with that fixed. Rich.

2 2

[libvirt] [PATCH] esx: Add the actual product version to the error message.
by Richard W.M. Jones 08 Sep '14

08 Sep '14

This is just an old patch I had from when I was trying to use the 'esx://' URI scheme to access a vCenter resource (which turns out to use 'vpx://' instead, which was the problem I was having). It's useful for debugging purposes to print the actual product version from the server in the error message. Rich.

2 2

[libvirt] [PATCH] qemu: panic device: check for invalid address type
by Erik Skultety 08 Sep '14

08 Sep '14

qemu now checks for invalid address type for a panic device, which is currently implemented only to use ISA address type, thus rejecting any other options, except for leaving XML attributes blank, in that case, defaults are used (this behaviour remains the same from earlier verions). --- src/qemu/qemu_command.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ca98fb..2611799 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9418,12 +9418,16 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->panic) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PANIC)) { - if (def->panic->info.addr.isa.iobase > 0) { + if (def->panic->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) { virCommandAddArg(cmd, "-device"); virCommandAddArgFormat(cmd, "pvpanic,ioport=%d", def->panic->info.addr.isa.iobase); - } else { + } else if (def->panic->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virCommandAddArgList(cmd, "-device", "pvpanic", NULL); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("panic device only works with ISA address type")); + goto error; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 1.9.3

2 2

[libvirt] [PATCH] qemu: Propagate QEMU errors during incoming migrations
by Jiri Denemark 08 Sep '14

08 Sep '14

When QEMU fails during incoming migration after we successfully started it (i.e., during Perform or Finish phase), we report a rather unhelpful message Unable to read from monitor: Connection reset by peer We already have a code that takes error messages from QEMU's error output but we disable it once QEMU successfully starts. This patch postpones this until the end of Finish phase during incoming migration so that we can report a much better error message: internal error: early end of file from monitor: possible problem: Unknown savevm section or instance '0000:00:05.0/virtio-balloon' 0 load of migration failed https://bugzilla.redhat.com/show_bug.cgi?id=1090093 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 2 ++ src/qemu/qemu_monitor.c | 7 ++++++- src/qemu/qemu_process.c | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f2b421e..64f0d8d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4689,6 +4689,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, cleanup: virPortAllocatorRelease(driver->migrationPorts, port); if (vm) { + if (priv->mon) + qemuMonitorSetDomainLog(priv->mon, -1); VIR_FREE(priv->origname); virObjectUnlock(vm); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d96b1b8..3bb6cb9 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -631,8 +631,11 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) error = true; } else { if (events & VIR_EVENT_HANDLE_WRITABLE) { - if (qemuMonitorIOWrite(mon) < 0) + if (qemuMonitorIOWrite(mon) < 0) { error = true; + if (errno == ECONNRESET) + hangup = true; + } events &= ~VIR_EVENT_HANDLE_WRITABLE; } @@ -642,6 +645,8 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) events &= ~VIR_EVENT_HANDLE_READABLE; if (got < 0) { error = true; + if (errno == ECONNRESET) + hangup = true; } else if (got == 0) { eof = true; } else { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 38ed3fe..b1d8a32 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4379,8 +4379,10 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } - /* unset reporting errors from qemu log */ - qemuMonitorSetDomainLog(priv->mon, -1); + /* Keep watching qemu log for errors during incoming migration, otherwise + * unset reporting errors from qemu log. */ + if (!migrateFrom) + qemuMonitorSetDomainLog(priv->mon, -1); virCommandFree(cmd); VIR_FORCE_CLOSE(logfile); -- 2.1.0

2 2

[libvirt] [PATCH 0/5] qemu: Fix job handling in snapshot code
by Peter Krempa 08 Sep '14

08 Sep '14

The snapshot code had some issues with job handling. This is an attempt to do it right. Jincheng Miao (1): qemu: snapshot: Acquire job earlier on snapshot revert/delete Peter Krempa (4): qemu: Rename DEFAULT_JOB_MASK to QEMU_DEFAULT_JOB_MASK qemu: snapshot: Fix job handling when creating snapshots qemu: snapshot: Fix snapshot function header formatting qemu: snapshot: Simplify error paths src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 317 +++++++++++++++++++++------------------------- src/qemu/qemu_migration.c | 6 +- 4 files changed, 151 insertions(+), 176 deletions(-) -- 2.0.2

2 11

Re: [libvirt] [Qemu-devel] IO accounting overhaul
by Markus Armbruster 08 Sep '14

08 Sep '14

Cc'ing libvirt following Stefan's lead. Benoît Canet <benoit.canet(a)irqsave.net> writes: > Hi, > > I collected some items of a cloud provider wishlist regarding I/O accouting. Feedback from real power-users, lovely! > In a cloud I/O accouting can have 3 purpose: billing, helping the customers > and doing metrology to help the cloud provider seeks hidden costs. > > I'll cover the two former topic in this mail because they are the most important > business wize. > > 1) prefered place to collect billing IO accounting data: > -------------------------------------------------------- > For billing purpose the collected data must be as close as possible to what the > customer would see by using iostats in his vm. Good point. > The first conclusion we can draw is that the choice of collecting IO accouting > data used for billing in the block devices models is right. Slightly rephrasing: doing I/O accounting in the block device models is right for billing. There may be other uses for I/O accounting, with different preferences. For instance, data on how exactly guest I/O gets translated to host I/O as it flows through the nodes in the block graph could be useful. Doesn't diminish the need for accurate billing information, of course. > 2) what to do with occurences of rare events: > --------------------------------------------- > > Another point is that QEMU developpers agree that they don't know which policy > to apply to some I/O accounting events. > Must QEMU discard invalid I/O write IO or account them as done ? > Must QEMU count a failed read I/O as done ? > > When discusting this with a cloud provider the following appears: > these decisions > are really specific to each cloud provider and QEMU should not implement them. Good point, consistent with the old advice to avoid baking policy into inappropriately low levels of the stack. > The right thing to do is to add accouting counters to collect these events. > > Moreover these rare events are precious troubleshooting data so it's > an additional > reason not to toss them. Another good point. > 3) list of block I/O accouting metrics wished for billing and helping > the customers > ----------------------------------------------------------------------------------- > > Basic I/O accouting data will end up making the customers bills. > Extra I/O accouting informations would be a precious help for the cloud provider > to implement a monitoring panel like Amazon Cloudwatch. These are the first two from your list of three purposes, i.e. the ones you promised to cover here. > Here is the list of counters and statitics I would like to help > implement in QEMU. > > This is the most important part of the mail and the one I would like > the community > review the most. > > Once this list is settled I would proceed to implement the required > infrastructure > in QEMU before using it in the device models. For context, let me recap how I/O accounting works now. The BlockDriverState abstract data type (short: BDS) can hold the following accounting data: uint64_t nr_bytes[BDRV_MAX_IOTYPE]; uint64_t nr_ops[BDRV_MAX_IOTYPE]; uint64_t total_time_ns[BDRV_MAX_IOTYPE]; uint64_t wr_highest_sector; where BDRV_MAX_IOTYPE enumerates read, write, flush. wr_highest_sector is a high watermark updated by the block layer as it writes sectors. The other three are *not* touched by the block layer. Instead, the block layer provides a pair of functions for device models to update them: void bdrv_acct_start(BlockDriverState *bs, BlockAcctCookie *cookie, int64_t bytes, enum BlockAcctType type); void bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie); bdrv_acct_start() initializes cookie for a read, write, or flush operation of a certain size. The size of a flush is always zero. bdrv_acct_done() adds the operations to the BDS's accounting data. total_time_ns is incremented by the time between _start() and _done(). You may call _start() without calling _done(). That's a feature. Device models use it to avoid accounting some requests. Device models are not supposed to mess with cookie directly, only through these two functions. Some device models implement accounting, some don't. The ones that do don't agree on how to count invalid guest requests (the ones not passed to block layer) and failed requests (passed to block layer and failed there). It's a mess in part caused by us never writing down what exactly device models are expected to do. Accounting data is used by "query-blockstats", and nothing else. Corollary: even though every BDS holds accounting data, only the ones in "top" BDSes ever get used. This is a common block layer blemish, and we're working on cleaning it up. If a device model doesn't implement accounting, query-blockstats lies. Fortunately, its lies are pretty transparent (everything's zero) as long as you don't do things like connecting a backend to a device model that doesn't implement accounting after disconnecting it from a device model that does. Still, I'd welcome a more honest QMP interface. For me, this accounting data belongs to the device model, not the BDS. Naturally, the block device models should use common infrastructure. I guess they use the block layer only because it's obvious infrastructure they share. Clumsy design. > /* volume of data transfered by the IOs */ > read_bytes > write_bytes This is nr_bytes[BDRV_ACCT_READ] and nr_bytes[BDRV_ACCT_WRITE]. nr_bytes[BDRV_ACCT_FLUSH] is always zero. Should this count only actual I/O, i.e. accumulated size of successful operations? > /* operation count */ > read_ios > write_ios > flush_ios > > /* how many invalid IOs the guest submit */ > invalid_read_ios > invalid_write_ios > invalid_flush_ios > > /* how many io error happened */ > read_ios_error > write_ios_error > flush_ios_error This is nr_ops[BDRV_ACCT_READ], nr_ops[BDRV_ACCT_WRITE], nr_ops[BDRV_ACCT_FLUSH] split up into successful, invalid and failed. > /* account the time passed doing IOs */ > total_read_time > total_write_time > total_flush_time This is total_time_ns[BDRV_ACCT_READ], total_time_ns[BDRV_ACCT_WRITE], total_time_ns[BDRV_ACCT_FLUSH]. I guess this should count both successful and failed I/O. Could throw in invalid, too, but it's probably too quick to matter. Please specify the unit clearly. Both total_FOO_time_ns or total_FOO_ns would work for me. > /* since when the volume is iddle */ > qvolume_iddleness_time "idle" The obvious way to maintain this information with the current could would be saving the value of get_clock() in bdrv_acct_done(). > /* the following would compute latecies for slices of 1 seconds then toss the > * result and start a new slice. A weighted sumation of the instant latencies > * could help to implement this. > */ > 1s_read_average_latency > 1s_write_average_latency > 1s_flush_average_latency > > /* the former three numbers could be used to further compute a 1 > minute slice value */ > 1m_read_average_latency > 1m_write_average_latency > 1m_flush_average_latency > > /* the former three numbers could be used to further compute a 1 hours > slice value */ > 1h_read_average_latency > 1h_write_average_latency > 1h_flush_average_latency This is something like "what we added to total_FOO_time in the last completed 1s / 1m / 1h time slice divided by the number of additions". Just another way to accumulate the same raw data, thus no worries. > /* 1 second average number of requests in flight */ > 1s_read_queue_depth > 1s_write_queue_depth > > /* 1 minute average number of requests in flight */ > 1m_read_queue_depth > 1m_write_queue_depth > > /* 1 hours average number of requests in flight */ > 1h_read_queue_depth > 1h_write_queue_depth I guess this involves counting bdrv_acct_start() and bdrv_acct_done(). The "you need not call bdrv_acct_done()" feature may get in the way. Solvable. Permit me a short detour into the other use for I/O accounting I mentioned: data on how exactly guest I/O gets translated to host I/O as it flows through the nodes in the block graph. Do you think this would be pretty much the same data, just collected at different points? > 4) Making this happen > ------------------------- > > Outscale want to make these IO stat happen and gave me the go to do whatever > grunt is required to do so. > That said we could collaborate on some part of the work. Cool! A quick stab at tasks: * QMP interface, either a compatible extension of query-blockstats or a new one. * Rough idea on how to do the shared infrastructure. * Implement (can be split up into several tasks if desired)

3 10

[libvirt] [PATCH-RFC] qemu: Add network bandwidth setting for ethernet interfaces
by Anirban Chakraborty 08 Sep '14

08 Sep '14

ethernet interfaces in libvirt currently do not support bandwidth setting. For example, following xml file for an interface will not apply these settings to corresponding qdiscs. ---- <interface type="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e4"/> <bandwidth> <inbound average="984" peak="1024" burst="64"/> <outbound average="2000" peak="2048" burst="128"/> </bandwidth> </interface> ----- This patch fixes the behavior. Please review it and if it appears ok, please apply. thanks, Anirban Chakraborty Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_hotplug.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2184caa..258c6a7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7251,6 +7251,11 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (tapfd[0] < 0) goto cleanup; } + /* Configure network bandwidth for ethernet type network interfaces */ + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) + if (virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a364c52..aeb53c5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -940,6 +940,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; vhostfdSize = 1; if (VIR_ALLOC(vhostfd) < 0) goto cleanup; -- 1.8.2.3

3 6

[libvirt] [PATCH v2] maint: update to latest gnulib
by Eric Blake 07 Sep '14

07 Sep '14

The usual portability fixes; and this includes a fix that adds a new syntax check for double semicolons (commit 28de556 fixed some, but gnulib found a better check). * .gnulib: Update to latest. * src/xenconfig/xen_common.c (xenFormatConfigCommon): Fix offender. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v1 was here: https://www.redhat.com/archives/libvir-list/2014-September/msg00230.html Pushing under the gnulib maintenance rule; v1 was acked, and all that differs is that gnulib now does the syntax check. .gnulib | 2 +- src/xenconfig/xen_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 2d28074..9565c3b 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 2d280742a9e30088aa169f53353765d5daafe4c0 +Subproject commit 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index accd25f..bab67de 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -2034,7 +2034,7 @@ xenFormatConfigCommon(virConfPtr conf, return -1; if (xenFormatCPUFeatures(conf, def, xendConfigVersion) < 0) - return -1;; + return -1; if (xenFormatCDROM(conf, def, xendConfigVersion) < 0) return -1; -- 1.9.3

1 0

Re: [libvirt] [PATCH] openvz: fixed an config file parsing error
by Hongbin Lu 07 Sep '14

07 Sep '14

Resend the email below. On Mon, Sep 1, 2014 at 8:28 PM, Hongbin Lu <hongbin034(a)gmail.com> wrote: > The OpenVZ driver reported an error on parsing some OpenVZ config > parameters (e.g. diskspace). This issue is due to the driver made > two incorrect assumptions about the value of the parameters: > 1. Assume paramaeter is just a number (e.g. 1024). > 2. Assume the number is an integer. > Actually, an OpenVZ config parameter may consists of a scalar and > a unit, and the scalar is not necessary an integer (e.g. 2.2G). > This patch is for fixing this issue. > --- > src/openvz/openvz_conf.c | 99 > ++++++++++++++++++++++++++++++++++++++++++++- > src/openvz/openvz_conf.h | 6 +++ > 2 files changed, 102 insertions(+), 3 deletions(-) > > diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c > index 856c9f5..7dba925 100644 > --- a/src/openvz/openvz_conf.c > +++ b/src/openvz/openvz_conf.c > @@ -127,6 +127,42 @@ int openvzExtractVersion(struct openvz_driver *driver) > } > > > +static int > +openvzParseParamUnit(char* str, openvzParamUnit *unit) > +{ > + int len = strlen(str); > + if (len == 0) > + return -1; > + > + switch (str[len - 1]) { > + case 'G': > + case 'g': > + str[len - 1] = '\0'; > + if (unit != NULL) > + *unit = OPENVZ_PARAM_UNIT_GIGABYTE; > + break; > + case 'M': > + case 'm': > + str[len - 1] = '\0'; > + if (unit != NULL) > + *unit = OPENVZ_PARAM_UNIT_MEGABYTE; > + break; > + case 'K': > + case 'k': > + str[len - 1] = '\0'; > + if (unit != NULL) > + *unit = OPENVZ_PARAM_UNIT_KILOBYTE; > + break; > + case 'P': > + case 'p': > + str[len - 1] = '\0'; > + break; > + } > + > + return 0; > +} > + > + > /* Parse config values of the form barrier:limit into barrier and limit */ > static int > openvzParseBarrierLimit(const char* value, > @@ -146,7 +182,10 @@ openvzParseBarrierLimit(const char* value, > goto error; > } else { > if (barrier != NULL) { > - if (virStrToLong_ull(token, NULL, 10, barrier)) > + if (openvzParseParamUnit(token, NULL) < 0) > + goto error; > + > + if (virStrToLong_ull(token, NULL, 10, barrier) < 0) > goto error; > } > } > @@ -155,7 +194,10 @@ openvzParseBarrierLimit(const char* value, > goto error; > } else { > if (limit != NULL) { > - if (virStrToLong_ull(token, NULL, 10, limit)) > + if (openvzParseParamUnit(token, NULL) < 0) > + goto error; > + > + if (virStrToLong_ull(token, NULL, 10, limit) < 0) > goto error; > } > } > @@ -166,6 +208,57 @@ openvzParseBarrierLimit(const char* value, > } > > > +static int > +openvzParseBarrierLimit2(const char* value, > + unsigned long long *barrier, > + unsigned long long *limit, > + openvzParamUnit targetunit) > +{ > + char *token; > + char *saveptr = NULL; > + char *str; > + double dbarrier, dlimit; > + openvzParamUnit unit = OPENVZ_PARAM_UNIT_KILOBYTE; > + int ret = -1; > + > + if (VIR_STRDUP(str, value) < 0) > + goto error; > + > + token = strtok_r(str, ":", &saveptr); > + if (token == NULL) > + goto error; > + > + if (barrier != NULL) { > + if (openvzParseParamUnit(token, &unit) < 0) > + goto error; > + > + if (virStrToDouble(token, NULL, &dbarrier) < 0) > + goto error; > + > + *barrier = (unsigned long long)(dbarrier * unit / targetunit); > + } > + > + token = strtok_r(NULL, ":", &saveptr); > + if (token == NULL) > + goto error; > + > + if (limit != NULL) { > + if (openvzParseParamUnit(token, &unit) < 0) > + goto error; > + > + if (virStrToDouble(token, NULL, &dlimit) < 0) > + goto error; > + > + *limit = (unsigned long long)(dlimit * unit / targetunit); > + } > + > + ret = 0; > + error: > + VIR_FREE(str); > + return ret; > +} > + > + > virCapsPtr openvzCapsInit(void) > { > virCapsPtr caps; > @@ -396,7 +489,7 @@ openvzReadFSConf(virDomainDefPtr def, > param = "DISKSPACE"; > ret = openvzReadVPSConfigParam(veid, param, &temp); > if (ret > 0) { > - if (openvzParseBarrierLimit(temp, &barrier, &limit)) { > + if (openvzParseBarrierLimit2(temp, &barrier, &limit, > OPENVZ_PARAM_UNIT_KILOBYTE)) { > virReportError(VIR_ERR_INTERNAL_ERROR, > _("Could not read '%s' from config for > container %d"), > param, veid); > diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h > index a7de7d2..788dae9 100644 > --- a/src/openvz/openvz_conf.h > +++ b/src/openvz/openvz_conf.h > @@ -41,6 +41,12 @@ > > # define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + > 1) > > +typedef enum { > + OPENVZ_PARAM_UNIT_KILOBYTE = 1, > + OPENVZ_PARAM_UNIT_MEGABYTE = 1024, > + OPENVZ_PARAM_UNIT_GIGABYTE = 1024 * 1024, > +} openvzParamUnit; > + > struct openvz_driver { > virMutex lock; > > -- > 1.7.1 > >

2 3

[libvirt] [PATCH v2 0/2] parallels: use parallels SDK instead of prlctl tool
by Dmitry Guryanov 06 Sep '14

06 Sep '14

This patchset begins reworking of parallels driver. We have published Opensource version of parallels SDK (under LGPL license), so libvirt can link with it. Dmitry Guryanov (2): parallels: build with parallels SDK parallels: login to parallels SDK configure.ac | 11 +- po/POTFILES.in | 1 + src/Makefile.am | 8 +- src/parallels/parallels_driver.c | 40 ++++++- src/parallels/parallels_sdk.c | 234 +++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 30 +++++ src/parallels/parallels_utils.h | 3 + 7 files changed, 318 insertions(+), 9 deletions(-) create mode 100644 src/parallels/parallels_sdk.c create mode 100644 src/parallels/parallels_sdk.h -- 1.9.3

2 5

[libvirt] [PATCH V2 1/1] libvirtd crash when defining scsi storage pool
by Pradipta Kr. Banerjee 05 Sep '14

05 Sep '14

libvirtd crash when defining scsi storage pool libvirtd crashes when there is an existing SCSI pool defined with adapter type as 'scsi_host' and defining a new SCSI pool with adapter type as 'fc_host' and parent attribute missing or vice versa. For eg If there is an existing SCSI pool with adapter type as 'scsi_host' defined using the following XML <pool type='scsi'> <name>TEST_SCSI_POOL</name> <source> <adapter type='scsi_host' name='scsi_host1'/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> When defining another SCSI pool with adapter type as 'fc_host' using the following XML will crash libvirtd <pool type='scsi'> <name>TEST_SCSI_FC_POOL</name> <source> <adapter type='fc_host' wwnn='1234567890abcdef' wwpn='abcdef1234567890'/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> Same is true for the reverse case as well where there exists a SCSI pool with adapter type as 'fc_host' and another SCSI pool is defined with adapter type as 'scsi_host' This happens because for fc_host 'name' is optional attribute whereas for scsi_host its mandatory. However the check in libvirt for finding duplicate storage pools doesn't take that into account while comparing, resulting into libvirt crashing This patch fixes the issue. This patch is based on the suggestion from John Ferlan Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- V2: Incorporate suggestions from John Ferlan src/conf/storage_conf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e72a869..d42cde7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2117,6 +2117,8 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, break; case VIR_STORAGE_POOL_SCSI: if (pool->def->source.adapter.type == + VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST && + def->source.adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) { if (STREQ(pool->def->source.adapter.data.fchost.wwnn, def->source.adapter.data.fchost.wwnn) && @@ -2124,6 +2126,8 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, def->source.adapter.data.fchost.wwpn)) matchpool = pool; } else if (pool->def->source.adapter.type == + VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST && + def->source.adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) { if (pool->def->source.adapter.data.scsi_host.name) { if (STREQ(pool->def->source.adapter.data.scsi_host.name, -- 1.9.3

2 1

[libvirt] [PATCHv2] Don't include non-migratable features in host-model
by Ján Tomko 05 Sep '14

05 Sep '14

Commit fba6bc4 introduced support for the 'invtsc' feature, which blocks migration. We should not include it in the host-model CPU by default, because it's intended to be used with migration. https://bugzilla.redhat.com/show_bug.cgi?id=1138221 --- v2: added tests and comment, fixed a typo src/cpu/cpu_map.xml | 2 +- src/cpu/cpu_x86.c | 65 ++++++++++++++++++++++-- tests/cputest.c | 1 + tests/cputestdata/x86-host-invtsc+host-model.xml | 22 ++++++++ tests/cputestdata/x86-host-invtsc.xml | 27 ++++++++++ 5 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 tests/cputestdata/x86-host-invtsc+host-model.xml create mode 100644 tests/cputestdata/x86-host-invtsc.xml diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 12987a0..18c7b0d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -328,7 +328,7 @@ </feature>  - <feature name='invtsc'> + <feature name='invtsc' migratable='no'> <cpuid function='0x80000007' edx='0x00000100'/> </feature> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index af2e08e..7571f16 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -89,6 +89,7 @@ struct x86_map { struct x86_vendor *vendors; struct x86_feature *features; struct x86_model *models; + struct x86_feature *migrate_blockers; }; static struct x86_map* virCPUx86Map = NULL; @@ -592,6 +593,28 @@ x86FeatureFree(struct x86_feature *feature) static struct x86_feature * +x86FeatureCopy(const struct x86_feature *src) +{ + struct x86_feature *feature; + + if (VIR_ALLOC(feature) < 0) + return NULL; + + if (VIR_STRDUP(feature->name, src->name) < 0) + goto error; + + if ((feature->data = x86DataCopy(src->data)) == NULL) + goto error; + + return feature; + + error: + x86FeatureFree(feature); + return NULL; +} + + +static struct x86_feature * x86FeatureFind(const struct x86_map *map, const char *name) { @@ -677,6 +700,9 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, int ret = 0; size_t i; int n; + char *str = NULL; + bool migratable = true; + struct x86_feature *migrate_blocker = NULL; if (!(feature = x86FeatureNew())) goto error; @@ -694,6 +720,10 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, goto ignore; } + str = virXPathString("string(@migratable)", ctxt); + if (STREQ_NULLABLE(str, "no")) + migratable = false; + n = virXPathNodeSet("./cpuid", ctxt, &nodes); if (n < 0) goto ignore; @@ -710,6 +740,14 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, goto error; } + if (!migratable) { + if ((migrate_blocker = x86FeatureCopy(feature)) == NULL) + goto error; + + migrate_blocker->next = map->migrate_blockers; + map->migrate_blockers = migrate_blocker; + } + if (map->features == NULL) { map->features = feature; } else { @@ -720,6 +758,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, out: ctxt->node = ctxt_node; VIR_FREE(nodes); + VIR_FREE(str); return ret; @@ -728,6 +767,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, ignore: x86FeatureFree(feature); + x86FeatureFree(migrate_blocker); goto out; } @@ -1093,6 +1133,12 @@ x86MapFree(struct x86_map *map) x86VendorFree(vendor); } + while (map->migrate_blockers != NULL) { + struct x86_feature *migrate_blocker = map->migrate_blockers; + map->migrate_blockers = migrate_blocker->next; + x86FeatureFree(migrate_blocker); + } + VIR_FREE(map); } @@ -2025,16 +2071,15 @@ x86UpdateHostModel(virCPUDefPtr guest, const virCPUDef *host) { virCPUDefPtr oldguest = NULL; + const struct x86_map *map; + const struct x86_feature *feat; size_t i; int ret = -1; guest->match = VIR_CPU_MATCH_EXACT; - /* no updates are required */ - if (guest->nfeatures == 0) { - virCPUDefFreeModel(guest); - return virCPUDefCopyModel(guest, host, true); - } + if (!(map = virCPUx86GetMap())) + goto cleanup; /* update the host model according to the desired configuration */ if (!(oldguest = virCPUDefCopy(guest))) @@ -2044,6 +2089,16 @@ x86UpdateHostModel(virCPUDefPtr guest, if (virCPUDefCopyModel(guest, host, true) < 0) goto cleanup; + /* Remove non-migratable features by default + * Note: this only works as long as no CPU model contains non-migratable + * features directly */ + for (i = 0; i < guest->nfeatures; i++) { + for (feat = map->migrate_blockers; feat; feat = feat->next) { + if (STREQ(feat->name, guest->features[i].name)) + VIR_DELETE_ELEMENT_INPLACE(guest->features, i, guest->nfeatures); + } + } + for (i = 0; i < oldguest->nfeatures; i++) { if (virCPUDefUpdateFeature(guest, oldguest->features[i].name, diff --git a/tests/cputest.c b/tests/cputest.c index 94c0ebc..a507576 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -599,6 +599,7 @@ mymain(void) DO_TEST_UPDATE("x86", "host", "host-model", VIR_CPU_COMPARE_IDENTICAL); DO_TEST_UPDATE("x86", "host", "host-model-nofallback", VIR_CPU_COMPARE_IDENTICAL); DO_TEST_UPDATE("x86", "host", "host-passthrough", VIR_CPU_COMPARE_IDENTICAL); + DO_TEST_UPDATE("x86", "host-invtsc", "host-model", VIR_CPU_COMPARE_SUPERSET); /* computing baseline CPUs */ DO_TEST_BASELINE("x86", "incompatible-vendors", 0, -1); diff --git a/tests/cputestdata/x86-host-invtsc+host-model.xml b/tests/cputestdata/x86-host-invtsc+host-model.xml new file mode 100644 index 0000000..ad1bbf8 --- /dev/null +++ b/tests/cputestdata/x86-host-invtsc+host-model.xml @@ -0,0 +1,22 @@ +<cpu mode='host-model' match='exact'> + <model fallback='allow'>SandyBridge</model> + <vendor>Intel</vendor> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='pcid'/> + <feature policy='require' name='pdcm'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='tm2'/> + <feature policy='require' name='est'/> + <feature policy='require' name='smx'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='monitor'/> + <feature policy='require' name='dtes64'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='ds'/> + <feature policy='require' name='vme'/> +</cpu> diff --git a/tests/cputestdata/x86-host-invtsc.xml b/tests/cputestdata/x86-host-invtsc.xml new file mode 100644 index 0000000..f558399 --- /dev/null +++ b/tests/cputestdata/x86-host-invtsc.xml @@ -0,0 +1,27 @@ +<cpu> + <arch>x86_64</arch> + <model>SandyBridge</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> + <feature name='invtsc'/> + <feature name='osxsave'/> + <feature name='pcid'/> + <feature name='pdcm'/> + <feature name='xtpr'/> + <feature name='tm2'/> + <feature name='est'/> + <feature name='smx'/> + <feature name='vmx'/> + <feature name='ds_cpl'/> + <feature name='monitor'/> + <feature name='dtes64'/> + <feature name='pbe'/> + <feature name='tm'/> + <feature name='ht'/> + <feature name='ss'/> + <feature name='acpi'/> + <feature name='ds'/> + <feature name='vme'/> + <pages unit='KiB' size='4'/> + <pages unit='KiB' size='2048'/> +</cpu> -- 1.8.5.5

4 3

[libvirt] Entering freeze for libvirt-1.2.8
by Daniel Veillard 05 Sep '14

05 Sep '14

So I tagged 1.2.8-rc1 in git and made tarball and signed rpms available at the usual place: ftp://libvirt.org/libvirt/ While we seems to have the new API in place it's also clear that there is a bunch of patches still waiting, either related to the new APIs or blocked by lack of review. Please try to prioritize filling up API implementations, and bug fixes for the reviews but I think we need to be open about incremental improvements when they are very specific and allow them in ! I will try to release by Tuesday 2nd Sep, as I will be on the road next week after that time. However the good point of that monthly cycle is that if you get the ACKs needed even if that's not in 1.2.8 that will be in for 1.2.9 next month, in time for KVM Forum :-) Please give a try to the current version, I'm a limited capacity to test it this time, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 8

[libvirt] [PATCH 0/2] Use huge pages on UMA guests widely
by Michal Privoznik 05 Sep '14

05 Sep '14

*** BLURB HERE *** Michal Privoznik (2): conf: Disallow nonexistent NUMA nodes for hugepages qemu: Honor hugepages for UMA domains src/conf/domain_conf.c | 36 +++++++++++++++++ src/qemu/qemu_command.c | 25 ++++++++++-- .../qemuxml2argv-hugepages-pages4.xml | 45 ++++++++++++++++++++++ .../qemuxml2argv-hugepages-pages5.args | 7 ++++ .../qemuxml2argv-hugepages-pages5.xml | 32 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + 6 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml -- 1.8.5.5

2 3

[libvirt] [PATCH v2] selinux: Avoid label reservations for type = none
by Shivaprasad G Bhat 05 Sep '14

05 Sep '14

For security type='none' libvirt according to the docs should not generate seclabel be it for selinux or any model. So, skip the reservation of labels when type is none. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index e8c13db..c21e4fe 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -731,7 +731,9 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr seclabel; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) + if (!seclabel || + seclabel->type == VIR_DOMAIN_SECLABEL_NONE || + seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) return 0; if (getpidcon_raw(pid, &pctx) == -1) {

2 1

[libvirt] [PATCH RFC] qemu: make time adjustment persistent if RTC changes in guest
by Wang Rui 05 Sep '14

05 Sep '14

Domain's clock xml is as below. <clock offset='variable' basis='utc' adjustment='10'/> If the guest modifies its RTC, libvirt will hanlde the time offset and save the active status in qemuProcessHandleRTCChange(). However, libvirt won't save the persistent config. So next time when vm is restarted(shutdown and start), the time adjuestment(RTC change) set by user will be lost. This patch make the adjustment persistent for persistent domain. Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- I'm not sure about the current purpose so I sent a RFC patch. Is it for some reason that RTC change from guest isn't saved to persistent config ? I have tested this patch by changing RTC, starting, shutting down and migrating. It seems good. There's only a nit I have found. Some guests will set hardware clock to current system time when shut down. So if hardware clock is different from system clock(the difference doesn't come from user setting, maybe from clock shift by system), the persistent config file will be saved to a new adjustment after shutdown with this patch. But I think the hypervisor or guest OS should fix the nit, not libvirt. --- src/qemu/qemu_process.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 407da5e..b03bf02 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -863,7 +863,13 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm->def->clock.data.variable.adjustment = offset; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) - VIR_WARN("unable to save domain status with RTC change"); + VIR_WARN("unable to save domain status with RTC change"); + + if (vm->persistent && vm->newDef) { + vm->newDef->clock.data.variable.adjustment = offset; + if (virDomainSaveConfig(cfg->configDir, vm->newDef) < 0) + VIR_WARN("unable to save domain config with RTC change"); + } } event = virDomainEventRTCChangeNewFromObj(vm, offset); -- 1.7.12.4

2 2

[libvirt] [PATCH] Don't include non-migratable features in host-model
by Ján Tomko 05 Sep '14

05 Sep '14

Commit fba6bc4 introduced supoprt for the 'invtsc' feature, which blocks migration. We should not include it in the host-model CPU by default, because it's intended to be used with migration. https://bugzilla.redhat.com/show_bug.cgi?id=1138221 --- src/cpu/cpu_map.xml | 2 +- src/cpu/cpu_x86.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 12987a0..18c7b0d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -328,7 +328,7 @@ </feature>  - <feature name='invtsc'> + <feature name='invtsc' migratable='no'> <cpuid function='0x80000007' edx='0x00000100'/> </feature> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index af2e08e..21a7007 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -89,6 +89,7 @@ struct x86_map { struct x86_vendor *vendors; struct x86_feature *features; struct x86_model *models; + struct x86_feature *migrate_blockers; }; static struct x86_map* virCPUx86Map = NULL; @@ -592,6 +593,28 @@ x86FeatureFree(struct x86_feature *feature) static struct x86_feature * +x86FeatureCopy(const struct x86_feature *src) +{ + struct x86_feature *feature; + + if (VIR_ALLOC(feature) < 0) + return NULL; + + if (VIR_STRDUP(feature->name, src->name) < 0) + goto error; + + if ((feature->data = x86DataCopy(src->data)) == NULL) + goto error; + + return feature; + + error: + x86FeatureFree(feature); + return NULL; +} + + +static struct x86_feature * x86FeatureFind(const struct x86_map *map, const char *name) { @@ -677,6 +700,9 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, int ret = 0; size_t i; int n; + char *str = NULL; + bool migratable = true; + struct x86_feature *migrate_blocker = NULL; if (!(feature = x86FeatureNew())) goto error; @@ -694,6 +720,10 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, goto ignore; } + str = virXPathString("string(@migratable)", ctxt); + if (STREQ_NULLABLE(str, "no")) + migratable = false; + n = virXPathNodeSet("./cpuid", ctxt, &nodes); if (n < 0) goto ignore; @@ -710,6 +740,14 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, goto error; } + if (!migratable) { + if ((migrate_blocker = x86FeatureCopy(feature)) == NULL) + goto error; + + migrate_blocker->next = map->migrate_blockers; + map->migrate_blockers = migrate_blocker; + } + if (map->features == NULL) { map->features = feature; } else { @@ -720,6 +758,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, out: ctxt->node = ctxt_node; VIR_FREE(nodes); + VIR_FREE(str); return ret; @@ -728,6 +767,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, ignore: x86FeatureFree(feature); + x86FeatureFree(migrate_blocker); goto out; } @@ -1093,6 +1133,12 @@ x86MapFree(struct x86_map *map) x86VendorFree(vendor); } + while (map->migrate_blockers != NULL) { + struct x86_feature *migrate_blocker = map->migrate_blockers; + map->migrate_blockers = migrate_blocker->next; + x86FeatureFree(migrate_blocker); + } + VIR_FREE(map); } @@ -2025,16 +2071,15 @@ x86UpdateHostModel(virCPUDefPtr guest, const virCPUDef *host) { virCPUDefPtr oldguest = NULL; + const struct x86_map *map; + const struct x86_feature *feat; size_t i; int ret = -1; guest->match = VIR_CPU_MATCH_EXACT; - /* no updates are required */ - if (guest->nfeatures == 0) { - virCPUDefFreeModel(guest); - return virCPUDefCopyModel(guest, host, true); - } + if (!(map = virCPUx86GetMap())) + goto cleanup; /* update the host model according to the desired configuration */ if (!(oldguest = virCPUDefCopy(guest))) @@ -2044,6 +2089,14 @@ x86UpdateHostModel(virCPUDefPtr guest, if (virCPUDefCopyModel(guest, host, true) < 0) goto cleanup; + /* Remove non-migratable features by default */ + for (i = 0; i < guest->nfeatures; i++) { + for (feat = map->migrate_blockers; feat; feat = feat->next) { + if (STREQ(feat->name, guest->features[i].name)) + VIR_DELETE_ELEMENT_INPLACE(guest->features, i, guest->nfeatures); + } + } + for (i = 0; i < oldguest->nfeatures; i++) { if (virCPUDefUpdateFeature(guest, oldguest->features[i].name, -- 1.8.5.5

2 1

[libvirt] [PATCH 1/1] libvirtd crash when defining scsi storage pool
by Pradipta Kr. Banerjee 05 Sep '14

05 Sep '14

libvirtd crashes when there is an existing SCSI pool with adapter type as 'scsi_host' and defining a new SCSI pool with adapter type as 'fc_host' and parent attribute missing. For eg when defining a storage-pool with the following XML will crash libvirtd if there already exists a SCSI pool with adapter type 'scsi_host' <pool type='scsi'> <name>TEST_SCSI_FC_POOL</name> <source> <adapter type='fc_host' wwnn='1234567890abcdef' wwpn='abcdef1234567890'/> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> This happens because for fc_host, adapter 'name' is not relevant whereas for scsi_host its mandatory attribute. However the check in libvirt for finding duplicate storage pools doesn't take that into account while comparing, resulting into crash This patch fixes the issue Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/conf/storage_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 8b6fd79..54a4589 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2126,8 +2126,10 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, STREQ(pool->def->source.adapter.data.fchost.wwpn, def->source.adapter.data.fchost.wwpn)) matchpool = pool; - } else if (pool->def->source.adapter.type == - VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST){ + } else if ((pool->def->source.adapter.type == + VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST)\ + && (def->source.adapter.type == + VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST)) { if (STREQ(pool->def->source.adapter.data.name, def->source.adapter.data.name)) matchpool = pool; -- 1.9.3

3 2

[libvirt] libvirt-qemu.so subject to sVirt?
by bancfc＠openmailbox.org 05 Sep '14

05 Sep '14

Hello. I am thinking about using the feature of passing through qemu commands via libvirt. Before I do that I want to make sure that it doesn't have negative security implications. I understand that talking to qemu-kvm directly via commandline strips vms from having sVirt protections applied. Is use of this feature the same case?

2 1

[libvirt] How to set guest resolution?
by bancfc＠openmailbox.org 05 Sep '14

05 Sep '14

Can you please tell me if there is a way to set a guest's screen resolution via libvirt?

1 0

[libvirt] [PATCH 0/2] syntax check: hanging braces
by Eric Blake 04 Sep '14

04 Sep '14

Another case where it is worth enforcing a common existing style, and documenting it in HACKING. Here, there were fewer offenders, so the series is not split in as many pieces. Obviously depends on my earlier series for if-else {} checks, as otherwise this will detect several 'else' as lacking a hanging brace. Eric Blake (2): maint: use hanging curly braces maint: tighten curly brace syntax checking HACKING | 27 +++++++++++++++++++++++++++ cfg.mk | 18 ++++++++++++------ docs/hacking.html.in | 31 +++++++++++++++++++++++++++++++ src/conf/domain_conf.c | 6 ++---- src/interface/interface_backend_netcf.c | 9 +++------ src/network/bridge_driver.c | 3 +-- src/util/virfile.c | 3 +-- src/util/virnetdev.c | 3 +-- src/util/virnetdevmacvlan.c | 5 ++--- src/util/virtypedparam.c | 3 +-- src/util/virutil.c | 6 ++---- src/vbox/vbox_common.c | 4 ++-- tests/seclabeltest.c | 6 ++---- 13 files changed, 87 insertions(+), 37 deletions(-) -- 1.9.3

2 5

[libvirt] [PATCH 0/2] Yet another seclabel patchset
by Michal Privoznik 04 Sep '14

04 Sep '14

*** BLURB HERE *** Michal Privoznik (2): conf: Fix even implicit labels tests: Add test cases for previous commit src/conf/domain_conf.c | 7 +++ .../qemuhotplug-hotplug-base+disk-scsi.xml | 2 +- .../qemuhotplug-hotplug-base+disk-usb.xml | 2 +- .../qemuhotplug-hotplug-base+disk-virtio.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-none-relabel.xml | 53 ++++++++++++++++++++++ ...emuxml2xmlout-seclabel-dynamic-none-relabel.xml | 53 ++++++++++++++++++++++ .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 28 ++++++++++++ .../qemuxml2xmlout-seclabel-none.xml | 28 ++++++++++++ tests/qemuxml2xmltest.c | 5 +- tests/testutilsqemu.c | 10 ++++ 11 files changed, 186 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-none-relabel.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-relabel.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-none.xml -- 1.8.5.5

2 4

[libvirt] [PATCH 0/6] syntax check: catch mismatched {} in if-else
by Eric Blake 04 Sep '14

04 Sep '14

After complaining about it in a recent review, I decided to automate things. Eric Blake (6): maint: use consistent if-else braces in conf and friends maint: use consistent if-else braces in qemu maint: use consistent if-else braces in xen and friends maint: use consistent if-else braces in lxc, vbox, phyp maint: use consistent if-else braces in remaining spots maint: enforce previous if-else {} cleanups cfg.mk | 7 ++++ daemon/stream.c | 6 ++-- src/conf/domain_conf.c | 30 ++++++++--------- src/conf/interface_conf.c | 56 ++++++++++++++++--------------- src/conf/node_device_conf.c | 4 +-- src/conf/nwfilter_conf.c | 27 ++++++++++----- src/conf/secret_conf.c | 12 +++---- src/cpu/cpu_x86.c | 18 +++++----- src/esx/esx_vi_types.c | 6 ++-- src/libxl/libxl_conf.c | 12 +++---- src/lxc/lxc_driver.c | 24 ++++++------- src/lxc/lxc_fuse.c | 34 ++++++++++--------- src/network/bridge_driver.c | 8 ++--- src/node_device/node_device_hal.c | 3 +- src/nwfilter/nwfilter_ebiptables_driver.c | 4 +-- src/nwfilter/nwfilter_gentech_driver.c | 5 +-- src/phyp/phyp_driver.c | 45 ++++++++++++++----------- src/qemu/qemu_capabilities.c | 6 ++-- src/qemu/qemu_command.c | 56 +++++++++++++++++-------------- src/qemu/qemu_driver.c | 36 ++++++++++---------- src/qemu/qemu_hotplug.c | 9 ++--- src/qemu/qemu_monitor_text.c | 30 ++++++----------- src/qemu/qemu_process.c | 3 +- src/remote/remote_driver.c | 14 ++++---- src/rpc/virnetsocket.c | 18 +++++----- src/security/virt-aa-helper.c | 14 ++++---- src/storage/storage_backend_disk.c | 4 +-- src/uml/uml_driver.c | 4 +-- src/util/viralloc.c | 6 ++-- src/util/virbuffer.c | 6 ++-- src/util/virdbus.c | 4 +-- src/util/virnetdev.c | 4 +-- src/util/virnetdevvportprofile.c | 3 +- src/util/virpci.c | 10 +++--- src/util/virsocketaddr.c | 8 ++--- src/util/viruri.c | 38 ++++++++++----------- src/vbox/vbox_common.c | 12 +++---- src/vbox/vbox_tmpl.c | 3 +- src/xen/xen_hypervisor.c | 18 +++++----- src/xen/xend_internal.c | 20 +++++------ src/xenapi/xenapi_driver.c | 13 ++++--- src/xenconfig/xen_common.c | 8 ++--- src/xenconfig/xen_sxpr.c | 18 +++++----- tests/cputest.c | 6 ++-- tests/testutils.c | 4 +-- tools/virsh-domain.c | 8 ++--- tools/virsh-host.c | 8 ++--- 47 files changed, 351 insertions(+), 341 deletions(-) -- 1.9.3

2 14

[libvirt] [PATCH 0/2] syntax check: doubled semicolon
by Eric Blake 04 Sep '14

04 Sep '14

As long as I'm on a syntax-check binge, finish off a task I started several weeks ago. Eric Blake (2): maint: update to latest gnulib maint: syntax check for double semicolons .gnulib | 2 +- cfg.mk | 8 ++++++++ src/xenconfig/xen_common.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCHv2 00/11] bulk stats: QEMU implementation
by Francesco Romani 04 Sep '14

04 Sep '14

This patchset enhances the QEMU support for the new bulk stats API to include equivalents of these APIs: virDomainBlockInfo virDomainGetInfo - for balloon stats virDomainGetCPUStats virDomainBlockStatsFlags virDomainInterfaceStats virDomainGetVcpusFlags virDomainGetVcpus This subset of API is the one oVirt relies on. Scale/stress test on an oVirt test environment is in progress. changes in v2: polishing and optimizations. - incorporated feedback from Li Wei (thanks) - added documentation - optimized block group to gather all the information with just one call to QEMU monitor - stripped to bare bones merged the 'block info' group into the 'block' group - oVirt actually needs just one stat from there - reorganized the keys to be more consistent and shorter. The patchset is organized as follows: - the first 4 patches do refactoring to extract internal helper functions to be used by the old API and by the new bulk one. For block stats on helper is actually added instead of extracted. - since some groups require access to the QEMU monitor, one patch extend the internal interface to easily accomodate that - finally, the last six patches implement the support for the bulk API. Francesco Romani (11): qemu: extract helper to get the current balloon qemu: extract helper to gather vcpu data qemu: add helper to get the block stats qemu: report highest offset into block stats qemu: bulk stats: pass connection to workers qemu: bulk stats: implement CPU stats group qemu: bulk stats: implement balloon group qemu: bulk stats: implement VCPU group qemu: bulk stats: implement interface group qemu: bulk stats: implement block group qemu: bulk stats: add block allocation information include/libvirt/libvirt.h.in | 5 + src/libvirt.c | 47 ++++ src/qemu/qemu_driver.c | 500 +++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_monitor.c | 23 ++ src/qemu/qemu_monitor.h | 19 ++ src/qemu/qemu_monitor_json.c | 125 +++++++---- src/qemu/qemu_monitor_json.h | 4 + 7 files changed, 639 insertions(+), 84 deletions(-) -- 1.9.3

2 33

[libvirt] [PATCH RFC] LXC: add HOME environment variable
by Chen Hanxiao 04 Sep '14

04 Sep '14

We lacked of HOME environment variable, set 'HOME=/' as default. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1cf2c8f..9df9c04 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -236,6 +236,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); virCommandAddEnvString(cmd, "container=lxc-libvirt"); + virCommandAddEnvString(cmd, "HOME=/"); virCommandAddEnvPair(cmd, "container_uuid", uuidstr); if (nttyPaths > 1) virCommandAddEnvPair(cmd, "container_ttys", virBufferCurrentContent(&buf)); -- 1.9.0

6 7

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

04 Sep '14

Resent the email below. Thanks. On Sun, Aug 31, 2014 at 2:05 PM, Hongbin Lu <hongbin034(a)gmail.com> wrote: > 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 2

[libvirt] [PATCH] apparmor: allow reading cap_last_cap
by Felix Geyer 04 Sep '14

04 Sep '14

libcap-ng >= 0.7.4 fails when it can't read /sys/kernel/cap_last_cap and thus running a qemu guest fails. Allow reading cap_last_cap in the libvirt-qemu apparmor abstraction. --- examples/apparmor/libvirt-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 83814ec..1a98182 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -21,6 +21,7 @@ /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, + @{PROC}/sys/kernel/cap_last_cap r, # For hostdev access. The actual devices will be added dynamically /sys/bus/usb/devices/ r, -- 2.1.0

3 2

[libvirt] [PATCH 0/4] Introduce new cputune event
by Pavel Hrdina 04 Sep '14

04 Sep '14

This patch series introduces new cputune event to inform management applications about every change of cputune values for running domains. Pavel Hrdina (4): domain_conf: separate cputune struct from virDomainDef event: introduce new event for cputune add an example how to use cputune event cputune_event: queue the event for cputune updates daemon/remote.c | 87 ++++++++++++++++++++++++++ examples/object-events/event-test.c | 39 +++++++++++- include/libvirt/libvirt.h.in | 62 +++++++++++++++++++ src/conf/domain_conf.h | 27 ++++---- src/conf/domain_event.c | 120 ++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 7 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 6 ++ src/qemu/qemu_driver.c | 27 ++++++++ src/remote/remote_driver.c | 110 +++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 39 +++++++++++- src/remote_protocol-structs | 32 ++++++++++ tools/virsh-domain.c | 49 +++++++++++++++ 13 files changed, 594 insertions(+), 13 deletions(-) -- 1.8.5.5

3 13

[libvirt] [PATCH] tests: force FIPS testing mode with new enough GNU TLS versions
by Giuseppe Scrivano 04 Sep '14

04 Sep '14

Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- tests/virnettlscontexttest.c | 2 ++ tests/virnettlssessiontest.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51a0369..a3e24a3 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -113,6 +113,8 @@ mymain(void) { int ret = 0; + setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + testTLSInit(KEYFILE); # define DO_CTX_TEST(_isServer, _caCrt, _crt, _expectFail) \ diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 1e2683c..3af948a 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -240,6 +240,8 @@ mymain(void) { int ret = 0; + setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + testTLSInit(KEYFILE); # define DO_SESS_TEST(_caCrt, _serverCrt, _clientCrt, _expectServerFail, \ -- 1.9.3

2 2

[libvirt] [PATCH] selinux: Avoid label reservations for type = none during restart
by Shivaprasad G Bhat 04 Sep '14

04 Sep '14

The problem is libvirt kills the guests during libvirt restart if more than guest has security type as none. This is because, libvirt as part of guest- reconnect tries to reserve the security labels. In case of type=none, the range of security context happen to be same for several guests. During reservation, the second attempt to reserve the same range fails and the Guests would be killed. The fix is to avoid reserving labels for type = none during libvirt restart. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 008c58c..2f8a7f2 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -739,7 +739,8 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr seclabel; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) + if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC || + seclabel->type == VIR_DOMAIN_SECLABEL_NONE) return 0; if (getpidcon_raw(pid, &pctx) == -1) {

3 3

[libvirt] [PATCH] security: fix DH key generation when FIPS mode is on
by Giuseppe Scrivano 04 Sep '14

04 Sep '14

When FIPS mode is on, gnutls_dh_params_generate2 will fail if 1024 is specified as the prime's number of bits, a bigger value works in both cases. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- with the development version of GNU TLS is possible to test FIPS mode setting the env variable GNUTLS_FORCE_FIPS_MODE=2 src/rpc/virnettlscontext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 31aac9d..947038d 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -43,7 +43,7 @@ #include "virthread.h" #include "configmake.h" -#define DH_BITS 1024 +#define DH_BITS 2048 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" #define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" -- 1.9.3

2 2

[libvirt] [PATCH] qemu: numatune/domiftune no support in session mode
by Erik Skultety 04 Sep '14

04 Sep '14

Tuning NUMA or network interface parameters require root privileges, thus an attempt to set some of these parameters in session mode should be invalid followed by an error. As an example might be memory tuning which raises an error in such case. This patch provides similar behavior for numatune and domiftune. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1126762 --- src/qemu/qemu_command.c | 33 ++++++++++++++++++++++++++++++++- src/qemu/qemu_driver.c | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c84c7c3..c021080 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7443,7 +7443,7 @@ qemuBuildCommandLine(virConnectPtr conn, emulator = def->emulator; if (!cfg->privileged) { - /* If we have no cgroups than we can have no tunings that + /* If we have no cgroups then we can have no tunings that * require them */ if (def->mem.hard_limit || def->mem.soft_limit || @@ -7466,6 +7466,37 @@ qemuBuildCommandLine(virConnectPtr conn, _("CPU tuning is not available in session mode")); goto error; } + + if (virDomainNumatuneGetNodeset(def->numatune, NULL, -1) || + virDomainNumatuneGetMode(def->numatune, -1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto error; + } + + virDomainNetDefPtr *nets = def->nets; + size_t nnets = def->nnets; + for (i = 0; i < nnets; i++) { + if (nets[i]->bandwidth) { + if (nets[i]->bandwidth->in && + (nets[i]->bandwidth->in->average || + nets[i]->bandwidth->in->peak || + nets[i]->bandwidth->in->burst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto error; + } + + if (nets[i]->bandwidth->out && + (nets[i]->bandwidth->out->average || + nets[i]->bandwidth->out->peak || + nets[i]->bandwidth->out->burst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto error; + } + } + } } for (i = 0; i < def->ngraphics; ++i) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 239a300..b46e12f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8779,6 +8779,12 @@ qemuDomainSetNumaParameters(virDomainPtr dom, if (virDomainSetNumaParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -8870,6 +8876,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; + virQEMUDriverConfigPtr cfg = NULL; char *nodeset = NULL; int ret = -1; virCapsPtr caps = NULL; @@ -8888,10 +8895,17 @@ qemuDomainGetNumaParameters(virDomainPtr dom, return -1; priv = vm->privateData; + cfg = virQEMUDriverGetConfig(driver); if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -9889,6 +9903,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, if (virDomainSetInterfaceParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; -- 1.9.3

2 2

[libvirt] [PATCH 0/6] Coverity patches to resolve RESOURCE_LEAK
by Wang Rui 03 Sep '14

03 Sep '14

Another six pathes to fix resource leak. But this may not be the end. Wang Rui (6): tests: Resolve Coverity RESOURCE_LEAK in commandhelper test_conf: Resolve Coverity RESOURCE_LEAK remote: Resolve Coverity RESOURCE_LEAK qemu_process: Resolve Coverity RESOURCE_LEAK vircgroup: Resolve Coverity RESOURCE_LEAK lxc_container: Resolve Coverity RESOURCE_LEAK daemon/remote.c | 4 +++- src/lxc/lxc_container.c | 4 ++++ src/qemu/qemu_process.c | 1 + src/util/vircgroup.c | 2 +- tests/commandhelper.c | 15 +++++++++------ tests/test_conf.c | 4 ++-- 6 files changed, 20 insertions(+), 10 deletions(-) -- 1.7.12.4

2 7

[libvirt] [PATCH] command: test umask support
by Eric Blake 03 Sep '14

03 Sep '14

Add testsuite coverage for the previous patch. * tests/commandhelper.c (main): Output umask. * tests/commandtest.c (test15): Also test umask. (mymain): Add test. * tests/commanddata/*.log: Update expected output. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/commanddata/test10.log | 1 + tests/commanddata/test11.log | 1 + tests/commanddata/test12.log | 1 + tests/commanddata/test13.log | 1 + tests/commanddata/test14.log | 1 + tests/commanddata/test15.log | 1 + tests/commanddata/test2.log | 1 + tests/commanddata/test20.log | 1 + tests/commanddata/test21.log | 1 + tests/commanddata/test24.log | 1 + tests/commanddata/test3.log | 1 + tests/commanddata/test4.log | 1 + tests/commanddata/test5.log | 1 + tests/commanddata/test6.log | 1 + tests/commanddata/test7.log | 1 + tests/commanddata/test8.log | 1 + tests/commanddata/test9.log | 1 + tests/commandhelper.c | 3 +++ tests/commandtest.c | 3 +++ 19 files changed, 23 insertions(+) diff --git a/tests/commanddata/test10.log b/tests/commanddata/test10.log index e1d6092..6b22786 100644 --- a/tests/commanddata/test10.log +++ b/tests/commanddata/test10.log @@ -12,3 +12,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test11.log b/tests/commanddata/test11.log index e1d6092..6b22786 100644 --- a/tests/commanddata/test11.log +++ b/tests/commanddata/test11.log @@ -12,3 +12,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test12.log b/tests/commanddata/test12.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test12.log +++ b/tests/commanddata/test12.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test13.log b/tests/commanddata/test13.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test13.log +++ b/tests/commanddata/test13.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test14.log b/tests/commanddata/test14.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test14.log +++ b/tests/commanddata/test14.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test15.log b/tests/commanddata/test15.log index f439a85..edb2fc3 100644 --- a/tests/commanddata/test15.log +++ b/tests/commanddata/test15.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:.../commanddata +UMASK:0002 diff --git a/tests/commanddata/test2.log b/tests/commanddata/test2.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test2.log +++ b/tests/commanddata/test2.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test20.log b/tests/commanddata/test20.log index 7d48121..a0475e6 100644 --- a/tests/commanddata/test20.log +++ b/tests/commanddata/test20.log @@ -11,3 +11,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test21.log +++ b/tests/commanddata/test21.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test24.log b/tests/commanddata/test24.log index 8670952..38cbb54 100644 --- a/tests/commanddata/test24.log +++ b/tests/commanddata/test24.log @@ -5,3 +5,4 @@ FD:3 FD:4 DAEMON:yes CWD:/ +UMASK:0022 diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log index c6da253..f44400b 100644 --- a/tests/commanddata/test3.log +++ b/tests/commanddata/test3.log @@ -12,3 +12,4 @@ FD:5 FD:7 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test4.log b/tests/commanddata/test4.log index 1876685..6cd2095 100644 --- a/tests/commanddata/test4.log +++ b/tests/commanddata/test4.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:yes CWD:/ +UMASK:0022 diff --git a/tests/commanddata/test5.log b/tests/commanddata/test5.log index f745c3f..f801dca 100644 --- a/tests/commanddata/test5.log +++ b/tests/commanddata/test5.log @@ -8,3 +8,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test6.log b/tests/commanddata/test6.log index 5394428..1476995 100644 --- a/tests/commanddata/test6.log +++ b/tests/commanddata/test6.log @@ -4,3 +4,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test7.log b/tests/commanddata/test7.log index cdfe445..e30efe7 100644 --- a/tests/commanddata/test7.log +++ b/tests/commanddata/test7.log @@ -9,3 +9,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test8.log b/tests/commanddata/test8.log index 87874fd..897bf6e 100644 --- a/tests/commanddata/test8.log +++ b/tests/commanddata/test8.log @@ -5,3 +5,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test9.log b/tests/commanddata/test9.log index 3a93c19..e9e1611 100644 --- a/tests/commanddata/test9.log +++ b/tests/commanddata/test9.log @@ -18,3 +18,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 796b89d..03fe506 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <fcntl.h> #include <string.h> +#include <sys/stat.h> #include "internal.h" #include "virutil.h" @@ -121,6 +122,8 @@ int main(int argc, char **argv) { fprintf(log, "CWD:%s\n", cwd); VIR_FREE(cwd); + fprintf(log, "UMASK:%04o\n", umask(0)); + VIR_FORCE_FCLOSE(log); if (argc > 1 && STREQ(argv[1], "--close-stdin")) { diff --git a/tests/commandtest.c b/tests/commandtest.c index 5f52a00..6400ea2 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -617,6 +617,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) goto cleanup; virCommandSetWorkingDirectory(cmd, cwd); + virCommandSetUmask(cmd, 002); if (virCommandRun(cmd, NULL) < 0) { virErrorPtr err = virGetLastError(); @@ -1133,6 +1134,8 @@ mymain(void) if (chdir("/tmp") < 0) return EXIT_FAILURE; + umask(022); + setpgid(0, 0); ignore_value(setsid()); -- 1.9.3

2 2

[libvirt] [PATCH] Storage: Fix allocation for raw files.
by Prerna Saxena 03 Sep '14

03 Sep '14

When virsh vol-clone is attempted on a raw file where capacity > allocation, the resulting cloned volume has a size that matches the virtual-size of the parent; in place of matching its actual, disk size. For example : Given this image: [root@localhost]# qemu-img info /var/lib/libvirt/images/f20.raw image: /var/lib/libvirt/images/f20.raw file format: raw virtual size: 2.0G (2147483648 bytes) disk size: 617M When this disk is copied using virsh vol-clone : [root@localhost~] vol-clone --vol f20.raw --newname f20-copy.raw --pool default Vol f20-copy.raw cloned from f20.raw [root@localhost~] The characteristics of the cloned disk differ in "disk size". Its allocated disk size is more than the allocated size of parent file; which is an anomaly. It has picked up an allocated size matching the parent's virtual size. [root@localhost~] qemu-img info /var/lib/libvirt/images/f20-copy.raw image: /var/lib/libvirt/images/f20-copy.raw file format: raw virtual size: 2.0G (2147483648 bytes) disk size: 2.0G This patch fixes the cloned disk to have same _allocated_size_ as the parent file from which it was cloned. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/storage/storage_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 433d7b7..930b45a 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1821,11 +1821,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; - /* Make sure allocation is at least as large as the destination cap, - * to make absolutely sure we copy all possible contents */ - if (newvol->target.allocation < origvol->target.capacity) - newvol->target.allocation = origvol->target.capacity; - if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support volume creation from an existing volume")); -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 1

[libvirt] [PATCH] util: don't shadow global umask declaration
by Martin Kletzander 03 Sep '14

03 Sep '14

Commit 0e1a1a8c introduced umask for virCommand, but the variables used emit a warning on older compilers about shadowed global declaration. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker && trivial. src/util/vircommand.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index efb5f69..cbe94f8 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -133,7 +133,7 @@ struct _virCommand { #if defined(WITH_SECDRIVER_APPARMOR) char *appArmorProfile; #endif - int umask; + int mask; }; /* See virCommandSetDryRun for description for this variable */ @@ -583,8 +583,8 @@ virExec(virCommandPtr cmd) /* child */ - if (cmd->umask) - umask(cmd->umask); + if (cmd->mask) + umask(cmd->mask); ret = EXIT_CANCELED; openmax = sysconf(_SC_OPEN_MAX); if (openmax < 0) { @@ -1085,12 +1085,12 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files) cmd->maxFiles = files; } -void virCommandSetUmask(virCommandPtr cmd, int umask) +void virCommandSetUmask(virCommandPtr cmd, int mask) { if (!cmd || cmd->has_error) return; - cmd->umask = umask; + cmd->mask = mask; } /** -- 2.1.0

1 0

[libvirt] [PATCH] sanlock: Avoid freeing uninitialized value
by Jiri Denemark 03 Sep '14

03 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1136788 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index aade437..aa6b8fb 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -885,7 +885,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, int *fd) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - struct sanlk_options *opt; + struct sanlk_options *opt = NULL; struct sanlk_resource **res_args; int res_count; bool res_free = false; -- 2.1.0

3 2

[libvirt] [PATCH V2] fix: unix sockets created for virtio-serail has insufficient permissions
by Chunyan Liu 03 Sep '14

03 Sep '14

Add umask to _virCommand, allow user to set umask to command. Set umask(002) to qemu process to overwrite default umask(022) so that unix sockets created for virtio-serial has expected permissions. Fix problem reported here: https://sourceware.org/bugzilla/show_bug.cgi?id=13078#c11 https://bugzilla.novell.com/show_bug.cgi?id=888166 To use virtio-serial device, unix socket created for chardev with default umask(022) has insufficient permissions. e.g.: -device virtio-serial \ -chardev socket,path=/tmp/foo,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.fedoraproject.port.0 srwxr-xr-x 1 qemu qemu 0 21. Jul 14:19 /tmp/somefile.sock Other users in the same group (like real user, test engines, etc) cannot write to this socket. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- Changes: * set umask(002) to the whole qemu process instead of calling umask in qemu unix_listen_opts. V1 is here: http://www.mail-archive.com/libvir-list@redhat.com/msg101513.html src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 1 + src/util/vircommand.c | 11 +++++++++++ src/util/vircommand.h | 1 + 4 files changed, 14 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 71fc063..f136d24 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1171,6 +1171,7 @@ virCommandSetPidFile; virCommandSetPreExecHook; virCommandSetSELinuxLabel; virCommandSetUID; +virCommandSetUmask; virCommandSetWorkingDirectory; virCommandToString; virCommandWait; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f68dfbe..f76aa5a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4141,6 +4141,7 @@ int qemuProcessStart(virConnectPtr conn, virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData); virCommandSetMaxProcesses(cmd, cfg->maxProcesses); virCommandSetMaxFiles(cmd, cfg->maxFiles); + virCommandSetUmask(cmd, 0x002); VIR_DEBUG("Setting up security labelling"); if (virSecurityManagerSetChildProcessLabel(driver->securityManager, diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 1d6dbd9..efb5f69 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -133,6 +133,7 @@ struct _virCommand { #if defined(WITH_SECDRIVER_APPARMOR) char *appArmorProfile; #endif + int umask; }; /* See virCommandSetDryRun for description for this variable */ @@ -582,6 +583,8 @@ virExec(virCommandPtr cmd) /* child */ + if (cmd->umask) + umask(cmd->umask); ret = EXIT_CANCELED; openmax = sysconf(_SC_OPEN_MAX); if (openmax < 0) { @@ -1082,6 +1085,14 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files) cmd->maxFiles = files; } +void virCommandSetUmask(virCommandPtr cmd, int umask) +{ + if (!cmd || cmd->has_error) + return; + + cmd->umask = umask; +} + /** * virCommandClearCaps: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index d3b286d..bf65de4 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -72,6 +72,7 @@ void virCommandSetUID(virCommandPtr cmd, uid_t uid); void virCommandSetMaxMemLock(virCommandPtr cmd, unsigned long long bytes); void virCommandSetMaxProcesses(virCommandPtr cmd, unsigned int procs); void virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files); +void virCommandSetUmask(virCommandPtr cmd, int umask); void virCommandClearCaps(virCommandPtr cmd); -- 1.8.4.5

3 3

[libvirt] [PATCH v1 0/6] ivshmem support
by Maxime Leroy 03 Sep '14

03 Sep '14

The following patches are an implementation of a new shmem device to support ivshmem in libvirt. Any feedback is welcome. Changes since RFC: - replace <ivshmem> by a more generic term <shmem> - remove role attribute - libvirt is able to start and stop an ivshmem server - update xml format from: <ivshmem use_server='yes' role='master'> <source file='/tmp/socket-ivshmem0'/> <size unit='M'>32</size> <msi vectors='32' ioeventfd='on'/> </ivshmem> to: <shmem name='shmem0' model='ivshmem'> <server path='/tmp/sockect-ivshem0' start='yes'/> <size unit='M'>32</size> <msi vectors='32' ioeventfd='on'/> </shmem> Maxime Leroy (6): doc: schema: Add documentation for the shmem support conf: Parse and format shmem device XML qemu: Add cap flag QEMU_CAPS_IVSHMEM qemu: Build command line for ivshmem device tests: Add tests for ivshmem device handling ivshmem: add start param to server attribute configure.ac | 4 + docs/formatdomain.html.in | 71 ++++++ docs/schemas/domaincommon.rng | 52 +++++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 264 ++++++++++++++++++++++- src/conf/domain_conf.h | 42 ++++ src/libvirt_private.syms | 7 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 112 +++++++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 10 + src/util/virivshmemserver.c | 141 ++++++++++++ src/util/virivshmemserver.h | 28 +++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 17 +- tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args | 10 + tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml | 35 +++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 27 files changed, 808 insertions(+), 7 deletions(-) create mode 100644 src/util/virivshmemserver.c create mode 100644 src/util/virivshmemserver.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml -- 1.9.3

4 32

[libvirt] [PATCH] spec: Fix preun script for daemon
by Jiri Denemark 03 Sep '14

03 Sep '14

%systemd_preun macro cannot be split in several lines. https://bugzilla.redhat.com/show_bug.cgi?id=1136736 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4dc801b..4756d7d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1677,11 +1677,7 @@ fi %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun \ - libvirtd.socket \ - libvirtd.service \ - virtlockd.socket \ - virtlockd.service + %systemd_preun libvirtd.socket libvirtd.service virtlockd.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade -- 2.1.0

2 2

[libvirt] [PATCH 0/2] bulk api: implement block group
by Li Wei 03 Sep '14

03 Sep '14

This patchset implement the block group for bulk stats, currently only support JSON monitor. Li Wei (2): qemu: implement block group for bulk stats. virsh: add block group for bulk stats. include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 13 ++++ src/qemu/qemu_driver.c | 31 ++++++++ src/qemu/qemu_monitor.c | 23 ++++++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 170 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 ++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh.pod | 4 +- 9 files changed, 257 insertions(+), 2 deletions(-) -- 1.9.3

3 6

[libvirt] ignore this message
by Gene Czarcinski 02 Sep '14

02 Sep '14

Sorry about that. I am having some trouble posting to this mailing list. Just ignore this message.

1 0

[libvirt] ignore this message
by Gene Czarcinski 02 Sep '14

02 Sep '14

Sorry about that. I am having some trouble posting to this mailing list. Just ignore this message. Gene

1 1

[libvirt] [PATCH RFC] qemu: add some synchronizations for snapshot
by Jincheng Miao 02 Sep '14

02 Sep '14

Currently it lacks synchronization to modify domain's snapshot object list, that race condition causes unsafe access to some freed snapshot objects. Therefore, this patch wraps all access of snapshot object list in vm job lock. Only the qemuDomainSnapshotCreateXML is not synchronized, it is related to QEMU_ASYNC_JOB_SNAPSHOT async job for --disk-only snapshot. I am not sure if it's ok to remove it, so need your ideas for qemuDomainSnapshotCreateXML. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/qemu/qemu_driver.c | 137 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 112 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 73959da..7329aa9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13609,6 +13609,7 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13619,8 +13620,12 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, if (virDomainSnapshotListNamesEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); cleanup: if (vm) @@ -13633,6 +13638,7 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13643,8 +13649,13 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, if (virDomainSnapshotNumEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13657,6 +13668,7 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13667,8 +13679,13 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, if (virDomainListAllSnapshotsEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13684,6 +13701,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13694,12 +13712,18 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, if (virDomainSnapshotListChildrenNamesEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13713,6 +13737,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13723,11 +13748,17 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, if (virDomainSnapshotNumChildrenEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13742,6 +13773,7 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13752,12 +13784,18 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, if (virDomainSnapshotListAllChildrenEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13771,6 +13809,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr snapshot = NULL; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, NULL); @@ -13780,11 +13819,17 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, if (virDomainSnapshotLookupByNameEnsureACL(domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromName(vm, name))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromName(vm, name))) + goto endjob; + snapshot = virGetDomainSnapshot(domain, snap->def->name); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13796,6 +13841,7 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, { virDomainObjPtr vm; int ret = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, -1); @@ -13805,8 +13851,13 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, if (virDomainHasCurrentSnapshotEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + ret = (vm->current_snapshot != NULL); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13820,6 +13871,7 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr parent = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, NULL); @@ -13829,18 +13881,24 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, if (virDomainSnapshotGetParentEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!snap->def->parent) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, _("snapshot '%s' does not have a parent"), snap->def->name); - goto cleanup; + goto endjob; } parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13852,6 +13910,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, { virDomainObjPtr vm; virDomainSnapshotPtr snapshot = NULL; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, NULL); @@ -13861,14 +13920,20 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, if (virDomainSnapshotCurrentEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + if (!vm->current_snapshot) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", _("the domain does not have a current snapshot")); - goto cleanup; + goto endjob; } snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13882,6 +13947,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); @@ -13891,13 +13957,19 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + virUUIDFormat(snapshot->domain->uuid, uuidstr); xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13911,6 +13983,7 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, -1); @@ -13920,12 +13993,18 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, if (virDomainSnapshotIsCurrentEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13940,6 +14019,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, -1); @@ -13949,14 +14029,20 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, if (virDomainSnapshotHasMetadataEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + /* XXX Someday, we should recognize internal snapshots in qcow2 * images that are not tied to a libvirt snapshot; if we ever do * that, then we would have a reason to return 0 here. */ ret = 1; + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -14027,9 +14113,12 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto cleanup; } - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!vm->persistent && snap->def->state != VIR_DOMAIN_RUNNING && snap->def->state != VIR_DOMAIN_PAUSED && @@ -14038,13 +14127,13 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("transient domain needs to request run or pause " "to revert to inactive snapshot")); - goto cleanup; + goto endjob; } if (virDomainSnapshotIsExternal(snap)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("revert to external snapshot not supported yet")); - goto cleanup; + goto endjob; } if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { @@ -14052,7 +14141,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, _("snapshot '%s' lacks domain '%s' rollback info"), snap->def->name, vm->def->name); - goto cleanup; + goto endjob; } if (virDomainObjIsActive(vm) && !(snap->def->state == VIR_DOMAIN_RUNNING @@ -14061,7 +14150,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", _("must respawn qemu to start inactive snapshot")); - goto cleanup; + goto endjob; } } @@ -14070,7 +14159,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, cfg->snapshotDir) < 0) - goto cleanup; + goto endjob; vm->current_snapshot = NULL; /* XXX Should we restore vm->current_snapshot after this point * in the failure cases where we know there was no change? */ @@ -14085,12 +14174,9 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (snap->def->dom) { config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, true); if (!config) - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - switch ((virDomainState) snap->def->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_PAUSED: @@ -14400,9 +14486,13 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (virDomainSnapshotDeleteEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!metadata_only) { if (!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) && virDomainSnapshotIsExternal(snap)) @@ -14415,13 +14505,10 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("deletion of %d external disk snapshots not " "supported yet"), external); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { rem.driver = driver; -- 1.7.1

2 1

[libvirt] [PATCH] remote: Fix memory leak on error path when deserializing bulk stats
by Peter Krempa 02 Sep '14

02 Sep '14

The 'elem' variable along with the domain object would be leaked when taking the error path. Found by coverity. --- src/remote/remote_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fda27f7..8bc4baa 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7730,7 +7730,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, size_t i; remote_connect_get_all_domain_stats_args args; remote_connect_get_all_domain_stats_ret ret; - + virDomainStatsRecordPtr elem = NULL; virDomainStatsRecordPtr *tmpret = NULL; if (ndoms) { @@ -7769,7 +7769,6 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, goto cleanup; for (i = 0; i < ret.retStats.retStats_len; i++) { - virDomainStatsRecordPtr elem; remote_domain_stats_record *rec = ret.retStats.retStats_val + i; if (VIR_ALLOC(elem) < 0) @@ -7786,6 +7785,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, goto cleanup; tmpret[i] = elem; + elem = NULL; } *retStats = tmpret; @@ -7793,6 +7793,10 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, rv = ret.retStats.retStats_len; cleanup: + if (elem) { + virObjectUnref(elem->dom); + VIR_FREE(elem); + } virDomainStatsRecordListFree(tmpret); xdr_free((xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *) &ret); -- 2.0.2

2 2

[libvirt] [python PATCH] override: Fix two uninitialized variables in convertDomainStatsRecord
by Peter Krempa 02 Sep '14

02 Sep '14

py_record_domain and py_record_stats would be accessed uninitialized if an out-of-memory condition would happen in the first loop. Unlikely, but coverity complained. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1136354 --- Pushed as trivial. libvirt-override.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 17ea042..872e33b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7963,8 +7963,8 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, { PyObject *py_retval; PyObject *py_record; - PyObject *py_record_domain; - PyObject *py_record_stats; + PyObject *py_record_domain = NULL; + PyObject *py_record_stats = NULL; size_t i; if (!(py_retval = PyList_New(nrecords))) -- 2.0.2

1 0

[libvirt] [PATCH 0/2] fix: unix sockets created for virtio-serail has insufficient permissions
by Chunyan Liu 02 Sep '14

02 Sep '14

https://sourceware.org/bugzilla/show_bug.cgi?id=13078#c11 https://bugzilla.novell.com/show_bug.cgi?id=888166 To use virtio-serial device, unix socket created for chardev with default umask(022) has insufficient permissions. e.g.: -device virtio-serial \ -chardev socket,path=/tmp/foo,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.fedoraproject.port.0 #ls -l /tmp/somefile.sock srwxr-xr-x 1 qemu qemu 0 21. Jul 14:19 /tmp/somefile.sock Other users in the same group (like real user, test engines, etc) cannot write to this socket. These patch series contains a qemu patch and a libvirt patch: qemu patch: adds a new 'umask' option to -chardev, so that user can change the umask. libvirt patch: pass 'umask=0x002' paramter to qemu command line for virtio-serial device Chunyan Liu (2): qemu side: add 'umask' option to chardev libvirt side: qemu: add umask(002) to virtio-serial chardev commandline -- 1.8.4.5

4 7

[libvirt] [PATCH] Free ifname in testDomainGenerateIfnames
by Ján Tomko 02 Sep '14

02 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1135388 --- Pushed as trivial. src/test/test_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 3b22cf6..9918d2c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -521,6 +521,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) if (!found) return ifname; + VIR_FREE(ifname); } virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.5.5

1 0

[libvirt] [PATCH] virsh: Implement command to rename domain
by Tomas Meszaros 02 Sep '14

02 Sep '14

I've recently worked with rather large number of virtual machines and needed to rename all domains. I couldn't find better way how to rename domain other than: virsh dumpxml domain > domain.xml (change domain name in domain.xml) virsh undefine domain virsh define domain.xml This is rather pain to do every time I want to rename domain. I think there should be simple way to change domain name. So, I decided to implement new command which will basically perform all actions listed above. When running: virsh rename foo bar domain foo will be renamed to bar. Command rename is implemented using cmdUndefine options with addition of option name-name. I included opts_undefine into the opts_rename because I couldn't find any other way how to call cmdUndefine directly from the cmdRename and not getting vshCommandOpt assertion fails. In order to hide undefine options, I added VSH_OFLAG_HIDDEN flag to the Command Option Flags, so options flagged as hidden wont show up in help and autocompletion results. But it is still possible to run rename command with undefine flags: virsh rename foo bar --managed-save I would like to call cmdUndefine from cmdRename and not having to use undefine options as a part of rename options but I just don't know how to do it at this point. --- tools/virsh-domain.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 10 ++++ tools/virsh.h | 2 + tools/virsh.pod | 12 +++++ 4 files changed, 157 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c75cd73..cd8c663 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5103,6 +5103,133 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) } /* + * "rename" command + */ +static const vshCmdInfo info_rename[] = { + {.name = "help", + .data = N_("rename a domain") + }, + {.name = "desc", + .data = N_("Change domain name.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_rename[] = { + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("domain name or uuid") + }, + {.name = "new-name", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("new domain name") + }, + {.name = "managed-save", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "storage", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "remove-all-storage", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "wipe-storage", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "snapshots-metadata", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = NULL} +}; + +static bool +cmdRename(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + virDomainPtr new_dom = NULL; + bool ret = false; + int dom_state; + int xml_size; + char *dom_xml = NULL; + const char *new_name = NULL; + xmlDocPtr doc = NULL; + xmlChar *new_dom_xml = NULL; + xmlNodePtr name_node = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (virDomainGetState(dom, &dom_state, NULL, 0) < 0) { + vshError(ctl, "%s", _("Failed to get domain state")); + goto cleanup; + } + + if (dom_state != VIR_DOMAIN_SHUTOFF) { + vshError(ctl, _("Please shutdown domain before renaming")); + goto cleanup; + } + + if (vshCommandOptString(cmd, "new-name", &new_name) <= 0) { + vshError(ctl, _("Failed to parse --new-name parameter")); + goto cleanup; + } + + if (!(dom_xml = virDomainGetXMLDesc(dom, 0))) + goto cleanup; + if (!(doc = virXMLParseStringCtxt(dom_xml, NULL, &ctxt))) + goto cleanup; + + obj = xmlXPathEval(BAD_CAST "/domain/name", ctxt); + if (obj == NULL || obj->type != XPATH_NODESET || obj->nodesetval == NULL || + obj->nodesetval->nodeNr == 0 || obj->nodesetval->nodeTab == NULL) { + vshError(ctl, _("Failed to extract domain name")); + goto cleanup; + } + + if (!(name_node = obj->nodesetval->nodeTab[0]->children)) + goto cleanup; + + xmlNodeSetContent(name_node, BAD_CAST new_name); + xmlDocDumpMemory(doc, &new_dom_xml, &xml_size); + if (new_dom_xml == NULL || xml_size <= 0) { + vshError(ctl, _("Failed to format new XML for domain %s"), new_name); + goto cleanup; + } + + if (!cmdUndefine(ctl, cmd)) + goto cleanup; + + if (!(new_dom = virDomainDefineXML(ctl->conn, (char *)new_dom_xml))) { + vshError(ctl, _("Failed to define domain %s"), new_name); + goto cleanup; + } + + vshPrint(ctl, _("Domain %s has been renamed to %s\n"), + virDomainGetName(dom), virDomainGetName(new_dom)); + ret = true; + + cleanup: + virDomainFree(dom); + if (new_dom) + virDomainFree(new_dom); + VIR_FREE(dom_xml); + VIR_FREE(new_dom_xml); + xmlFreeDoc(doc); + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + return ret; +} + +/* * "reset" command */ static const vshCmdInfo info_reset[] = { @@ -12057,6 +12184,12 @@ const vshCmdDef domManagementCmds[] = { .info = info_reboot, .flags = 0 }, + {.name = "rename", + .handler = cmdRename, + .opts = opts_rename, + .info = info_rename, + .flags = 0 + }, {.name = "reset", .handler = cmdReset, .opts = opts_reset, diff --git a/tools/virsh.c b/tools/virsh.c index 713c9a5..ef0d2df 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1299,6 +1299,10 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) const vshCmdOptDef *opt; for (opt = def->opts; opt->name; opt++) { const char *fmt = "%s"; + + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + switch (opt->type) { case VSH_OT_BOOL: fmt = "[--%s]"; @@ -1352,6 +1356,9 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + switch (opt->type) { case VSH_OT_BOOL: snprintf(buf, sizeof(buf), "--%s", opt->name); @@ -3001,6 +3008,9 @@ vshReadlineOptionsGenerator(const char *text, int state) /* ignore non --option */ continue; + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + if (len > 2) { if (STRNEQLEN(name, text + 2, len - 2)) continue; diff --git a/tools/virsh.h b/tools/virsh.h index b4df24b..5fa22d0 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -136,6 +136,8 @@ enum { VSH_OFLAG_REQ = (1 << 0), /* option required */ VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */ VSH_OFLAG_REQ_OPT = (1 << 2), /* --optionname required */ + VSH_OFLAG_HIDDEN = (1 << 4), /* option doesn't show up in help + * messages and autocompletion */ }; /* forward declarations */ diff --git a/tools/virsh.pod b/tools/virsh.pod index ea9267e..3c56695 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1512,6 +1512,18 @@ try each mode is undefined, and not related to the order specified to virsh. For strict control over ordering, use a single mode at a time and repeat the command. +=item B<rename> I<domain> I<new-name> + +Rename a domain. This command changes current domain name to the new name +specified by the user. This is equivalent to: + + virsh dumpxml domain > domain.xml + (edit domain.xml, change <name>domain</name> to <name>new-name</name>) + virsh undefine domain + virsh define domain.xml + +B<Note>: Domain must be shut down before renaming. + =item B<reset> I<domain> Reset a domain immediately without any guest shutdown. B<reset> -- 1.9.3

3 3

[libvirt] [python PATCH] libvirt-override: fix some build warnings
by Pavel Hrdina 02 Sep '14

02 Sep '14

Remove unused label 'cleanup' in 'libvirt_virConnectGetAllDomainStats' function and remove unused variable 'conn' in function 'libvirt_virDomainListGetStats'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as trivial libvirt-override.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index dfbe9d3..17ea042 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8039,7 +8039,6 @@ libvirt_virConnectGetAllDomainStats(PyObject *self ATTRIBUTE_UNUSED, if (!(py_retval = convertDomainStatsRecord(records, nrecords))) py_retval = VIR_PY_NONE; - cleanup: virDomainStatsRecordListFree(records); return py_retval; @@ -8053,7 +8052,6 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyobj_conn; PyObject *py_retval; PyObject *py_domlist; - virConnectPtr conn; virDomainStatsRecordPtr *records = NULL; virDomainPtr *doms = NULL; int nrecords; @@ -8065,7 +8063,6 @@ libvirt_virDomainListGetStats(PyObject *self ATTRIBUTE_UNUSED, if (!PyArg_ParseTuple(args, (char *)"OOii:virDomainListGetStats", &pyobj_conn, &py_domlist, &stats, &flags)) return NULL; - conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); if (PyList_Check(py_domlist)) { ndoms = PyList_Size(py_domlist); -- 1.8.5.5

1 0

[libvirt] [libvirt-python][PATCH] Post-release version bump for new dev cycle
by Michal Privoznik 02 Sep '14

02 Sep '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f5c6542..167f568 100755 --- a/setup.py +++ b/setup.py @@ -309,7 +309,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.8', + version = '1.2.9', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 1.8.5.5

1 0

[libvirt] [PATCH] Post-release version bump for new dev cycle
by Michal Privoznik 02 Sep '14

02 Sep '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f93c6c2..b4fb99a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.8], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.9], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.8.5.5

1 0

[libvirt] Release of libvirt-1.2.8
by Daniel Veillard 02 Sep '14

02 Sep '14

It's out ! Tagged and signed in git as well as tarball and rpms are available from the usual place: ftp://libvirt.org/libvirt/ I also made a release for the python bindings available from ftp://libvirt.org/libvirt/python/ This is a rather large release (surprizingly for August !) with a lot of refactoring, new APIs and a large set of bug fixes (seems there is a new and more stringent Coverity release :-) . No lack of improvement patches either so a rather balanced release: Features: - blockcopy: virDomainBlockCopy with XML destination, typed params (Eric Blake) - lib: Introduce API for retrieving bulk domain stats (Peter Krempa) - Introduce virDomainOpenGraphicsFD API (Ján Tomko) - storage: ZFS support (Roman Bogorodskiy) Documentation: - fix bootmenu timeout description (Martin Kletzander) - conf: add support for bootmenu timeout (Martin Kletzander) - maint: fix comment typo (Eric Blake) - formatdomain: Reformat vCPU description (John Ferlan) - virsh: Fix help info for freepages (Li Yang) - virsh: man: Add LXC format info for domxml-from/to-native (Li Yang) - virsh: Fix comment for net-undefine (Li Yang) - man: virsh: add missing auto-converge option for 'migrate' (Pradipta Kr. Banerjee) - nwfilter: add missing dscp attribute (Jianwei Hu) - virsh: man: Crosslink "desc" and "metadata" sections (Peter Krempa) - man: virsh: Add 'vcpu_period' and 'vcpu_quota' support info for LXC (Li Yang) - man: virsh: Add man page for "virsh metadata" (Peter Krempa) - fix missing forward slash (Jianwei Hu) - use correct hints per bus type in <disk> examples (Eric Blake) - use unique dev names in <disk> examples (Eric Blake) - virsh: clean up attach-interface paragraph in man page (Laine Stump) - audit: Fix some comments (Wang Rui) Portability: - spec: drop anything older than Fedora 13 (Eric Blake) - fix mingw build (Pavel Hrdina) - build: fix mingw build with virCommandReorderFDs (Martin Kletzander) - build: force configure failed when perl is missing (Jincheng Miao) - Include param.h in case of HAVE_BSD_CPU_AFFINITY (Guido Günther) Bug Fixes: - blockcopy: allow larger buf-size (Eric Blake) - selinux: properly label tap FDs with imagelabel (Martin Kletzander) - Fix connection to already running session libvirtd (Christophe Fergeau) - storage: zfs: fix double listing of new volumes (Roman Bogorodskiy) - qemu_driver: Resolve Coverity FORWARD_NULL (John Ferlan) - virnetserverservice: Resolve Coverity ARRAY_VS_SINGLETON (John Ferlan) - libxl_migration: Resolve Coverity NULL_RETURNS (John Ferlan) - qemu_command: Resolve Coverity DEADCODE (John Ferlan) - qemu_driver: Resolve Coverity DEADCODE (John Ferlan) - domain_conf: Resolve Coverity DEADCODE (John Ferlan) - qemu_monitor: Resolve Coverity NESTING_INDENT_MISMATCH (John Ferlan) - storage_conf: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu_driver: Resolve Coverity RESOURCE_LEAK (John Ferlan) - phyp_driver: Resolve Coverity RESOURCE_LEAK (John Ferlan) - libxl_migration: Resolve Coverity RESOURCE_LEAK (John Ferlan) - bridge_driver: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virsh-network: Resolve Coverity RESOURCE_LEAK (John Ferlan) - network_conf: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu_capabilities: Resolve Coverity RESOURCE_LEAK (John Ferlan) - libxl_domain: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu_agent: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu_command: Resolve Coverity RESOURCE_LEAK (John Ferlan) - cpu_x86: Resolve Coverity RESOURCE_LEAK (John Ferlan) - domain_conf: Resolve Coverity RESOURCE_LEAK (John Ferlan) - daemon: Resolve Coverity NEGATIVE_RETURNS (John Ferlan) - qemu_capabilities: Resolve Coverity RESOURCE_LEAK (Wang Rui) - tests: Resolve Coverity RESOURCE_LEAK (Wang Rui) - util: Resolve Coverity RESOURCE_LEAK (Wang Rui) - virsh: fix keepalive error msg (Erik Skultety) - qemu_capabilities: Resolve Coverity NULL_RETURNS (John Ferlan) - qemu_driver: Resolve Coverity CONSTANT_EXPRESSION_RESULT (John Ferlan) - domain_conf: Resolve Coverity REVERSE_INULL (John Ferlan) - qemu_command: Resolve Coverity REVERSE_INULL (John Ferlan) - domain_conf: Resolve Coverity REVERSE_INULL (John Ferlan) - storage_driver: Resolve Coverity REVERSE_INULL (John Ferlan) - xen_xm: Resolve Coverity USE_AFTER_FREE (John Ferlan) - xen_common: Resolve Coverity USE_AFTER_FREE (John Ferlan) - parallels: Resolve Coverity USE_AFTER_FREE (John Ferlan) - conf: fix leak with def->mem.hugepages (Martin Kletzander) - qemu: call endjob in RevertToSnapshot (Jincheng Miao) - virsh: Initialize vshData in cmdMigrate (Ján Tomko) - libxl: fix memory corruption introduced by commit b55cc5f4e (Jim Fehlig) - iotune: setting an invalid value now reports error (Erik Skultety) - xenconfig: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virnetsocket: Resolve Coverity RESOURCE_LEAK (John Ferlan) - commandtest: Resolve Coverity RESOURCE_LEAK (John Ferlan) - numatune: setting --mode does not work well (Erik Skultety) - qemu: min_guarantee: Parameter 'min_guarantee' not supported (Erik Skultety) - Parallels: fix error with video card RAM dimension (Alexander Burluka) - util: compare floor attribute in virNetDevBandwidthEqual (Martin Kletzander) - conf: net: Correctly switch how to format address fields (Peter Krempa) - Perform disk config validity checking for attach-device config (John Ferlan) - nodeCapsInitNUMA: Avoid @cpumap leak (Michal Privoznik) - qemu: Issue rtc-reset-reinjection command after guest-set-time (Michal Privoznik) - qemu: forbid negative blkio values (Martin Kletzander) - lxc: forbid negative blkio values (Martin Kletzander) - qemu: Fix build error introduced in 653137eb957a278b556c6226424aad5395a (Peter Krempa) - qemu: blkiotune: Avoid accessing non-existing disk configuration (Peter Krempa) - qemu: Label all TAP FDs (Michal Privoznik) - cmdMigrate: move vshConnect before vshWatchJob (Chunyan Liu) - qemu: cpu: unplug: Remove vcpu pinning on cold cpu unplug (Peter Krempa) - qemu: Redundant listen address entry in quest xml (Erik Skultety) - daemon: Fix driver registration ordering (Michal Privoznik) - network: fix crash when starting a network with no <pf> element (Laine Stump) - qemu_process: fix memleak found by coverity (Pavel Hrdina) - Maximum vlanid should be 4095 in interface.rng (Jianwei Hu) - LXC: Fix virLXCControllerSetupDevPTS() wrt user namespaces (Richard Weinberger) - conf: fix parsing 'cmd_per_lun' and 'max_sectors' (Mo yuxiang) - bhyve: fix error message in bhyveStateInitialize (Dmitry Guryanov) - qemu: migration: Check domain live state after exitting the monitor (Peter Krempa) - qemu: managedsave: Check that VM is alive after entering async job (Peter Krempa) - numatune: Fix parsing of empty nodeset (0,^0) (Erik Skultety) - conf: Format interface's driver more frequently (Michal Privoznik) - network: populate interface pool immediately when network is started (Laine Stump) - network: make networkCreateInterfacePool more robust (Laine Stump) - Make 'uri' command a bit more prominent. (Guido Günther) - Don't fail qemu driver intialization if we can't determine hugepage size (Guido Günther) - blockjob: fix use-after-free in blockcopy (Eric Blake) - blockjob: avoid memory leak during block pivot (Eric Blake) - snapshot: conf: Enforce absolute paths on disk and memory images (Peter Krempa) - Node Devices: Fix nodedev-list for fc_host & vports. (Prerna Saxena) - blockjob: correctly report active commit for job info (Eric Blake) - Fix vlanid attribute name in nwfilter d (Jianwei Hu) - Don't overwrite errors from virNetDevBandwidthSet (Ján Tomko) - virsh: check if domiftune parameters fit into UINT (Ján Tomko) - storage: Refresh storage pool after upload (John Ferlan) Improvements: - qemu: Allow use of iothreads for disk definitions (John Ferlan) - domain_conf: Add support for iothreads in disk definition (John Ferlan) - qemu: Add support for iothreads (John Ferlan) - domain_conf: Introduce iothreads XML (John Ferlan) - qemu: Implement bulk stats API and one of the stats groups to return (Peter Krempa) - virsh: Implement command to excercise the bulk stats APIs (Peter Krempa) - remote: Implement bulk domain stats APIs in the remote driver (Peter Krempa) - lib: Add few flags for the bulk stats APIs (Peter Krempa) - conf: Add helper to free domain list (Peter Krempa) - vbox: Register per partes (Michal Privoznik) - virDriverLoadModule: Honor libvirt func name tranlsation (Michal Privoznik) - virdrivermoduletest: Test all the modules (Michal Privoznik) - domain_conf: fix internal flag verification (Eric Blake) - API: Tweak virDomainOpenGraphics to return fd directly (Eric Blake) - virsh: domain: Split out code to lookup domain from string (Peter Krempa) - Wire up virDomainOpenGraphicsFD in QEMU driver (Ján Tomko) - Add RPC implementation for virDomainOpenGraphicsFd (Ján Tomko) - blkdeviotune: check for overflow when parsing XML (Erik Skultety) - storage: remove unused 'canonPath' in virStorageFileGetMetadata (Chen Fan) - Add new 'kvm' domain feature and ability to hide KVM signature (Alex Williamson) - maint: drop spurious semicolons (Eric Blake) - daemon: Fix option -v missing info priority log (Zhou Yimin) - qemu: add support for splash-timeout (Martin Kletzander) - qemu: add capability probing for splash-timeout (Martin Kletzander) - storage: zfs: implement download and upload (Roman Bogorodskiy) - fdstream: introduce virFDStreamOpenBlockDevice (Roman Bogorodskiy) - fdstream: report error if virSetNonBlock fails (Roman Bogorodskiy) - qemu: check for active domain after agent interaction (Eric Blake) - Parallels: Change config report errors code. (Alexander Burluka) - Parallels: add virNodeGetCPUMap(). (Alexander Burluka) - daemon: use socket activation with systemd (Martin Kletzander) - rpc: pass listen FD to the daemon being started (Martin Kletzander) - util: add virCommandPassListenFDs() function (Martin Kletzander) - tests: support dynamic prefixes in commandtest (Martin Kletzander) - cfg.mk: allow integers to be assigned a value computed with i|j|k (Martin Kletzander) - daemon: support passing FDs from the calling process (Martin Kletzander) - rpc: set listen backlog on FDs as well as on other sockets (Martin Kletzander) - remote: create virNetServerServiceNewFDOrUNIX() wrapper (Martin Kletzander) - util: abstract parsing of passed FDs into virGetListenFDs() (Martin Kletzander) - virsh: Don't print extra '-'s in error message for -k and -K options (Peter Krempa) - hvsupport: Adapt to vbox driver rewrite (Michal Privoznik) - qemu: hotplug: Sanitize shared device removal on media change (Peter Krempa) - qemu: conf: Split out code to retrieve hostdev key and reuse it (Peter Krempa) - qemu: conf: Split up qemuRemoveSharedDevice into per-device-type functions (Peter Krempa) - qemu: conf: Split up qemuAddSharedDevice into per-device-type functions (Peter Krempa) - qemu: conf: rename qemuCheckSharedDevice to qemuCheckSharedDisk (Peter Krempa) - qemu: shared: Split out shared device list remove code (Peter Krempa) - qemu: shared: Split out insertion code to the shared device list (Peter Krempa) - qemu: hotplug: Format proper source string for cdrom media change (Peter Krempa) - qemu: hotplug: Change arguments for qemuDomainChangeEjectableMedia (Peter Krempa) - qemu: hotplug: Add helper to initialize/teardown new disks for VMs (Peter Krempa) - qemu: hotplug: Untangle cleanup paths in qemuDomainChangeEjectableMedia (Peter Krempa) - conf: Pass virStorageSource into virDomainDiskSourceIsBlockType (Peter Krempa) - qemu: Explicitly state that hotplugging cdroms and floppies doesn't work (Peter Krempa) - conf: fix comment (Giuseppe Scrivano) - conf, virDomainFSDefPtr: rename "path" argument to "target" (Giuseppe Scrivano) - bhyve: add volumes support (Roman Bogorodskiy) - storage: make disk source pool translation generic (Roman Bogorodskiy) - driver: Move virDrvNetworkGetDHCPLeases to the appropriate section (Peter Krempa) - qemu: allow device block I/O tuning in session mode (Martin Kletzander) - src/xenconfig: move common parsing/formatting to xen_common (Jim Fehlig) - src/xenconfig: wrap common formatting code (Kiarie Kahurani) - src/xenconfig: wrap common parsing code (Kiarie Kahurani) - xen: rename xenxs to xenconfig (Jim Fehlig) - qemu: process: Pin on per-vcpu basis instead of per-vcpupin element (Peter Krempa) - conf: Refactor virDomainVcpuPinDefParseXML (Peter Krempa) - conf: cpupin: Remove useless checking of vcpupin element count (Peter Krempa) - qemu: process: Remove unnecessary argument and rename function (Peter Krempa) - vbox: Introducing vboxCommonDriver (Taowei) - vbox: Add registerDomainEvent (Taowei) - vbox: Rewrite vboxNode functions (Taowei) - vbox: Rewrite vboxConnectListAllDomains (Taowei) - vbox: Rewrite vboxDomainScreenshot (Taowei) - vbox: Rewrite vboxDomainSnapshotDelete (Taowei) - vbox: Rewrite vboxDomainRevertToSnapshot (Taowei) - vbox: Rewrite vboxDomainSnapshotHasMetadata (Taowei) - vbox: Rewrite vboxDomainSnapshotIsCurrent (Taowei) - vbox: Rewrite vboxDomainSnapshotCurrent (Taowei) - vbox: Rewrite vboxDomainSnapshotGetParent (Taowei) - vbox: Rewrite vboxDomainHasCurrentSnapshot (Taowei) - vbox: Rewrite vboxSnapshotLookupByName (Taowei) - vbox: Rewrite vboxDomainSnapshotListNames (Taowei) - vbox: Rewrite vboxDomainSnapshotNum (Taowei) - vbox: Rewrite vboxDomainSnapshotGetXMLDesc (Taowei) - vbox: Rewrite vboxDomainSnapshotCreateXML (Taowei) - vbox: Add API for vboxDomainSnapshotCreateXML (Taowei) - vbox: Rewrite vboxDomainDetachDeviceFlags (Taowei) - vbox: Rewrite vboxDomainDetachDevice (Taowei) - vbox: Rewrite vboxDomainUpdateDeviceFlags (Taowei) - vbox: Rewrite vboxDomainAttachDeviceFlags (Taowei) - vbox: Rewrite vboxDomainAttachDevice (Taowei) - vbox: Rewrite vboxDomainUndefine (Taowei) - vbox: Rewrite vboxConnectNumOfDefinedDomains (Taowei) - vbox: Rewrite vboxConnectListDefinedDomains (Taowei) - vbox: Rewrite vboxDomainGetXMLDesc (Taowei) - vbox: Add API for vboxDomainGetXMLDesc (Taowei) - vbox: Rewrite vboxDomainGetMaxVcpus (Taowei) - vbox: Rewrite vboxDomainGetVcpusFlags (Taowei) - vbox: Rewrite vboxDomainSetVcpus (Taowei) - vbox: Rewrite vboxDomainSetVcpusFlags (Taowei) - vbox: Rewrite vboxDomainGetState (Taowei) - vbox: Rewrite vboxDomainGetInfo (Taowei) - vbox: Rewrite vboxDomainSetMemory (Taowei) - vbox: Rewrite vboxDomainGetOSType (Taowei) - vbox: Rewrite vboxDomainDestroy (Taowei) - vbox: Rewrite vboxDomainDestroyFlags (Taowei) - vbox: Rewrite vboxDomainReboot (Taowei) - vbox: Rewrite vboxDomainShutdown (Taowei) - vbox: Rewrite vboxDomainShutdownFlags (Taowei) - vbox: Rewrite vboxDomainResume (Taowei) - vbox: Rewrite vboxDomainSuspend (Taowei) - vbox: Rewrite vboxDomainIsUpdated (Taowei) - vbox: Rewrite vboxDomainIsPersistent (Taowei) - vbox: Rewrite vboxDomainIsActive (Taowei) - vbox: Rewrite vboxDomainLookupByName (Taowei) - vbox: Rewrite vboxDomainCreateXML (Taowei) - vbox: Rewrite vboxDomainCreate (Taowei) - vbox: Rewrite vboxDomainCreateWithFlags (Taowei) - vbox: Rewrite vboxDomainDefineXML (Taowei) - vbox: Rewrite vboxDomainUndefineFlags (Taowei) - vbox: Rewrite vboxDomainLookupByUUID (Taowei) - vbox: Rewrite vboxDomainLookupById (Taowei) - vbox: Rewrite vboxConnectNumOfDomains (Taowei) - vbox: Rewrite vboxConnectListDomains (Taowei) - vbox: Rewrite vboxConnectGetCapabilities (Taowei) - vbox: Rewrite vboxConnectGetMaxVcpus (Taowei) - vbox: Rewrite vboxConnectIsAlive (Taowei) - vbox: Rewrite vboxConnectIsEncrypted (Taowei) - vbox: Rewrite vboxConnectIsSecure (Taowei) - vbox: Rewrite vboxConnectGetHostname (Taowei) - vbox: Rewrite vboxConnectGetVersion (Taowei) - vbox: Rewrite vboxDomainSave (Taowei) - vbox: Rewrite vboxConnectClose (Taowei) - vbox: Begin to rewrite, vboxConnectOpen (Taowei) - src/xenxs: Refactor code formating vif device config (Jim Fehlig) - src/xenxs: Refactor code formating peripheral device config (Kiarie Kahurani) - src/xenxs: Refactor code formating Vfb config (Kiarie Kahurani) - src/xenxs: Refactor code formating OS config (Kiarie Kahurani) - src/xenxs: Refactor code formating CPU config (Kiarie Kahurani) - src/xenxs: Refactor code formating xm disk config (Kiarie Kahurani) - src/xenxs: Refactor code formating Char devices config (Kiarie Kahurani) - src/xenxs: Refactor code formating event actions config (Kiarie Kahurani) - src/xenxs: Refactor code formating virtual time config (Kiarie Kahurani) - src/xenxs: Refactor code formating memory config (Kiarie Kahurani) - src/xenxs: Refactor code formating general VM config (Kiarie Kahurani) - qemu: Tidy up job handling during live migration (Sam Bobroff) - LXC: resolve issues in lxcDomainSetMaxMemory (Chen Hanxiao) - daemon: Limit default log level to journald to VIR_LOG_INFO (Peter Krempa) - libvirtd: conf: Mention support for logging into journald (Peter Krempa) - maint: improve syntax check for space around = (Eric Blake) - qemu_conf: Undefine the correct symbol (Michal Privoznik) - qemu: process: Fix header format of qemuProcessSetVcpuAffinities (Peter Krempa) - qemu: use guest-fsfreeze-freeze-list command if mountpoints to freeze specified (Tomoki Sekiyama) - qemu: Actually clear bandwidth settings (Jianwei Hu) - src/xenxs: Refactor code parsing OS config (Kiarie Kahurani) - src/xenxs: Refactor code parsing general config (Kiarie Kahurani) - src/xenxs: Refactor code parsing emulated hardware config (Kiarie Kahurani) - src/xenxs: Refactor code parsing Vif config (Kiarie Kahurani) - src/xenxs: Refactor code parsing Char devices config (Kiarie Kahurani) - src/xenxs: Refactor code parsing Vfb config (Kiarie Kahurani) - src/xenxs: Refactor code parsing xm disk config (Kiarie Kahurani) - src/xenxs: Refactor code parsing CPU features (Kiarie Kahurani) - src/xenxs: Refactor code parsing PCI config (Kiarie Kahurani) - src/xenxs: Refactor code parsing event actions (Kiarie Kahurani) - src/xenxs: Refactor code parsing virtual time config (Kiarie Kahurani) - src/xenxs: Refactor code parsing memory config (Kiarie Kahurani) - conf: Add USB sound card support and implement it for qemu (Peter Krempa) - hostdev: Add iSCSI hostdev XML (John Ferlan) - domain_conf: Common routine to handle network storage host xml def (John Ferlan) - qemu: Make virFileFindHugeTLBFS fault tolerant (Michal Privoznik) - qemu: reword caps-related error (Martin Kletzander) - domtop: Turn parse_argv into void (Michal Privoznik) - qemu: fix comment in qemu.conf (Martin Kletzander) Cleanups: - virsh: drop unused variable (Eric Blake) - Fix spacing around commas (Michal Privoznik) - examples: test: Kill unsupported maxMemory element (Peter Krempa) - cleanup spaces between parentheses and braces (Martin Kletzander) - qemu_command: fix block indentation (Giuseppe Scrivano) - qemu: Remove extraneous space in function prototypes (John Ferlan) - daemon: Fix indentation in libvirtd.c (Wang Rui) - domtop: Remove unused variable (Michal Privoznik) thanks everybody for your contribution to this new release, be it with reports, ideas, patches, reviews or help on the localization ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [python PATCH v2 0/5] Implement new APIs
by Pavel Hrdina 02 Sep '14

02 Sep '14

new in v2: - moved function to appropriate place in libvirt-override.c - fixed generator to resolve enum reference - fixed memory leak in virDomainListGetStats and sanyti test - implemented API for virDomainBlockCopy Pavel Hrdina (3): generator: resolve one level of enum reference API: Implement bindings for virDomainListGetStats Implement API bindings for virDomainBlockCopy Peter Krempa (2): API: Skip 'virDomainStatsRecordListFree' API: Implement bindings for virConnectGetAllDomainStats generator.py | 20 ++++- libvirt-override-api.xml | 10 +++ libvirt-override-virConnect.py | 100 +++++++++++++++++++++++ libvirt-override.c | 180 +++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 6 ++ 5 files changed, 315 insertions(+), 1 deletion(-) -- 1.8.5.5

2 13

[libvirt] [python PATCH 0/5] Implement bindings for bulk stats API
by Peter Krempa 01 Sep '14

01 Sep '14

The last patch is to ease review to be able to build the series. Peter Krempa (5): generator: enum: Don't sort enums by names API: Skip 'virDomainStatsRecordListFree' API: Implement bindings for virConnectGetAllDomainStats API: Implement bindings for virDomainListGetStats DO NOT APPLY: Fix build with missing virDomainBlockCopy API generator.py | 6 +- libvirt-override-virConnect.py | 100 ++++++++++++++++++++++++++++ libvirt-override.c | 144 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 2 deletions(-) -- 2.0.2

3 11

[libvirt] [PATCH for 1.2.8] selinux: properly label tap FDs with imagelabel
by Martin Kletzander 01 Sep '14

01 Sep '14

The cleanup in commit cf976d9d used secdef->label to label the tap FDs, but that is not possible since it's process-only label (svirt_t) and not a object label (e.g. svirt_image_t). Starting a domain failed with EPERM, but simply using secdef->label instead fixes it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- 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 5d18493..e8c13db 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2340,7 +2340,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (!secdef || !secdef->label) return 0; - return virSecuritySELinuxFSetFilecon(fd, secdef->label); + return virSecuritySELinuxFSetFilecon(fd, secdef->imagelabel); } static char * -- 2.1.0

2 1

[libvirt] [PATCH v4 0/3] OVMF exposure
by Michal Privoznik 01 Sep '14

01 Sep '14

diff to v3: -Pure rebae & resend diff to v2: -Adapted to Laszlo's review on v2 Michal Privoznik (3): conf: Extend <loader/> and introduce <nvram/> qemu: Implement extended loader and nvram qemu: Automatically create NVRAM store docs/formatdomain.html.in | 19 ++- docs/schemas/domaincommon.rng | 21 ++++ libvirt.spec.in | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 87 +++++++++++++- src/conf/domain_conf.h | 22 +++- 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 | 93 +++++++++++++++ src/qemu/qemu_conf.h | 5 + src/qemu/qemu_process.c | 132 +++++++++++++++++++++ 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 +-- .../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 +- 81 files changed, 639 insertions(+), 82 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml -- 1.8.5.5

4 21

[libvirt] (no subject)
by Raghavendra K T 01 Sep '14

01 Sep '14

Bcc: Raghavendra K T <raghavendra.kt(a)linux.vnet.ibm.com> Subject: Re: [libvirt] [RFC] exclusive vcpu-cpu pinning Reply-To: Raghavendra K T <raghavendra.kt(a)linux.vnet.ibm.com> In-Reply-To: <53DA24CF.8030600(a)redhat.com> * J?n Tomko <jtomko(a)redhat.com> [2014-07-31 13:13:19]: > Hello developers! > > Currently, our default cgroup layout is: > -top level cgroup > \-machine (machine.slice with systemd) > `-vm1.libvirt-qemu (machine-qemu\x2dvm1.scope with systemd) > `-emulator > `-vcpu0 > \-vcpu1 > \-vm2.libvirt-qemu > `-emulator > `-vcpu0 > `-vcpu1 > > To free some CPUs for exclusive use, either all processes from the top level > cgroup should be moved to another one (which does not seem like a great idea) > or isolcpus= should be specified on the kernel command line. > > The cpuset.cpu_exclusive option can be set on a cgroup if > * all the groups up to the top level group have it set > * the cpuset of the current group is a subset of the parent group > and no siblings use any cpus from the current cpuset > > This would mean that to keep the existing nested structure, all vcpus and the > emulator thread would need to have an exclusive CPU, e.g: > <vcpu placement='static' cpuset='4-6'>2</vcpu> > <cputune exclusive='yes'> > <vcpupin vcpu='0' cpuset='5'/> > <vcpupin vcpu='1' cpuset='6'/> > <emulatorpin cpuset='4'/> > </cputune> > > (The only two issues I found: > 1) libvirt would have to mess with systemd's 'machine-scope' behind it's back > (setting cpu_exclusive) > 2) creating machines without explicit cpu pinning fails, as libvirt tries to > write all the cpus to the cpuset, even those the other machine uses > exclusively) > > I've also thought about just keeping track of the 'exclusived' CPUs in > libvirt. This would not work across drivers. And it could possibly be needed > to solve issue 2). > > Do you think any of these options would be useful? > > Bug: https://bugzilla.redhat.com/show_bug.cgi?id=996758 > > Jan > Hi Jan, I am not familiar with libvirt internals, but eager to solve the problem (I also tried to solve the same problem, I had POC kernel solution which was rightly rejected because we could solve with userspace). Could we have a dedicated cpuset for vms (which asks for dedicated cpuset may be via xml tag? <description>dedicated</description>) [ This is very similar to what you have proposed ] suppose we have 2 vms of 8 vcpus (vm1 dedicated, vm2 non-dedicated) on a 16 pcpu machine, the modified cpuset cgroup hierarchy looks like this (for cpuset only): | root (cpuset.cpus = 0-15) | \_ machine (tasks = system tasks) (cpuset.cpus = 0-7, exclusive=1) \_ vm2.libvirt-qemu (cpuset.cpus = 0-7, exclusive=1) | \_ vm2.libvirt-qemu (cpuset.cpus = 8-15, exclusive=1) But as you have mentioned above libvirt will have to 1. modify the cpuset hierarchy behind systemd 2. move all the system tasks to machine (only for cpuset) 3. assign all the non dedicated cpuset to /machine hierarchy 4. assign dedicated/exclusive cpus to vms automatically. ofcourse we cannot have 100% of cpus to be dedicated and we will have to ensure that we do have some cpus left for system tasks/non dedicated vms etc. I see we could achieve above requirement with a userspace daemon, But I think libvirt way of solving would be ideal. Do you think the above solution is too intrusive? Please let us know your thoughts.

1 0

[libvirt] [PATCH 00/11] bulk stats: QEMU implementation
by Francesco Romani 01 Sep '14

01 Sep '14

This patchset enhances the QEMU support for the new bulk stats API. What is added is the equivalent of these APIs: virDomainBlockInfo virDomainGetInfo - for balloon stats virDomainGetCPUStats virDomainBlockStatsFlags virDomainInterfaceStats virDomainGetVcpusFlags virDomainGetVcpus This subset of API is the one oVirt relies on. The patchset is organized as follows: - the first 4 patches do refactoring to extract internal helper functions to be used by the old API and by the new bulk one. For block stats on helper is actually added instead of extracted. - since some groups require access to the QEMU monitor, one patch extend the internal interface to easily accomodate that - finally, the last six patches implement the support for the bulk API. Francesco Romani (11): qemu: extract helper to get the current balloon qemu: extract helper to gather vcpu data qemu: add helper to get the block stats qemu: extract helper to get block info qemu: bulk stats: pass connection to workers qemu: bulk stats: implement CPU stats group qemu: bulk stats: implement balloon group qemu: bulk stats: implement VCPU group qemu: bulk stats: implement interface group qemu: bulk stats: implement block group qemu: bulk stats: implement blockinfo group include/libvirt/libvirt.h.in | 6 + src/qemu/qemu_driver.c | 558 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 502 insertions(+), 62 deletions(-) -- 1.9.3

2 13

[libvirt] [PATCH] Fix connection to already running session libvirtd
by Christophe Fergeau 01 Sep '14

01 Sep '14

Since 1b807f92, connecting with virsh to an already running session libvirtd fails with: $ virsh list --all error: failed to connect to the hypervisor error: no valid connection error: Failed to connect socket to '/run/user/1000/libvirt/libvirt-sock': Transport endpoint is already connected This is caused by a logic error in virNetSocketNewConnectUnix: even if the connection to the daemon socket succeeded, we still try to spawn the daemon and then connect to it. This commit changes the logic to not try to spawn libvirtd if we successfully connected to its socket. With whitespace changes removed, this patch becomes just this: diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index f913365..79540b3 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -574,7 +574,8 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.data.un.sun_path[0] = '\0'; retry: - if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0 && !spawnDaemon) { + if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { + if (!spawnDaemon) { virReportSystemError(errno, _("Failed to connect socket to '%s'"), path); goto error; @@ -634,6 +635,7 @@ int virNetSocketNewConnectUNIX(const char *path, if (virNetSocketForkDaemon(binary, passfd) < 0) goto error; } + } localAddr.len = sizeof(localAddr.data); if (getsockname(fd, &localAddr.data.sa, &localAddr.len) < 0) { --- src/rpc/virnetsocket.c | 102 +++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 79258ef..8fc5d80 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -573,65 +573,67 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.data.un.sun_path[0] = '\0'; retry: - if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0 && !spawnDaemon) { - virReportSystemError(errno, _("Failed to connect socket to '%s'"), - path); - goto error; - } else if (spawnDaemon) { - int status = 0; - pid_t pid = 0; - - if ((passfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - virReportSystemError(errno, "%s", _("Failed to create socket")); + if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { + if (!spawnDaemon) { + virReportSystemError(errno, _("Failed to connect socket to '%s'"), + path); goto error; - } + } else if (spawnDaemon) { + int status = 0; + pid_t pid = 0; - /* - * We have to fork() here, because umask() is set - * per-process, chmod() is racy and fchmod() has undefined - * behaviour on sockets according to POSIX, so it doesn't - * work outside Linux. - */ - if ((pid = virFork()) < 0) - goto error; + if ((passfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { + virReportSystemError(errno, "%s", _("Failed to create socket")); + goto error; + } - if (pid == 0) { - umask(0077); - if (bind(passfd, &remoteAddr.data.sa, remoteAddr.len) < 0) - _exit(EXIT_FAILURE); + /* + * We have to fork() here, because umask() is set + * per-process, chmod() is racy and fchmod() has undefined + * behaviour on sockets according to POSIX, so it doesn't + * work outside Linux. + */ + if ((pid = virFork()) < 0) + goto error; - _exit(EXIT_SUCCESS); - } + if (pid == 0) { + umask(0077); + if (bind(passfd, &remoteAddr.data.sa, remoteAddr.len) < 0) + _exit(EXIT_FAILURE); - if (virProcessWait(pid, &status, false) < 0) - goto error; + _exit(EXIT_SUCCESS); + } - if (status != EXIT_SUCCESS) { - /* - * OK, so the subprocces failed to bind() the socket. This may mean - * that another daemon was starting at the same time and succeeded - * with its bind(). So we'll try connecting again, but this time - * without spawning the daemon. - */ - spawnDaemon = false; - goto retry; - } + if (virProcessWait(pid, &status, false) < 0) + goto error; - if (listen(passfd, 0) < 0) { - virReportSystemError(errno, "%s", - _("Failed to listen on socket that's about " - "to be passed to the daemon")); - goto error; - } + if (status != EXIT_SUCCESS) { + /* + * OK, so the subprocces failed to bind() the socket. This may mean + * that another daemon was starting at the same time and succeeded + * with its bind(). So we'll try connecting again, but this time + * without spawning the daemon. + */ + spawnDaemon = false; + goto retry; + } - if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { - virReportSystemError(errno, _("Failed to connect socket to '%s'"), - path); - goto error; - } + if (listen(passfd, 0) < 0) { + virReportSystemError(errno, "%s", + _("Failed to listen on socket that's about " + "to be passed to the daemon")); + goto error; + } - if (virNetSocketForkDaemon(binary, passfd) < 0) - goto error; + if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { + virReportSystemError(errno, _("Failed to connect socket to '%s'"), + path); + goto error; + } + + if (virNetSocketForkDaemon(binary, passfd) < 0) + goto error; + } } localAddr.len = sizeof(localAddr.data); -- 1.9.3

3 4

[libvirt] [PATCH v2] Fix connection to already running session libvirtd
by Christophe Fergeau 01 Sep '14

01 Sep '14

Since 1b807f92, connecting with virsh to an already running session libvirtd fails with: $ virsh list --all error: failed to connect to the hypervisor error: no valid connection error: Failed to connect socket to '/run/user/1000/libvirt/libvirt-sock': Transport endpoint is already connected This is caused by a logic error in virNetSocketNewConnectUnix: even if the connection to the daemon socket succeeded, we still try to spawn the daemon and then connect to it. This commit changes the logic to not try to spawn libvirtd if we successfully connected to its socket. Most of this commit is whitespace changes, use of -w is used to look at it. --- Changes since v1: - Removed now redundant test in the else branch src/rpc/virnetsocket.c | 102 +++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 79258ef..9780e17 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -573,65 +573,67 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.data.un.sun_path[0] = '\0'; retry: - if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0 && !spawnDaemon) { - virReportSystemError(errno, _("Failed to connect socket to '%s'"), - path); - goto error; - } else if (spawnDaemon) { - int status = 0; - pid_t pid = 0; - - if ((passfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { - virReportSystemError(errno, "%s", _("Failed to create socket")); + if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { + if (!spawnDaemon) { + virReportSystemError(errno, _("Failed to connect socket to '%s'"), + path); goto error; - } + } else { + int status = 0; + pid_t pid = 0; - /* - * We have to fork() here, because umask() is set - * per-process, chmod() is racy and fchmod() has undefined - * behaviour on sockets according to POSIX, so it doesn't - * work outside Linux. - */ - if ((pid = virFork()) < 0) - goto error; + if ((passfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { + virReportSystemError(errno, "%s", _("Failed to create socket")); + goto error; + } - if (pid == 0) { - umask(0077); - if (bind(passfd, &remoteAddr.data.sa, remoteAddr.len) < 0) - _exit(EXIT_FAILURE); + /* + * We have to fork() here, because umask() is set + * per-process, chmod() is racy and fchmod() has undefined + * behaviour on sockets according to POSIX, so it doesn't + * work outside Linux. + */ + if ((pid = virFork()) < 0) + goto error; - _exit(EXIT_SUCCESS); - } + if (pid == 0) { + umask(0077); + if (bind(passfd, &remoteAddr.data.sa, remoteAddr.len) < 0) + _exit(EXIT_FAILURE); - if (virProcessWait(pid, &status, false) < 0) - goto error; + _exit(EXIT_SUCCESS); + } - if (status != EXIT_SUCCESS) { - /* - * OK, so the subprocces failed to bind() the socket. This may mean - * that another daemon was starting at the same time and succeeded - * with its bind(). So we'll try connecting again, but this time - * without spawning the daemon. - */ - spawnDaemon = false; - goto retry; - } + if (virProcessWait(pid, &status, false) < 0) + goto error; - if (listen(passfd, 0) < 0) { - virReportSystemError(errno, "%s", - _("Failed to listen on socket that's about " - "to be passed to the daemon")); - goto error; - } + if (status != EXIT_SUCCESS) { + /* + * OK, so the subprocces failed to bind() the socket. This may mean + * that another daemon was starting at the same time and succeeded + * with its bind(). So we'll try connecting again, but this time + * without spawning the daemon. + */ + spawnDaemon = false; + goto retry; + } - if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { - virReportSystemError(errno, _("Failed to connect socket to '%s'"), - path); - goto error; - } + if (listen(passfd, 0) < 0) { + virReportSystemError(errno, "%s", + _("Failed to listen on socket that's about " + "to be passed to the daemon")); + goto error; + } - if (virNetSocketForkDaemon(binary, passfd) < 0) - goto error; + if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { + virReportSystemError(errno, _("Failed to connect socket to '%s'"), + path); + goto error; + } + + if (virNetSocketForkDaemon(binary, passfd) < 0) + goto error; + } } localAddr.len = sizeof(localAddr.data); -- 1.9.3

2 2

[libvirt] [PATCH] conf: Check migration_host is valid or not during libvirt restarts
by Chen Fan 01 Sep '14

01 Sep '14

if user specified an invalid strings as migration hostname, like setting: migration_host = "XXXXXXX", libvirt should check it and return error during lbivirt restart. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_conf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e2ec54f..450ac5b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -33,6 +33,7 @@ #include <fcntl.h> #include <sys/wait.h> #include <arpa/inet.h> +#include <netdb.h> #include "virerror.h" #include "qemu_conf.h" @@ -650,6 +651,45 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_LONG("seccomp_sandbox", cfg->seccompSandbox); GET_VALUE_STR("migration_host", cfg->migrateHost); + if (cfg->migrateHost) { + struct addrinfo hints; + struct addrinfo *res; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_ADDRCONFIG; + hints.ai_family = AF_UNSPEC; + + if (getaddrinfo(cfg->migrateHost, NULL, &hints, &res) != 0) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("migration_host: '%s' is not a valid hostname"), + cfg->migrateHost); + goto cleanup; + } + + if (res == NULL) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("No IP address for host '%s' found"), + cfg->migrateHost); + goto cleanup; + } + + freeaddrinfo(res); + + if (STRPREFIX(cfg->migrateHost, "localhost")) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("setting migration_host to 'localhost' is not allowed")); + goto cleanup; + } + + if (STREQ(cfg->migrateHost, "127.0.0.1") || + STREQ(cfg->migrateHost, "::1")) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("setting migration_host to '127.0.0.1' or '::1' " + "is not allowed")); + goto cleanup; + } + } + GET_VALUE_STR("migration_address", cfg->migrationAddress); GET_VALUE_BOOL("log_timestamp", cfg->logTimestamp); -- 1.9.3

3 2

[libvirt] [PATCH] qemu: Add network bandwidth settings for ethernet type interfaces
by Anirban Chakraborty 01 Sep '14

01 Sep '14

Please apply. thanks, Anirban Chakraborty Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_hotplug.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2184caa..258c6a7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7251,6 +7251,11 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (tapfd[0] < 0) goto cleanup; } + /* Configure network bandwidth for ethernet type network interfaces */ + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) + if (virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a364c52..aeb53c5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -940,6 +940,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; vhostfdSize = 1; if (VIR_ALLOC(vhostfd) < 0) goto cleanup; -- 1.8.2.3

1 0

[libvirt] Cosmetic bug on libvirt.org
by Christophe Fergeau 29 Aug '14

29 Aug '14

Hey, I just noticed that clicking on "FAQ" in the left sidebar on libvirt.org main page highlights the "Wiki" cell instead of highlighting "FAQ". I have no idea how the website works, so I'm just reporting it here. Cheers, Christophe

2 1

[libvirt] [PATCH 1.2.8] storage: zfs: fix double listing of new volumes
by Roman Bogorodskiy 29 Aug '14

29 Aug '14

Currently, after calling commands to create a new volumes, virStorageBackendZFSCreateVol calls virStorageBackendZFSFindVols that calls virStorageBackendZFSParseVol. virStorageBackendZFSParseVol checks if a volume already exists by trying to get it using virStorageVolDefFindByName. For a just created volume it returns NULL, so volume is reported as new and appended to pool->volumes. This causes a volume to be listed twice as storageVolCreateXML appends this new volume to the list as well. Fix that by passing a new volume definition to virStorageBackendZFSParseVol so it could determine if it needs to add this volume to the list. --- src/storage/storage_backend_zfs.c | 45 ++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 2d74055..d8201ac 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -58,7 +58,8 @@ virStorageBackendZFSCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, static int virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, - const char *volume) + virStorageVolDefPtr vol, + const char *volume_string) { int ret = -1; char **tokens; @@ -66,9 +67,9 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, char **name_tokens = NULL; char *vol_name; bool is_new_vol = false; - virStorageVolDefPtr vol = NULL; + virStorageVolDefPtr volume = NULL; - if (!(tokens = virStringSplitCount(volume, "\t", 0, &count))) + if (!(tokens = virStringSplitCount(volume_string, "\t", 0, &count))) return -1; if (count != 2) @@ -79,36 +80,41 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, vol_name = name_tokens[1]; - vol = virStorageVolDefFindByName(pool, vol_name); + if (vol == NULL) + volume = virStorageVolDefFindByName(pool, vol_name); + else + volume = vol; - if (vol == NULL) { - if (VIR_ALLOC(vol) < 0) + if (volume == NULL) { + if (VIR_ALLOC(volume) < 0) goto cleanup; is_new_vol = true; - vol->type = VIR_STORAGE_VOL_BLOCK; + volume->type = VIR_STORAGE_VOL_BLOCK; - if (VIR_STRDUP(vol->name, vol_name) < 0) + if (VIR_STRDUP(volume->name, vol_name) < 0) goto cleanup; } - if (!vol->key && VIR_STRDUP(vol->key, tokens[0]) < 0) + if (!volume->key && VIR_STRDUP(volume->key, tokens[0]) < 0) goto cleanup; - if (vol->target.path == NULL) { - if (virAsprintf(&vol->target.path, "%s/%s", - pool->def->target.path, vol->name) < 0) + if (volume->target.path == NULL) { + if (virAsprintf(&volume->target.path, "%s/%s", + pool->def->target.path, volume->name) < 0) goto cleanup; } - if (virStrToLong_ull(tokens[1], NULL, 10, &vol->target.capacity) < 0) { + if (virStrToLong_ull(tokens[1], NULL, 10, &volume->target.capacity) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed volsize reported")); goto cleanup; } if (is_new_vol && - VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, vol) < 0) + VIR_APPEND_ELEMENT(pool->volumes.objs, + pool->volumes.count, + volume) < 0) goto cleanup; ret = 0; @@ -116,12 +122,13 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, virStringFreeList(tokens); virStringFreeList(name_tokens); if (is_new_vol && (ret == -1)) - virStorageVolDefFree(vol); + virStorageVolDefFree(volume); return ret; } static int -virStorageBackendZFSFindVols(virStoragePoolObjPtr pool) +virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, + virStorageVolDefPtr vol) { virCommandPtr cmd = NULL; char *volumes_list = NULL; @@ -157,7 +164,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool) if (STREQ(lines[i], "")) continue; - if (virStorageBackendZFSParseVol(pool, lines[i]) < 0) + if (virStorageBackendZFSParseVol(pool, vol, lines[i]) < 0) continue; } @@ -233,7 +240,7 @@ virStorageBackendZFSRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, } /* Obtain a list of volumes */ - if (virStorageBackendZFSFindVols(pool) < 0) + if (virStorageBackendZFSFindVols(pool, NULL) < 0) goto cleanup; cleanup: @@ -285,7 +292,7 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (virStorageBackendZFSFindVols(pool) < 0) + if (virStorageBackendZFSFindVols(pool, vol) < 0) goto cleanup; ret = 0; -- 2.0.2

2 2