- Devel - libvirt List Archives

[libvirt] an old bug reappear-TimeoutError
by yue 09 May '13

09 May '13

hi, i encounter an error of libvirt, which is reported in 2011. i intended to update the ticket(spice password) of vm. https://bugzilla.redhat.com/show_bug.cgi?id=676205 ---------log------------------ Thread-162::ERROR::2013-05-08 13:50:46,000::BindingXMLRPC::909::vdsm::(wrapper) libvirt error Traceback (most recent call last): File "/usr/share/vdsm/BindingXMLRPC.py", line 904, in wrapper res = f(*args, **kwargs) File "/usr/share/vdsm/BindingXMLRPC.py", line 213, in vmSetTicket return vm.setTicket(password, ttl, existingConnAction, params) File "/usr/share/vdsm/API.py", line 550, in setTicket return v.setTicket(password, ttl, existingConnAction, params) File "/usr/share/vdsm/libvirtvm.py", line 2245, in setTicket self._dom.updateDeviceFlags(graphics.toxml(), 0) File "/usr/share/vdsm/libvirtvm.py", line 524, in f raise toe TimeoutError: Timed out during operation: cannot acquire state change lock

2 1

[libvirt] [PATCH] Replace 'goto err' with 'goto cleanup' in udev interface driver
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The udev interface driver did not follow standard naming convention for goto labels. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/interface/interface_backend_udev.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1c47e5c..f9a179f 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -112,21 +112,21 @@ udevInterfaceOpen(virConnectPtr conn, if (VIR_ALLOC(driverState) < 0) { virReportOOMError(); - goto err; + goto cleanup; } driverState->udev = udev_new(); if (!driverState->udev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create udev context")); - goto err; + goto cleanup; } conn->interfacePrivateData = driverState; return VIR_DRV_OPEN_SUCCESS; -err: +cleanup: VIR_FREE(driverState); return VIR_DRV_OPEN_ERROR; @@ -166,7 +166,7 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status) _("failed to get number of %s interfaces on host"), virUdevStatusString(status)); count = -1; - goto err; + goto cleanup; } /* Do the scan to load up the enumeration */ @@ -180,7 +180,7 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status) count++; } -err: +cleanup: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -207,7 +207,7 @@ udevListInterfacesByStatus(virConnectPtr conn, virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to get list of %s interfaces on host"), virUdevStatusString(status)); - goto err; + goto error; } /* Do the scan to load up the enumeration */ @@ -229,7 +229,7 @@ udevListInterfacesByStatus(virConnectPtr conn, dev = udev_device_new_from_syspath(udev, path); if (VIR_STRDUP(names[count], udev_device_get_sysname(dev)) < 0) { udev_device_unref(dev); - goto err; + goto error; } udev_device_unref(dev); @@ -241,7 +241,7 @@ udevListInterfacesByStatus(virConnectPtr conn, return count; -err: +error: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -422,14 +422,14 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) virReportError(VIR_ERR_NO_INTERFACE, _("couldn't find interface named '%s'"), name); - goto err; + goto cleanup; } macaddr = udev_device_get_sysattr_value(dev, "address"); ret = virGetInterface(conn, name, macaddr); udev_device_unref(dev); -err: +cleanup: udev_unref(udev); return ret; @@ -452,7 +452,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to lookup interface with MAC address '%s'"), macstr); - goto err; + goto cleanup; } /* Match on MAC */ @@ -469,7 +469,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) virReportError(VIR_ERR_NO_INTERFACE, _("couldn't find interface with MAC address '%s'"), macstr); - goto err; + goto cleanup; } /* Check that we didn't get multiple items back */ @@ -477,7 +477,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) virReportError(VIR_ERR_MULTIPLE_INTERFACES, _("the MAC address '%s' matches multiple interfaces"), macstr); - goto err; + goto cleanup; } dev = udev_device_new_from_syspath(udev, udev_list_entry_get_name(dev_entry)); @@ -485,7 +485,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) ret = virGetInterface(conn, name, macstr); udev_device_unref(dev); -err: +cleanup: if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); @@ -1043,13 +1043,13 @@ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo, ifacedef = udevGetIfaceDef(udev, ifinfo->name); if (!ifacedef) - goto err; + goto cleanup; xmlstr = virInterfaceDefFormat(ifacedef); virInterfaceDefFree(ifacedef); -err: +cleanup: /* decrement our udev ptr */ udev_unref(udev); -- 1.8.1.4

2 2

[libvirt] [PATCH] build: fix build with old polkit0
by Jim Fehlig 09 May '13

09 May '13

Commit 979e9c56 missed one case of providing the timestamp parameter to virNetServerClientGetUNIXIdentity() when WITH_POLKIT0 is defined. --- Pushed under the build breaker rule. daemon/remote.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3b6446d..1d21478 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2899,6 +2899,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); DBusConnection *sysbus; + unsigned long long timestamp; virMutexLock(&priv->lock); @@ -2913,7 +2914,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, } if (virNetServerClientGetUNIXIdentity(client, &callerUid, &callerGid, - &callerPid) < 0) { + &callerPid, &timestamp) < 0) { VIR_ERROR(_("cannot get peer socket identity")); goto authfail; } -- 1.8.0.1

1 0

[libvirt] [PATCH 00/40] Refactor Xen driver to support ACL work
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Xen driver currently is a really horrible mess, in particular with the way iterates over sub-drivers calling each one in turn, until one magically works. For each operation there is always a clear rule for which sub-driver must be used. Thus instead of blindly iterating over all drivers, we can directly invoke the correct sub-driver. This highlights that quite alot of code is in fact completely unreachable / used & can be deleted. The second big issue is that the Xen sub-drivers will randomly use either the 'id', 'name' or 'uuid' from the virDomainPtr object. If the user provides a malicious virDomainPtr instance, it is possible to have a 'id' referring to domain A, a 'name' referring to domain B and a 'uuid' referring to domain C. This makes doing reliable access control checks difficult. To ensure we have a consistent triple, use the 'uuid' from virDomainPtr to lookup the guest with the hypervisor and return a virDomainDefPtr where only the name/id/uuid are filled out. Use this in the all the subdrivers isolating them from the public virDomainPtr object. The top level Xen driver will then be able to do access control checks on the virDomainDefPtr instances. Daniel P. Berrange (40): Remove xen driver checks for priv->handle < 0 Remove VIR_CONNECT_RO checks from xen drivers Remove pointless GET_PRIVATE macro from Xen driver Simplify opening of Xen drivers Simplify the Xen get type driver method Simplify the Xen get version driver method Simplify the Xen get max vcpus / node get info driver methods Simplify the Xen count/list domains driver methods Simplify the Xen domain create driver method Simplify the Xen domain lookup driver methods Simplify the Xen domain is persistent driver method Simplify the Xen domain suspend/resume driver methods Simplify the Xen domain shutdown/reboot driver methods Simplify the Xen domain destroy driver method Simplify the Xen domain get OS type driver method Remove Xen get hostname driver method Simplify the Xen domain get/set (max) memory driver methods Simplify the Xen domain get info/state driver methods Simplify the Xen domain save/restore driver methods Simplify the Xen domain VCPU driver methods Simplify the Xen domain get XML driver method Simplify the Xen domain migration driver methods Simplify the Xen driver define domain driver methods Simplify the Xen domain start driver method Simplify the Xen domain define/undefine driver methods Simplify the Xen domain attach/dettach driver methods Simplify the Xen domain scheduler parameter driver methods Simplify the Xen domain autostart driver method Simplify the Xen domain stats/peek / node memory driver methods Convert Xen domain lookup driver methods to use virDomainDefPtr Convert Xen domain lifecycle driver methods to use virDomainDefPtr Convert Xen domain property driver methods to use virDomainDefPtr Convert Xen domain managed save driver methods to use virDomainDefPtr Convert Xen domain start/migration APIs to use virDomainDefPtr Convert Xen domain VCPU driver methods to use virDomainDefPtr Convert Xen domain device hotplug driver methods to use virDomainDefPtr Convert Xen domain autostart driver methods to use virDomainDefPtr Convert Xen domain scheduler driver methods to use virDomainDefPtr Convert Xen domain stats/peek driver methods to use virDomainDefPtr Convert Xen domain core dump driver methods to use virDomainDefPtr src/conf/domain_conf.c | 23 + src/conf/domain_conf.h | 4 + src/libvirt_private.syms | 1 + src/xen/block_stats.c | 6 +- src/xen/block_stats.h | 2 +- src/xen/xen_driver.c | 1542 ++++++++++++++++++++++++---------------------- src/xen/xen_driver.h | 37 -- src/xen/xen_hypervisor.c | 668 +++----------------- src/xen/xen_hypervisor.h | 83 ++- src/xen/xen_inotify.c | 22 +- src/xen/xen_inotify.h | 11 +- src/xen/xend_internal.c | 855 ++++++++----------------- src/xen/xend_internal.h | 164 +++-- src/xen/xm_internal.c | 312 ++++------ src/xen/xm_internal.h | 84 ++- src/xen/xs_internal.c | 427 +------------ src/xen/xs_internal.h | 20 +- 17 files changed, 1492 insertions(+), 2769 deletions(-) -- 1.8.1.4

2 84

[libvirt] [PATCH] Cope with missing swap cgroup controls
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> It is possible to build a kernel without swap cgroup controls present. This causes a fatal error when querying memory parameters. Treat missing swap controls as meaning "unlimited". The fatal error remains if the user tries to actually change the limit. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6a23573..693b637 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7612,9 +7612,12 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, case 2: /* fill swap hard limit here */ rc = virCgroupGetMemSwapHardLimit(priv->cgroup, &val); if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to get swap hard limit")); - goto cleanup; + if (rc != -ENOENT) { + virReportSystemError(-rc, "%s", + _("unable to get swap hard limit")); + goto cleanup; + } + val = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; } if (virTypedParameterAssign(param, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, -- 1.8.2.1

2 1

[libvirt] [PATCH] Skip virNWFilterTechDriver when validating API naming
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virNWFilterTechDriver struct is an internal only driver API with no public API equivalent. It should be skipped by the 'check-driverimpls' test case Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/check-driverimpls.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/check-driverimpls.pl b/src/check-driverimpls.pl index e385de0..17e2b48 100755 --- a/src/check-driverimpls.pl +++ b/src/check-driverimpls.pl @@ -68,7 +68,8 @@ while (<>) { } } } elsif (/^(?:static\s+)?(vir(?:\w+)?Driver)\s+/) { - next if $1 eq "virNWFilterCallbackDriver"; + next if $1 eq "virNWFilterCallbackDriver" || + $1 eq "virNWFilterTechDriver"; $intable = 1; $table = $1; } -- 1.8.1.4

2 1

[libvirt] [PATCH] Replace list of driver source files with variables
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update the DRIVER_SOURCE_FILES variable to reference the other various XXX_SOURCES variables, instead of duplicating the filename lists. This results in a bunch of extra files being processed, but the test scripts can easily skip those Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 58 +++++++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6c2788c..6175b84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -438,44 +438,28 @@ check-drivername: EXTRA_DIST += check-drivername.pl DRIVER_SOURCE_FILES = \ - esx/esx_device_monitor.c \ - esx/esx_driver.c \ - esx/esx_interface_driver.c \ - esx/esx_network_driver.c \ - esx/esx_nwfilter_driver.c \ - esx/esx_secret_driver.c \ - esx/esx_storage_driver.c \ - hyperv/hyperv_device_monitor.c \ - hyperv/hyperv_driver.c \ - hyperv/hyperv_interface_driver.c \ - hyperv/hyperv_network_driver.c \ - hyperv/hyperv_nwfilter_driver.c \ - hyperv/hyperv_secret_driver.c \ - hyperv/hyperv_storage_driver.c \ - interface/interface_backend_netcf.c \ - interface/interface_backend_udev.c \ - libxl/libxl_driver.c \ - lxc/lxc_driver.c \ - network/bridge_driver.c \ - node_device/node_device_hal.c \ - node_device/node_device_udev.c \ - nwfilter/nwfilter_driver.c \ - openvz/openvz_driver.c \ - parallels/parallels_driver.c \ - parallels/parallels_network.c \ - parallels/parallels_storage.c \ - phyp/phyp_driver.c \ - qemu/qemu_driver.c \ - remote/remote_driver.c \ - secret/secret_driver.c \ - storage/storage_driver.c \ - test/test_driver.c \ - uml/uml_driver.c \ - vbox/vbox_driver.c \ + $(ESX_DRIVER_SOURCES) \ + $(HYPERV_DRIVER_SORUCES) \ + $(INTERFACE_DRIVER_SOURCES) \ + $(LIBXL_DRIVER_SOURCES) \ + $(LXC_DRIVER_SOURCES) \ + $(NETWORK_DRIVER_SOURCES) \ + $(NODE_DEVICE_DRIVER_SOURCES) \ + $(NWFILTER_DRIVER_SOURCES) \ + $(OPENVZ_DRIVER_SOURCES) \ + $(PARALLELS_DRIVER_SOURCES) \ + $(PHYP_DRIVER_SOURCES) \ + $(QEMU_DRIVER_SOURCES) \ + $(REMOTE_DRIVER_SOURCES) \ + $(SECRET_DRIVER_SOURCES) \ + $(STORAGE_DRIVER_SOURCES) \ + $(TEST_DRIVER_SOURCES) \ + $(UML_DRIVER_SOURCES) \ + $(VBOX_DRIVER_SOURCES) \ vbox/vbox_tmpl.c \ - vmware/vmware_driver.c \ - xen/xen_driver.c \ - xenapi/xenapi_driver.c \ + $(VMWARE_DRIVER_SOURCES) \ + $(XEN_DRIVER_SOURCES) \ + $(XENAPI_DRIVER_SOURCES) \ $(NULL) -- 1.8.1.4

2 1

[libvirt] [PATCH] Disable some URI tests on older libxml2
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Older versions of libxml2 could not correctly parse certain URIs. This causes test failures. There's nothing libvirt can do about this, so disable the problem tests on old libxml2 versions Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/viruritest.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/viruritest.c b/tests/viruritest.c index 0bcd78d..6339d17 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -182,19 +182,23 @@ mymain(void) { (char*)"foo", (char*)"two", false }, { NULL, NULL, false }, }; +#ifdef HAVE_XMLURI_QUERY_RAW virURIParam params3[] = { { (char*)"foo", (char*)"&one", false }, { (char*)"bar", (char*)"&two", false }, { NULL, NULL, false }, }; +#endif virURIParam params4[] = { { (char*)"foo", (char*)"", false }, { NULL, NULL, false }, }; +#ifdef HAVE_XMLURI_QUERY_RAW virURIParam params5[] = { { (char*)"foo", (char*)"one two", false }, { NULL, NULL, false }, }; +#endif virURIParam params6[] = { { (char*)"foo", (char*)"one", false }, { NULL, NULL, false }, @@ -204,12 +208,16 @@ mymain(void) TEST_PARAMS("foo=one&foo=two", "", params2); TEST_PARAMS("foo=one&&foo=two", "foo=one&foo=two", params2); TEST_PARAMS("foo=one;foo=two", "foo=one&foo=two", params2); +#ifdef HAVE_XMLURI_QUERY_RAW TEST_PARAMS("foo=%26one&bar=%26two", "", params3); +#endif TEST_PARAMS("foo", "foo=", params4); TEST_PARAMS("foo=", "", params4); TEST_PARAMS("foo=&", "foo=", params4); TEST_PARAMS("foo=&&", "foo=", params4); +#ifdef HAVE_XMLURI_QUERY_RAW TEST_PARAMS("foo=one%20two", "", params5); +#endif TEST_PARAMS("=bogus&foo=one", "foo=one", params6); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 1.8.1.4

2 1

[libvirt] [PATCH] Fix build of python bindings on Python 2.4
by Daniel P. Berrange 09 May '13

09 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The PyDict_Next method on Python <= 2.4 used 'int' instead of "Py_ssize_t" for the 'pos' parameter Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/libvirt-override.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 856789a..fd9ebb8 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -152,7 +152,11 @@ setPyVirTypedParameter(PyObject *info, const virTypedParameterPtr params, int nparams) { PyObject *key, *value; +#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 + int pos = 0; +#else Py_ssize_t pos = 0; +#endif virTypedParameterPtr temp = NULL, ret = NULL; Py_ssize_t size; int i; -- 1.8.1.4

2 1

[libvirt] [PATCH] don't mention disk controllers in generic controller errors
by Ján Tomko 09 May '13

09 May '13

The controller element supports non-disk controller types too. https://bugzilla.redhat.com/show_bug.cgi?id=960958 --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d55ce6b..6b71727 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12667,7 +12667,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (src->ncontrollers != dst->ncontrollers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain disk controller count %zu " + _("Target domain controller count %zu " "does not match source %zu"), dst->ncontrollers, src->ncontrollers); return false; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5005afa..6a23573 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5808,7 +5808,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk controller bus '%s' cannot be hotplugged."), + _("'%s' controller cannot be hotplugged."), virDomainControllerTypeToString(cont->type)); break; } @@ -5923,7 +5923,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver, break; default : virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk controller bus '%s' cannot be hotunplugged."), + _("'%s' controller cannot be hotunplugged."), virDomainControllerTypeToString(cont->type)); } return ret; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a4f48b0..4d8ac52 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2273,7 +2273,7 @@ int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver, dev->data.controller->type, dev->data.controller->idx)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("disk controller %s:%d not found"), + _("controller %s:%d not found"), virDomainControllerTypeToString(dev->data.controller->type), dev->data.controller->idx); goto cleanup; -- 1.8.1.5

2 2