- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Changes to API/ABI for secrets handling
by Daniel P. Berrange 14 Sep '09

14 Sep '09

This series makes two changes to the public API and wire protocol ABI for the secrets handling support recently committed. As such this is a must fix before we do the release, since we can't break compatability once released. The first patch changes all the code to store UUIDs in raw format instead of printable format. This is important because it ensures that e3a9758f-b0c6-7a3a-ebb9-71a69c930289 is treated exactly the same as e3a9758fb0c67a3aebb971a69c930289, which is not the case with the currently committed code. It also makes the secrets and storage encryption XML parsers use the internal UUID handling APIs The second patch adds a new unique property to virSecretPtr. The "owner ID" is intended to be unique on a host wrt all secrets with matching usage type. This entails adding 2 APIs to querying the usage type, and another API to lookup a secret based on its usage. In testing the current code I frequently found myself getting into the situation where there were many secrets for the same volume which was not at all good. So if defining a secret to be used with a storage volume this ensures that you only ever have one secret associated with each storage volume path. The third patch ensures that when you query the XML for a qcow encrypted voluem, it will include the UUID of the secret. Previously if you created a volume, and then restarted libvirtd, the secret UUID would be lost. This patch is why we need the new API from the second patch virLookupSecretByUsage - without that it would be impossible to lookup the secret efficiently. THe final patch is a minor tweak to the RNG

3 13

[libvirt] [PATCH] Fix win32 platform build
by Daniel P. Berrange 14 Sep '09

14 Sep '09

* configure.in: Only define WITH_SECRETS if libvirtd is present * src/Makefile.am: Only build secrets driver if WITH_SECRETS is defined. Always add SECRET_DRIVER_SOURCES to EXTRA_DIST --- configure.in | 11 +++++++++++ src/Makefile.am | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 120f7e7..fad1297 100644 --- a/configure.in +++ b/configure.in @@ -1062,6 +1062,17 @@ AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) + +with_secrets=yes +if test "$with_libvirtd" = "no"; then + with_secrets=no +fi +if test "$with_secrets" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_SECRETS], 1, [whether local secrets management driver is available]) +fi +AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) + + AC_ARG_WITH([storage-fs], [ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) AC_ARG_WITH([storage-lvm], diff --git a/src/Makefile.am b/src/Makefile.am index 14a3a63..69f5ee7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -461,6 +461,7 @@ endif libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) endif +if WITH_SECRETS if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_secret.la else @@ -471,6 +472,7 @@ if WITH_DRIVER_MODULES libvirt_driver_secret_la_LDFLAGS = -module -avoid-version endif libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) +endif # Needed to keep automake quiet about conditionals libvirt_driver_storage_la_SOURCES = @@ -574,6 +576,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ + $(SECRET_DRIVER_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) # -- 1.6.2.5

2 1

[libvirt] ESX [07/12]: Whitespace cleanup
by Matthias Bolte 14 Sep '09

14 Sep '09

Subject says it all.

2 1

[libvirt] ESX [05/12]: Also strip (C) and (TM) from the CPU model string
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: also strip (C) and (TM) from the CPU model string

2 1

[libvirt] ESX [11/12]: Reorder some function calls to avoid potential virDomainPtr leaks
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: avoid potential virDomainPtr leaks

2 1

[libvirt] [PATCH]: API Change patch for VBox 3.0.6
by Pritesh Kothari 14 Sep '09

14 Sep '09

Hi All, VirtualBox 3.0.6 was released few days ago and there were some minor API changes in it. I have created a patch for the same and posting it here. Regards, Pritesh

2 1

[libvirt] ESX [12/12]: Remove phantom mode
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: remove phantom mode

1 0

[libvirt] ESX [10/12]: Replace esxUtil_EqualSuffix() with virFileHasSuffix()
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_util.[ch]: remove esxUtil_EqualSuffix() * src/esx/esx_driver.c, src/esx/esx_vmx.c: replace esxUtil_EqualSuffix() with virFileHasSuffix()

1 0

[libvirt] ESX [09/12]: Add esxDomainDefineXML()
by Matthias Bolte 14 Sep '09

14 Sep '09

A given domain XML gets converted to a VMX config, uploaded to the host and registered as new virtual machine. * src/esx/esx_driver.c: refactor datastore related path parsing into esxUtil_ParseDatastoreRelatedPath() * src/esx/esx_util.[ch]: add esxUtil_ParseDatastoreRelatedPath() * src/esx/esx_vi.[ch]: add esxVI_Context_UploadFile(), add datastores to the traversal in esxVI_BuildFullTraversalSpecList(), add esxVI_LookupDatastoreByName() * src/esx/esx_vi_methods.[ch]: add esxVI_RegisterVM_Task() * src/esx/esx_vi_types.c: make some error message more verbose * src/esx/esx_vmx.[ch]: add esxVMX_AbsolutePathToDatastoreRelatedPath() to convert a path into a datastore related path, add esxVMX_ParseFileName() to convert from VMX path format to domain XML path format, extend the other parsing function to be datastore aware, add esxVMX_FormatFileName() to convert from domain XML path format to VMX path format, fix VMX ethernet entry formating * tests/esxutilstest.c: add test for esxUtil_ParseDatastoreRelatedPath() * tests/vmx2xmldata/*: update domain XML files to use datastore related paths * tests/xml2vmxdata/*: update domain XML files to use datastore related paths, update VMX files to use absolute paths

1 0

[libvirt] ESX [08/12]: Add esxVI_Occurence enum to describe expected occurence of items
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: update the use of esxVI_LookupVirtualMachineByUuid() * src/esx/esx_vi.c: add an esxVI_Occurence parameter to esxVI_LookupVirtualMachineByUuid() and take care if esxVI_FindByUuid() can't find anything for a given uuid * src/esx/esx_vi.h: add esxVI_Occurence enum * src/esx/esx_vi_methods.c: expect null or more items to be returned from esxVI_FindByUuid()

1 0

[libvirt] ESX [06/12]: Add x86_64 detection based on the CPUID
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: add esxSupportsLongMode() and update esxCapsInit() * src/esx/esx_vi.[ch]: Add AnyType handling for lists * src/esx/esx_vi_types.c: bind VI type HostCpuIdInfo

1 0

[libvirt] ESX [04/12]: Add tests for the VMX to/from domain XML mapping
by Matthias Bolte 14 Sep '09

14 Sep '09

* tests/.gitignore: ignore new test binaries * tests/Makefile.am: add new tests * tests/esxutilstest.c: test esxVMX_IndexToDiskName() * tests/vmx2xmldata/*: config files for the VMX to domain XML test * tests/vmx2xmltest.c: test the VMX to domain XML mapping * tests/xml2vmxdata/*: config files for the domain XML to VMX test * tests/xml2vmxtest.c: test the domain XML to VMX mapping

1 0

[libvirt] ESX [03/12]: Add esxDomainXMLToNative()
by Matthias Bolte 14 Sep '09

14 Sep '09

Extend and cleanup the VMX to domain XML mapping. Add the domain XML to VMX mapping functions. * src/esx/esx_driver.c: add esxDomainXMLToNative() * src/esx/esx_vmx.[ch]: add esxVMX_SCSIDiskNameToControllerAndID(), esxVMX_IDEDiskNameToControllerAndID(), esxVMX_FloppyDiskNameToController(), esxVMX_GatherSCSIControllers(), add basic handling for the VMX guestOS entry to distinguish between i686 and x86_64, make SCSI virtualDev VMX entry optional as it should be, map the VMX networkName entry to the domain XML interface bridge name, add basic mapping for serial devices in pipe mode, add several esxVMX_Format*() functions

1 0

[libvirt] ESX [02/12]: Set challenge for auth callback to hostname
by Matthias Bolte 14 Sep '09

14 Sep '09

This enables the auth callback to automatically distinguish between requests for ESX host and vCenter credentials. * src/esx/esx_util.[ch]: set challenge for auth callback to hostname

1 0

[libvirt] Interface driver and ESX support
by Shahar Klein 13 Sep '09

13 Sep '09

I'm trying to get a feel of the python binding and the esx driver Trying to get the number of interfaces hit(as anticipated) a non-support wall: Traceback (most recent call last): File "test.py", line 362, in ? vmm.refresh() File "test.py", line 189, in refresh print self.conn.numOfDefinedInterfaces() File "/usr/lib/python2.4/site-packages/libvirt.py", line 1347, in numOfDefinedInterfaces if ret == -1: raise libvirtError ('virConnectNumOfDefinedInterfaces() failed', conn=self) libvirt.libvirtError: this function is not supported by the hypervisor: virConnectNumOfDefinedInterfaces I'm wondering how to fix it can I register the esx driver as the interface driver? so I can use the ESX web-services to handle all the interface issues that normally(?) netcf would handle? if yes - how is it done? I thought that configure --without-netcf would do the trick(it didn't-I think) Thanks Shahar

4 14

[libvirt] Re: [PATCH 0/2] port over extboot from kvm
by Jan Kiszka 12 Sep '09

12 Sep '09

Gerd Hoffmann wrote: > On 09/08/09 15:47, Jan Kiszka wrote: > >> Before setting this definitely useful feature in stone, I have two >> questions though: >> >> - -drive ...,boot=on is logically in conflict with -boot. Yes, -boot >> for x86 currently cannot differentiate between multiple disks, only >> between boot media types. Still, this two-stage configuration is >> rather unintuitive and looks like a patchwork. Given that we have >> full control over all components, is it really the preferred >> approach? I already thought about, e.g., -boot c2 to select the >> second disk. Not that nice, but I would rather vote for a consistent >> configuration than a scattered one. > > Disk numbers are bad. Define "second hard disk". Especially for a > system with different kinds of disks (say one scsi and one virtio). One could use the specification order, but I agree it's not very handy. > > Drives have names though which can be used to reference the disks, so we > could use that instead. -boot cmd line syntax becomes a bit tricky then > though, we somehow have to figure whenever the user gave us names or > old-style letters. Something like this ... > > -drive if=virtio,id=sys,file=/path/to/disk.img > -cdrom /path/to/install.iso > -boot order=[sys],once=d,menu=off Yes, this looks powerful and clean. One could even still define probe orders like "-boot order=[sys][backup]d". > > ... might work out nicely. I suspect the libvirt folks will hate us for > that though. Does anyone from libvirt want to comment on this? > >> - This is just an implementation detail: Do we really need to implement >> booting from virtio and scsi via an extension rom? Isn't it possible >> to merge the corresponding support into the main bios? > > Well. There are quite a few. bochs pcbios, seabios, coreboot ... Ok, but that's only an argument to have extboot as a workaround for bioses not yet supporting scsi and virtio natively, isn't it? I'm thinking long-term here, not arguing against a extboot-based short-term solution. Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux

4 6

[libvirt] vnet<X>'s & interfaceStats().. KVM device numbering confusion?
by r-c＠rocketmail.com 12 Sep '09

12 Sep '09

Hi libirt-list, I am attempting to migrate from Xen->KVM and am having a little trouble understanding the new vnet<X> interface numbering scheme and how to use it to collect statistics of the interface using the interfaceStats() function. In Xen, the ID for a given domain was know, and a corresponding vif<ID>.0 interface was brought up so it was easy to grab the stats (amongst other things). Under my new KVM config I've realised that vnet<X> is brought up in a 'first free' fashion as opposed to a counter in the Xen case. This leaves me scratching my head a little bit, say I have a domain which has ended up with ID = 8, but may for instance have network 'vnet1' associated with it. I'm not sure how I can determine any association between the domain & which interface belongs to it! (e.g. a call to domain.interfaceStats() requires the correct network interface as a parameter). Surely I must be missing something here? Anyone have any advice/workaround for this situation? Ideally I would like to either be able to hardcode vnet-labels in the XML description (tried but it's ignored), or otherwise keep vnet numbering in sync with domain ID. Thanks in advance, Ravi

2 2

[libvirt] [PATCH] Save vcpuinfo in status file
by Daniel P. Berrange 11 Sep '09

11 Sep '09

* src/qemu_driver.c: Don't trust monitor for vcpu PID info on restart * src/domain_conf.c: Save and load vCPU PID info from domain status file --- src/domain_conf.c | 35 +++++++++++++++++++++++++++++++++++ src/qemu_driver.c | 5 +---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 050cf50..5ae0775 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -3061,6 +3061,8 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, xmlNodePtr oldnode; virDomainObjPtr obj; char *monitorpath; + xmlNodePtr *nodes = NULL; + int n, i; if (!(obj = virDomainObjNew(conn))) return NULL; @@ -3133,9 +3135,32 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, break; } + n = virXPathNodeSet(conn, "./vcpus/vcpu", ctxt, &nodes); + if (n < 0) + goto error; + if (n) { + obj->nvcpupids = n; + if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) + goto error; + + for (i = 0 ; i < n ; i++) { + char *pidstr = virXMLPropString(nodes[i], "pid"); + if (!pidstr) + goto error; + + if (virStrToLong_i(pidstr, NULL, 10, &(obj->vcpupids[i])) < 0) { + VIR_FREE(pidstr); + goto error; + } + VIR_FREE(pidstr); + } + VIR_FREE(nodes); + } + return obj; error: + VIR_FREE(nodes); virDomainChrDefFree(obj->monitor_chr); virDomainObjFree(obj); return NULL; @@ -4422,6 +4447,16 @@ char *virDomainObjFormat(virConnectPtr conn, virBufferVSprintf(&buf, " type='%s'/>\n", virDomainChrTypeToString(obj->monitor_chr->type)); + + if (obj->nvcpupids) { + int i; + virBufferAddLit(&buf, " <vcpus>\n"); + for (i = 0 ; i < obj->nvcpupids ; i++) { + virBufferVSprintf(&buf, " <vcpu pid='%d'/>\n", obj->vcpupids[i]); + } + virBufferAddLit(&buf, " </vcpus>\n"); + } + if (!(config_xml = virDomainDefFormat(conn, obj->def, flags))) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 0e7d8d4..a65334f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -336,10 +336,6 @@ qemuReconnectDomain(struct qemud_driver *driver, goto error; } - if (qemudDetectVcpuPIDs(NULL, obj) < 0) { - goto error; - } - if (qemuUpdateActivePciHostdevs(driver, obj->def) < 0) { goto error; } @@ -2519,6 +2515,7 @@ qemudMonitorCommandWithHandler(const virDomainObjPtr vm, qemuMonitorDiscardPendingData(vm); + VIR_DEBUG("Send '%s'", cmd); if (qemudMonitorSend(vm, cmd, scm_fd) < 0) return -1; -- 1.6.2.5

2 1

[libvirt] Postponing 0.7.1 release by a couple of days
by Daniel Veillard 11 Sep '09

11 Sep '09

We still commited quite a bit in the last few days and I think taking a couple of extra days for testing is a bit safer, so I suggest to make the release only on Tuesday. So we have today and this week end for testing, push fixes if needed on Monday and I would make the release early on tuesday, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Restart libvirtd upon RPM upgrade
by Daniel P. Berrange 11 Sep '09

11 Sep '09

* libvirt.spec.in: Restart libvirtd in %post --- libvirt.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0157eee..8d4c8cc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -471,6 +471,9 @@ fi %endif /sbin/chkconfig --add libvirtd +if [ "$1" -ge "1" ]; then + /sbin/service libvirtd condrestart > /dev/null 2>&1 +fi %endif %preun -- 1.6.2.5

2 1

[libvirt][qemu] unable to start guest under kvm
by Anton Protopopov 11 Sep '09

11 Sep '09

Hi, all. I have the following problem: when I creating a guest, libvirt resolves <type ... machine="pc" ...> to <type ... machine="pc-0.11" ...> as provided by http://www.mail-archive.com/libvir-list@redhat.com/msg15014.html When <type ... machine="pc-0.11" ...> or <type ... machine="pc-0.10" ...> is set, I get two following errors (which would happend is unpredictable) # virsh -c qemu:///system start $d error: Failed to start domain Desktop error: internal error unable to start guest: Supported machines are: pc Standard PC (default) isapc ISA-only PC and # virsh -c qemu:///system start $d error: Failed to start domain Desktop error: monitor socket did not show up.: Connection refused When <type ... machine="pc" ...> is set, this guest starts successfully. The domain type of this machine is "kvm". But I have # qemu --version && kvm --help | head -1 QEMU PC emulator version 0.11.50, Copyright (c) 2003-2008 Fabrice Bellard QEMU PC emulator version 0.10.0 (kvm-devel), Copyright (c) 2003-2008 Fabrice Bellard on that HN. - why does libvirt sets machine to "pc-0.11" even if kvm qemu version is 0.10? - why does an error occure if I set <type ... machine="pc-0.10 ... ">

3 34

[libvirt] Volume encryption missing pieces
by Miloslav Trmač 10 Sep '09

10 Sep '09

Major changes since the previous submission: - Use one or two separate files per secret, using XML for metadata, instead of a single file for all secrets using a custom format. - Split <secret> XML handling from the local driver into secret_conf.[ch], use it when auto-generating secrets. - Use <usage type='volume'><volume/></usage> instead of <volume>. Also available at http://fedorapeople.org/gitweb?p=mitr/public_git/libvirt.git;a=summary .

4 22

[libvirt] [PATCH] Fix use of dlopen modules
by Daniel P. Berrange 10 Sep '09

10 Sep '09

Remove the bogus dependancy between node_device.c & storage_backend.c by moving the virWaitForDevices into util.h where it can be shared safely * src/storage_backend_disk.c, src/storage_backend_logical.c, src/storage_backend_mpath.c, src/storage_backend_scsi.c: Replace virStorageBackendWaitForDevices with virFileWaitForDevices * src/storage_backend.c, src/storage_backend.h: Remove virStorageBackendWaitForDevices, virWaitForDevices * src/util.h, src/util.c: Add virFileWaitForDevices * configure.in: Move xmlrpc check further down after pkgconfig is detected * src/Makefile.am: Add missing XMLRPC_CFLAGS/LIBS to opennebula * src/libvirt_private.syms: Add many missing exports --- configure.in | 6 +++--- src/Makefile.am | 4 ++-- src/libvirt_private.syms | 14 +++++++++++++- src/node_device.c | 4 ++-- src/storage_backend.c | 31 ------------------------------- src/storage_backend.h | 2 -- src/storage_backend_disk.c | 4 ++-- src/storage_backend_logical.c | 2 +- src/storage_backend_mpath.c | 2 +- src/storage_backend_scsi.c | 4 ++-- src/util.c | 27 +++++++++++++++++++++++++++ src/util.h | 2 ++ 12 files changed, 55 insertions(+), 47 deletions(-) diff --git a/configure.in b/configure.in index 060eb50..120f7e7 100644 --- a/configure.in +++ b/configure.in @@ -463,6 +463,9 @@ if test "$with_qemu" = "yes" -o "$with_lxc" = "yes" ; then fi +dnl Need to test if pkg-config exists +PKG_PROG_PKG_CONFIG + dnl OpenNebula driver Compilation setting dnl @@ -491,9 +494,6 @@ AC_SUBST([XMLRPC_CFLAGS]) AC_SUBST([XMLRPC_LIBS]) -dnl Need to test if pkg-config exists -PKG_PROG_PKG_CONFIG - dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec dnl ========================================================================== diff --git a/src/Makefile.am b/src/Makefile.am index 628edc5..02c1f74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -396,8 +396,8 @@ noinst_LTLIBRARIES += libvirt_driver_one.la # Stateful, so linked to daemon instead #libvirt_la_LIBADD += libvirt_driver_one.la endif -libvirt_driver_one_la_CFLAGS = $(ONE_LIBS) -libvirt_driver_one_la_LDFLAGS = $(ONE_LIBS) +libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) +libvirt_driver_one_la_LDFLAGS = $(XMLRPC_LIBS) #libvirt_driver_one_la_CFLAGS = "-DWITH_ONE" if WITH_DRIVER_MODULES libvirt_driver_one_la_LDFLAGS += -module -avoid-version diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8dd279d..06192fc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -10,6 +10,7 @@ virBufferAdd; virBufferAddChar; virBufferContentAndReset; virBufferError; +virBufferURIEncodeString; # caps.h @@ -167,7 +168,16 @@ virHashSize; virInterfaceDefFormat; virInterfaceDefParseFile; virInterfaceDefParseString; +virInterfaceDefParseNode; virInterfaceDefFree; +virInterfaceFindByName; +virInterfaceFindByMACString; +virInterfaceAssignDef; +virInterfaceRemove; +virInterfaceObjLock; +virInterfaceObjUnlock; +virInterfaceObjListFree; + # interface_driver.h interfaceRegister; @@ -214,6 +224,7 @@ virRegisterNetworkDriver; virRegisterStateDriver; virRegisterStorageDriver; virRegisterDeviceMonitor; +virRegisterSecretDriver; # logging.h @@ -410,6 +421,7 @@ virGetUserName; virGetUserID; virGetGroupID; virFileFindMountPoint; +virFileWaitForDevices; # uuid.h @@ -421,7 +433,7 @@ virUUIDParse; # virterror_internal.h virReportErrorHelper; virErrorMsg; -virRaiseError; +virRaiseErrorFull; virReportSystemErrorFull; virReportOOMErrorFull; virStrerror; diff --git a/src/node_device.c b/src/node_device.c index ded203f..69e15b6 100644 --- a/src/node_device.c +++ b/src/node_device.c @@ -35,7 +35,7 @@ #include "node_device_conf.h" #include "node_device_hal.h" #include "node_device.h" -#include "storage_backend.h" /* For virWaitForDevices */ +#include "util.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -599,7 +599,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) while ((now - start) < LINUX_NEW_DEVICE_WAIT_TIME) { - virWaitForDevices(conn); + virFileWaitForDevices(conn); dev = nodeDeviceLookupByWWN(conn, wwnn, wwpn); diff --git a/src/storage_backend.c b/src/storage_backend.c index 5e04f35..0a20255 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -630,31 +630,6 @@ virStorageBackendGetBuildVolFromFunction(virConnectPtr conn, return virStorageBackendCreateRaw; } -#if defined(UDEVADM) || defined(UDEVSETTLE) -void virWaitForDevices(virConnectPtr conn) -{ -#ifdef UDEVADM - const char *const settleprog[] = { UDEVADM, "settle", NULL }; -#else - const char *const settleprog[] = { UDEVSETTLE, NULL }; -#endif - int exitstatus; - - if (access(settleprog[0], X_OK) != 0) - return; - - /* - * NOTE: we ignore errors here; this is just to make sure that any device - * nodes that are being created finish before we try to scan them. - * If this fails for any reason, we still have the backup of polling for - * 5 seconds for device nodes. - */ - virRun(conn, settleprog, &exitstatus); -} -#else -void virWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} -#endif - virStorageBackendPtr virStorageBackendForType(int type) { @@ -893,12 +868,6 @@ virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, } -void virStorageBackendWaitForDevices(virConnectPtr conn) -{ - virWaitForDevices(conn); - return; -} - /* * Given a volume path directly in /dev/XXX, iterate over the * entries in the directory pool->def->target.path and find the diff --git a/src/storage_backend.h b/src/storage_backend.h index eb5bf87..88c6161 100644 --- a/src/storage_backend.h +++ b/src/storage_backend.h @@ -95,7 +95,6 @@ int virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, virStorageVolTargetPtr target, int fd); -void virStorageBackendWaitForDevices(virConnectPtr conn); char *virStorageBackendStablePath(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -128,6 +127,5 @@ int virStorageBackendRunProgNul(virConnectPtr conn, virStorageBackendListVolNulFunc func, void *data); -void virWaitForDevices(virConnectPtr conn); #endif /* __VIR_STORAGE_BACKEND_H__ */ diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c index 6fdb566..e82959c 100644 --- a/src/storage_backend_disk.c +++ b/src/storage_backend_disk.c @@ -325,7 +325,7 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn, VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); if (virStorageBackendDiskReadGeometry(conn, pool) != 0) { return -1; @@ -583,7 +583,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn, return -1; /* wait for device node to show up */ - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); /* Blow away free extent info, as we're about to re-populate it */ VIR_FREE(pool->def->source.devices[0].freeExtents); diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index 43117e8..4389120 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -478,7 +478,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn, }; int exitstatus; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(conn, pool, NULL) < 0) { diff --git a/src/storage_backend_mpath.c b/src/storage_backend_mpath.c index ae02aac..fcc38ba 100644 --- a/src/storage_backend_mpath.c +++ b/src/storage_backend_mpath.c @@ -332,7 +332,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn, pool->def->allocation = pool->def->capacity = pool->def->available = 0; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); virStorageBackendGetMaps(conn, pool); diff --git a/src/storage_backend_scsi.c b/src/storage_backend_scsi.c index a09103f..c70b1ed 100644 --- a/src/storage_backend_scsi.c +++ b/src/storage_backend_scsi.c @@ -494,7 +494,7 @@ virStorageBackendSCSIFindLUs(virConnectPtr conn, VIR_DEBUG(_("Discovering LUs on host %u"), scanhost); - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); if (virAsprintf(&device_path, "/sys/bus/scsi/devices") < 0) { virReportOOMError(conn); @@ -542,7 +542,7 @@ virStorageBackendSCSIGetHostNumber(virConnectPtr conn, VIR_DEBUG(_("Finding host number from '%s'"), sysfs_path); - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); sysdir = opendir(sysfs_path); diff --git a/src/util.c b/src/util.c index af50028..1878e33 100644 --- a/src/util.c +++ b/src/util.c @@ -2019,3 +2019,30 @@ cleanup: return ret; } #endif + +#ifndef PROXY +#if defined(UDEVADM) || defined(UDEVSETTLE) +void virFileWaitForDevices(virConnectPtr conn) +{ +#ifdef UDEVADM + const char *const settleprog[] = { UDEVADM, "settle", NULL }; +#else + const char *const settleprog[] = { UDEVSETTLE, NULL }; +#endif + int exitstatus; + + if (access(settleprog[0], X_OK) != 0) + return; + + /* + * NOTE: we ignore errors here; this is just to make sure that any device + * nodes that are being created finish before we try to scan them. + * If this fails for any reason, we still have the backup of polling for + * 5 seconds for device nodes. + */ + virRun(conn, settleprog, &exitstatus); +} +#else +void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} +#endif +#endif diff --git a/src/util.h b/src/util.h index 896e1b4..f9715ab 100644 --- a/src/util.h +++ b/src/util.h @@ -237,4 +237,6 @@ int virRandom(int max); char *virFileFindMountPoint(const char *type); #endif +void virFileWaitForDevices(virConnectPtr conn); + #endif /* __VIR_UTIL_H__ */ -- 1.6.2.5

2 2

[libvirt] libvir: QEMU error : remoteDomainProcessEvent: unmarshalling msg
by Kenneth Nagin 10 Sep '09

10 Sep '09

I am monitoring events using the example event monitor, event-test, but remoteDomainProcessEvent is outputing an "unmarshalling msg" error when creating a VM. I've installed libvirt 0.6.5. It is configured without XEN; otherwise it is the default configuration. Any suggestions on how to overcome the problem? Kenneth Nagin

3 3

[libvirt] [PATCH 1/5] Add esx and tcp migration uri transports to capabilities schema
by Mark McLoughlin 10 Sep '09

10 Sep '09

* docs/schemas/capabilities.rng: include esx and tcp uri_transport --- docs/schemas/capability.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 1e3c5f3..dbfe1c5 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -79,6 +79,8 @@ <oneOrMore> <element name='uri_transport'> <choice> + <value>esx</value> + <value>tcp</value> <value>xenmigr</value> </choice> </element> -- 1.6.2.5

2 10

[libvirt] [PATCH] Fix regression from "Avoid polling on FDs with no events"
by Chris Lalancette 10 Sep '09

10 Sep '09

After the mentioned patch was applied, I noticed that shutting down a kvm guest from inside (i.e. poweroff) caused the guest to shutdown, but not removed from the list of active guests. DanB pointed out that the problem is that the virEventAddHandle() call in the qemu driver was asking to watch for 0 events, not HANGUP | ERROR as it should. Add these events so that shutdown works again. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 683fe20..996bfff 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -979,7 +979,8 @@ qemudOpenMonitorCommon(virConnectPtr conn, if (ret != 0) return ret; - if ((vm->monitorWatch = virEventAddHandle(vm->monitor, 0, + if ((vm->monitorWatch = virEventAddHandle(vm->monitor, + VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR, qemudDispatchVMEvent, driver, NULL)) < 0) return -1; -- 1.6.0.6

2 2

[libvirt] [PATCH] Reintroduce lzop compression
by Charles Duffy 10 Sep '09

10 Sep '09

3 4

[libvirt] [PATCH] Close logfile fd after spawning qemu
by Ryota Ozaki 10 Sep '09

10 Sep '09

Hi, This patch closes logfile fd after spawing qemu in qemudStartVMDaemon. The fd seems to be closed in the error path, but not in the normal path. The fd is passed to virExecDaemonize though, but looks not being closed inside it. Eventually, the fd is never closed during libvirtd lifetime. Thanks, ozaki-r >From b3d3e0f24c5df5c7677e539bbc2598f2d7fbc3b8 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Thu, 10 Sep 2009 12:53:56 +0900 Subject: [PATCH] Close logfile fd after spawning qemu --- src/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 8f16e72..f2182c4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2187,6 +2187,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS, qemudSecurityHook, &hookData, pidfile); + close(logfile); VIR_FREE(pidfile); /* wait for qemu process to to show up */ -- 1.6.0.6

3 5

[libvirt] 2 patches: dead increment and 4 useless (always-false) disjuncts
by Jim Meyering 10 Sep '09

10 Sep '09

>From 74f57af2010f9cbe2315d625c6502a0b259e6802 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 7 Sep 2009 10:03:22 +0200 Subject: [PATCH 1/2] xm_internal.c: remove dead increment of "data" * src/xm_internal.c (xenXMDomainConfigParse): Don't increment it. --- src/xm_internal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index f206c8c..18613d4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1314,7 +1314,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (!(data = strchr(key, '=')) || (data[0] == '\0')) break; - data++; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (STRPREFIX(key, "vncunused=")) { -- 1.6.4.2.419.gab238 >From d4db2dfaafbf827d1c8b8626a3dbdaa9f371e479 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 7 Sep 2009 10:09:20 +0200 Subject: [PATCH 2/2] xm_internal.c: remove four useless comparisons after strchr * src/xm_internal.c (xenXMDomainConfigParse): After t=strchr... don't test *t; it's known. This was *not* detected by clang, but I spotted it since once instance was in the vicinity of the dead increment of "data". --- src/xm_internal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 18613d4..e7f6a55 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -862,7 +862,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { */ /* Extract the source file path*/ - if (!(offset = strchr(head, ',')) || offset[0] == '\0') + if (!(offset = strchr(head, ','))) goto skipdisk; if ((offset - head) >= (PATH_MAX-1)) goto skipdisk; @@ -882,7 +882,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { head = head + 6; /* Extract the dest device name */ - if (!(offset = strchr(head, ',')) || offset[0] == '\0') + if (!(offset = strchr(head, ','))) goto skipdisk; if (VIR_ALLOC_N(disk->dst, (offset - head) + 1) < 0) goto no_memory; @@ -1018,7 +1018,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { char *data; char *nextkey = strchr(key, ','); - if (!(data = strchr(key, '=')) || (data[0] == '\0')) + if (!(data = strchr(key, '='))) goto skipnic; data++; @@ -1312,7 +1312,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { nextkey++; } - if (!(data = strchr(key, '=')) || (data[0] == '\0')) + if (!(data = strchr(key, '='))) break; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { -- 1.6.4.2.419.gab238

3 5

[libvirt] [PATCH] Fix misc thread locking bugs / bogus warnings
by Daniel P. Berrange 10 Sep '09

10 Sep '09

Fix all thread locking bugs reported by object-locking test case. NB, some of the driver locking is getting too coarse. Driver mutexes really need to be turned into RW locks instead to significantly increase concurrency. * src/lxc_driver.c: Fix useof driver when unlocked in the methods lxcDomainGetInfo, lxcSetSchedulerParameters, and lxcGetSchedulerParameters * src/opennebula/one_driver.c: Fix missing unlock in oneDomainUndefine. Fix use of driver when unlocked in oneDomainGetInfo, oneGetOSType, oneDomainShutdown * src/qemu_driver.c: Fix use of driver when unlocked in qemudDomainSavem, qemuGetSchedulerType, qemuSetSchedulerParameters and qemuGetSchedulerParameters * src/storage_driver.c: Re-work storagePoolCreate to avoid bogus lock checking warning. Re-work storageVolumeCreateXMLFrom to remove a potential NULL de-reference & avoid bogus lock check warnings * src/test.c: Remove testDomainAssignDef since it break lock chekc warnings. * tests/object-locking.ml: Add oneDriverLock, oneDriverUnlock and one_driver_t methods/types to allow lock checking on the OpenNebula drivers --- src/lxc_driver.c | 6 ++-- src/opennebula/one_driver.c | 35 +++++++++++++++--------- src/qemu_driver.c | 60 +++++++++++++++++++++++------------------- src/storage_driver.c | 35 ++++++++++++------------- src/test.c | 55 ++++++++++++++++++++------------------- tests/object-locking.ml | 7 +++- 6 files changed, 108 insertions(+), 90 deletions(-) diff --git a/src/lxc_driver.c b/src/lxc_driver.c index bd0cf0e..0ec1e92 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -439,7 +439,6 @@ static int lxcDomainGetInfo(virDomainPtr dom, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - lxcDriverUnlock(driver); if (!vm) { lxcError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, @@ -470,6 +469,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, ret = 0; cleanup: + lxcDriverUnlock(driver); if (cgroup) virCgroupFree(&cgroup); if (vm) @@ -1667,7 +1667,6 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, domain->uuid); - lxcDriverUnlock(driver); if (vm == NULL) { lxcError(NULL, domain, VIR_ERR_INTERNAL_ERROR, @@ -1698,6 +1697,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, ret = 0; cleanup: + lxcDriverUnlock(driver); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); @@ -1725,7 +1725,6 @@ static int lxcGetSchedulerParameters(virDomainPtr domain, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, domain->uuid); - lxcDriverUnlock(driver); if (vm == NULL) { lxcError(NULL, domain, VIR_ERR_INTERNAL_ERROR, @@ -1745,6 +1744,7 @@ static int lxcGetSchedulerParameters(virDomainPtr domain, ret = 0; cleanup: + lxcDriverUnlock(driver); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 135397c..9587a2d 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -310,6 +310,8 @@ static int oneDomainUndefine(virDomainPtr dom) ret=0; return_point: + if (vm) + virDomainObjUnlock(vm); oneDriverUnlock(driver); return ret; } @@ -392,9 +394,9 @@ static int oneDomainGetInfo(virDomainPtr dom, static char *oneGetOSType(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; virDomainObjPtr vm = NULL; + char *ret = NULL; oneDriverLock(driver); vm =virDomainFindByUUID(&driver->domains, dom->uuid); @@ -402,11 +404,17 @@ static char *oneGetOSType(virDomainPtr dom) if (!vm) { oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, "%s", _("no domain with matching uuid")); - return NULL; + goto cleanup; } - virDomainObjUnlock(vm); - return strdup(vm->def->os.type); + ret = strdup(vm->def->os.type); + if (!ret) + virReportOOMError(dom->conn); + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; } static int oneDomainStart(virDomainPtr dom) @@ -499,24 +507,25 @@ static int oneDomainShutdown(virDomainPtr dom) int ret=-1; oneDriverLock(driver); - if((vm=virDomainFindByID(&driver->domains, dom->id))) { - if(!(c_oneShutdown(vm->pid) ) ) { - vm->state=VIR_DOMAIN_SHUTDOWN; - ret= 0; - goto return_point; - } + if (!(vm=virDomainFindByID(&driver->domains, dom->id))) { + oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, + _("no domain with id %d"), dom->id); + goto return_point; + } + + if (c_oneShutdown(vm->pid)) { oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, _("Wrong state to perform action")); goto return_point; } - oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; + vm->state=VIR_DOMAIN_SHUTDOWN; + ret= 0; if (!vm->persistent) { virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } + return_point: if(vm) virDomainObjUnlock(vm); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d45d33a..b4cd63d 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3575,24 +3575,6 @@ static int qemudDomainSave(virDomainPtr dom, memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic)); header.version = QEMUD_SAVE_VERSION; - if (driver->saveImageFormat == NULL) - header.compressed = QEMUD_SAVE_FORMAT_RAW; - else if (STREQ(driver->saveImageFormat, "raw")) - header.compressed = QEMUD_SAVE_FORMAT_RAW; - else if (STREQ(driver->saveImageFormat, "gzip")) - header.compressed = QEMUD_SAVE_FORMAT_GZIP; - else if (STREQ(driver->saveImageFormat, "bzip2")) - header.compressed = QEMUD_SAVE_FORMAT_BZIP2; - else if (STREQ(driver->saveImageFormat, "lzma")) - header.compressed = QEMUD_SAVE_FORMAT_LZMA; - else if (STREQ(driver->saveImageFormat, "lzop")) - header.compressed = QEMUD_SAVE_FORMAT_LZOP; - else { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, - "%s", _("Invalid save image format specified in configuration file")); - return -1; - } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -3632,6 +3614,24 @@ static int qemudDomainSave(virDomainPtr dom, } header.xml_len = strlen(xml) + 1; + if (driver->saveImageFormat == NULL) + header.compressed = QEMUD_SAVE_FORMAT_RAW; + else if (STREQ(driver->saveImageFormat, "raw")) + header.compressed = QEMUD_SAVE_FORMAT_RAW; + else if (STREQ(driver->saveImageFormat, "gzip")) + header.compressed = QEMUD_SAVE_FORMAT_GZIP; + else if (STREQ(driver->saveImageFormat, "bzip2")) + header.compressed = QEMUD_SAVE_FORMAT_BZIP2; + else if (STREQ(driver->saveImageFormat, "lzma")) + header.compressed = QEMUD_SAVE_FORMAT_LZMA; + else if (STREQ(driver->saveImageFormat, "lzop")) + header.compressed = QEMUD_SAVE_FORMAT_LZOP; + else { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "%s", _("Invalid save image format specified in configuration file")); + goto cleanup; + } + /* Write header to file, followed by XML */ if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, @@ -4429,7 +4429,9 @@ static char *qemuDomainXMLFromNative(virConnectPtr conn, goto cleanup; } + qemuDriverLock(driver); def = qemuParseCommandLineString(conn, driver->caps, config); + qemuDriverUnlock(driver); if (!def) goto cleanup; @@ -6183,12 +6185,13 @@ static char *qemuGetSchedulerType(virDomainPtr dom, int *nparams) { struct qemud_driver *driver = dom->conn->privateData; - char *ret; + char *ret = NULL; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; + goto cleanup; } if (nparams) @@ -6197,6 +6200,9 @@ static char *qemuGetSchedulerType(virDomainPtr dom, ret = strdup("posix"); if (!ret) virReportOOMError(dom->conn); + +cleanup: + qemuDriverUnlock(driver); return ret; } @@ -6210,15 +6216,14 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, virDomainObjPtr vm = NULL; int ret = -1; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; + goto cleanup; } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); if (vm == NULL) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, @@ -6261,6 +6266,7 @@ cleanup: virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); + qemuDriverUnlock(driver); return ret; } @@ -6275,21 +6281,20 @@ static int qemuGetSchedulerParameters(virDomainPtr dom, int ret = -1; int rc; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; + goto cleanup; } if ((*nparams) != 1) { qemudReportError(dom->conn, domain, NULL, VIR_ERR_INVALID_ARG, "%s", _("Invalid parameter count")); - return -1; + goto cleanup; } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); if (vm == NULL) { qemudReportError(dom->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, @@ -6319,6 +6324,7 @@ cleanup: virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); + qemuDriverUnlock(driver); return ret; } diff --git a/src/storage_driver.c b/src/storage_driver.c index e9ecb20..14e3bc2 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -489,24 +489,27 @@ storagePoolCreate(virConnectPtr conn, def = NULL; if (backend->startPool && - backend->startPool(conn, pool) < 0) + backend->startPool(conn, pool) < 0) { + virStoragePoolObjRemove(&driver->pools, pool); + pool = NULL; goto cleanup; + } if (backend->refreshPool(conn, pool) < 0) { if (backend->stopPool) backend->stopPool(conn, pool); + virStoragePoolObjRemove(&driver->pools, pool); + pool = NULL; goto cleanup; } pool->active = 1; ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); - virStoragePoolObjUnlock(pool); - pool = NULL; cleanup: virStoragePoolDefFree(def); if (pool) - virStoragePoolObjRemove(&driver->pools, pool); + virStoragePoolObjUnlock(pool); storageDriverUnlock(driver); return ret; } @@ -1321,27 +1324,23 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, virStorageBackendPtr backend; virStorageVolDefPtr origvol = NULL, newvol = NULL; virStorageVolPtr ret = NULL, volobj = NULL; - int buildret, diffpool; - - diffpool = !STREQ(obj->name, vobj->pool); + int buildret; storageDriverLock(driver); pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); - if (diffpool) { + if (pool && STRNEQ(obj->name, vobj->pool)) { virStoragePoolObjUnlock(pool); origpool = virStoragePoolObjFindByName(&driver->pools, vobj->pool); virStoragePoolObjLock(pool); - } else - origpool = pool; + } storageDriverUnlock(driver); - if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, "%s", _("no storage pool with matching uuid")); goto cleanup; } - if (diffpool && !origpool) { + if (STRNEQ(obj->name, vobj->pool) && !origpool) { virStorageReportError(obj->conn, VIR_ERR_NO_STORAGE_POOL, _("no storage pool with matching name '%s'"), vobj->pool); @@ -1354,7 +1353,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - if (diffpool && !virStoragePoolObjIsActive(origpool)) { + if (origpool && !virStoragePoolObjIsActive(origpool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("storage pool is not active")); goto cleanup; @@ -1363,7 +1362,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if ((backend = virStorageBackendForType(pool->def->type)) == NULL) goto cleanup; - origvol = virStorageVolDefFindByName(origpool, vobj->name); + origvol = virStorageVolDefFindByName(origpool ? origpool : pool, vobj->name); if (!origvol) { virStorageReportError(obj->conn, VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), @@ -1429,7 +1428,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, newvol->building = 1; virStoragePoolObjUnlock(pool); - if (diffpool) { + if (origpool) { origpool->asyncjobs++; virStoragePoolObjUnlock(origpool); } @@ -1438,7 +1437,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, storageDriverLock(driver); virStoragePoolObjLock(pool); - if (diffpool) + if (origpool) virStoragePoolObjLock(origpool); storageDriverUnlock(driver); @@ -1447,7 +1446,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, newvol = NULL; pool->asyncjobs--; - if (diffpool) { + if (origpool) { origpool->asyncjobs--; virStoragePoolObjUnlock(origpool); origpool = NULL; @@ -1469,7 +1468,7 @@ cleanup: virStorageVolDefFree(newvol); if (pool) virStoragePoolObjUnlock(pool); - if (diffpool && origpool) + if (origpool) virStoragePoolObjUnlock(origpool); return ret; } diff --git a/src/test.c b/src/test.c index 7c8f85b..0e4203e 100644 --- a/src/test.c +++ b/src/test.c @@ -261,12 +261,10 @@ testDomainGenerateIfname(virConnectPtr conn, return NULL; } -static virDomainObjPtr -testDomainAssignDef(virConnectPtr conn, - virDomainObjList *domlist, - virDomainDefPtr domdef) +static int +testDomainGenerateIfnames(virConnectPtr conn, + virDomainDefPtr domdef) { - virDomainObjPtr domobj = NULL; int i = 0; for (i = 0; i < domdef->nnets; i++) { @@ -276,18 +274,15 @@ testDomainAssignDef(virConnectPtr conn, ifname = testDomainGenerateIfname(conn, domdef); if (!ifname) - goto error; + return -1; domdef->nets[i]->ifname = ifname; } - if (!(domobj = virDomainAssignDef(conn, domlist, domdef))) - goto error; - -error: - return domobj; + return 0; } + static int testOpenDefault(virConnectPtr conn) { int u; struct timeval tv; @@ -342,10 +337,11 @@ static int testOpenDefault(virConnectPtr conn) { defaultDomainXML, VIR_DOMAIN_XML_INACTIVE))) goto error; - if (!(domobj = testDomainAssignDef(conn, &privconn->domains, domdef))) { - virDomainDefFree(domdef); + if (testDomainGenerateIfnames(conn, domdef) < 0) goto error; - } + if (!(domobj = virDomainAssignDef(conn, &privconn->domains, domdef))) + goto error; + domdef = NULL; domobj->def->id = privconn->nextDomID++; domobj->state = VIR_DOMAIN_RUNNING; domobj->persistent = 1; @@ -399,6 +395,7 @@ error: testDriverUnlock(privconn); conn->privateData = NULL; VIR_FREE(privconn); + virDomainDefFree(domdef); return VIR_DRV_OPEN_ERROR; } @@ -668,7 +665,8 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } - if (!(dom = testDomainAssignDef(conn, &privconn->domains, def))) { + if (testDomainGenerateIfnames(conn, def) < 0 || + !(dom = virDomainAssignDef(conn, &privconn->domains, def))) { virDomainDefFree(def); goto error; } @@ -980,11 +978,11 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { - virDomainDefFree(def); + if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; - } + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) + goto cleanup; + def = NULL; dom->state = VIR_DOMAIN_RUNNING; dom->def->id = privconn->nextDomID++; @@ -992,15 +990,17 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); - ret = virGetDomain(conn, def->name, def->uuid); + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); if (ret) - ret->id = def->id; + ret->id = dom->def->id; cleanup: if (dom) virDomainObjUnlock(dom); if (event) testDomainEventQueue(privconn, event); + if (def) + virDomainDefFree(def); testDriverUnlock(privconn); return ret; } @@ -1531,13 +1531,14 @@ static int testDomainRestore(virConnectPtr conn, if (!def) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) + if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) + goto cleanup; + def = NULL; dom->state = VIR_DOMAIN_RUNNING; dom->def->id = privconn->nextDomID++; - def = NULL; event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_RESTORED); @@ -1823,10 +1824,10 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { + if (testDomainGenerateIfnames(conn, def) < 0) + goto cleanup; + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) goto cleanup; - } def = NULL; dom->persistent = 1; diff --git a/tests/object-locking.ml b/tests/object-locking.ml index 215a2e5..0c66fc7 100644 --- a/tests/object-locking.ml +++ b/tests/object-locking.ml @@ -128,7 +128,8 @@ let driverLockMethods = [ "umlDriverLock"; "nodedevDriverLock"; "networkDriverLock"; - "storageDriverLock" + "storageDriverLock"; + "oneDriverLock" ] (* @@ -142,7 +143,8 @@ let driverUnlockMethods = [ "umlDriverUnlock"; "nodedevDriverUnlock"; "networkDriverUnlock"; - "storageDriverUnlock" + "storageDriverUnlock"; + "oneDriverUnlock" ] (* @@ -159,6 +161,7 @@ let lockableDrivers = [ "virStorageDriverStatePtr"; "network_driver"; "virDeviceMonitorState"; + "one_driver_t"; ] -- 1.6.2.5

2 2

[libvirt] [PATCH] Fix handling of Xen(ner) detection
by Daniel P. Berrange 10 Sep '09

10 Sep '09

Latest upstream QEMU can be built with Xen support, which introduces a -xen-domid argument. This was mistakenly detected as -domid due to old Xenner support. Adapt to cope with both syntax. Also only set domid if the virt type is xen, or the guest type is xen * src/qemu_conf.c, src/qemu_conf.h: Detect new -xen-domid flag in preference to -domid. * tests/qemuxml2argvdata/qemuxml2argv-bootloader.args, tests/qemuxml2argvdata/qemuxml2argv-input-xen.args: Add missing -domid param * tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args: Remove bogus -boot param. * tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml: Fix domain type to be xen * tests/qemuxml2argvtest.c: Add missing QEMUD_CMD_FLAG_DOMID params --- src/qemu_conf.c | 31 +++++++++++++++---- src/qemu_conf.h | 1 + .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 3 +- tests/qemuxml2argvtest.c | 4 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22f5edd..e8414c3 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -769,7 +769,9 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NAME; if (strstr(help, "-uuid")) flags |= QEMUD_CMD_FLAG_UUID; - if (strstr(help, "-domid")) + if (strstr(help, "-xen-domid")) + flags |= QEMUD_CMD_FLAG_XEN_DOMID; + else if (strstr(help, "-domid")) flags |= QEMUD_CMD_FLAG_DOMID; if (strstr(help, "-drive")) { flags |= QEMUD_CMD_FLAG_DRIVE; @@ -1594,9 +1596,22 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-uuid"); ADD_ARG_LIT(uuid); } - if (qemuCmdFlags & QEMUD_CMD_FLAG_DOMID) { - ADD_ARG_LIT("-domid"); - ADD_ARG_LIT(domid); + if (def->virtType == VIR_DOMAIN_VIRT_XEN || + STREQ(def->os.type, "xen") || + STREQ(def->os.type, "linux")) { + if (qemuCmdFlags & QEMUD_CMD_FLAG_DOMID) { + ADD_ARG_LIT("-domid"); + ADD_ARG_LIT(domid); + } else if (qemuCmdFlags & QEMUD_CMD_FLAG_XEN_DOMID) { + ADD_ARG_LIT("-xen-attach"); + ADD_ARG_LIT("-xen-domid"); + ADD_ARG_LIT(domid); + } else { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("qemu emulator '%s' does not support xen"), + def->emulator); + goto error; + } } /* @@ -1649,9 +1664,11 @@ int qemudBuildCommandLine(virConnectPtr conn, break; } } - boot[def->os.nBootDevs] = '\0'; - ADD_ARG_LIT("-boot"); - ADD_ARG_LIT(boot); + if (def->os.nBootDevs) { + boot[def->os.nBootDevs] = '\0'; + ADD_ARG_LIT("-boot"); + ADD_ARG_LIT(boot); + } if (def->os.kernel) { ADD_ARG_LIT("-kernel"); diff --git a/src/qemu_conf.h b/src/qemu_conf.h index a126dac..99aac81 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -67,6 +67,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_HOST_NET_ADD = QEMUD_CMD_FLAG_0_10, /* host_net_add monitor command */ QEMUD_CMD_FLAG_PCIDEVICE = (1 << 17), /* PCI device assignment only supported by qemu-kvm */ + QEMUD_CMD_FLAG_XEN_DOMID = (1 << 18), /* -xen-domid (new style xen integration) */ }; /* Main driver state */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args index 8a15524..bcae18a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args index 64c0e1c..65fb073 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -domid 6 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args index c735dc7..c4df9ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -name QEMUGuest1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -name QEMUGuest1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index 1b37bdc..7f77e01 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -5,8 +5,7 @@ <currentMemory>219200</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> + <type arch='x86_64' machine='pc'>xen</type> </os> <features> <acpi/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6f25e7d..ad7a690 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -186,7 +186,7 @@ mymain(int argc, char **argv) DO_TEST("boot-cdrom", 0); DO_TEST("boot-network", 0); DO_TEST("boot-floppy", 0); - DO_TEST("bootloader", 0); + DO_TEST("bootloader", QEMUD_CMD_FLAG_DOMID); DO_TEST("clock-utc", 0); DO_TEST("clock-localtime", 0); DO_TEST("disk-cdrom", 0); @@ -236,7 +236,7 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); - DO_TEST("input-xen", 0); + DO_TEST("input-xen", QEMUD_CMD_FLAG_DOMID); DO_TEST("misc-acpi", 0); DO_TEST("misc-no-reboot", 0); DO_TEST("misc-uuid", QEMUD_CMD_FLAG_NAME | -- 1.6.2.5

2 2

[libvirt] [PATCH] also allow use of XZ for Qemu image compression
by Jim Meyering 09 Sep '09

09 Sep '09

While this patch stays minimal by simply adding XZ/xz to the list, I think it would be better to remove lzma, since it uses an inferior format (which lacks an integrity check), and has been effectively subsumed by xz. Let me know if you'd like that, and I'll prepare the slightly more invasive patch. >From afb7275f14e8062e6d5eebf704e1fd0f582cb407 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 20:52:37 +0200 Subject: [PATCH] also allow use of XZ for Qemu image compression * src/qemu_driver.c (enum qemud_save_formats) [QEMUD_SAVE_FORMAT_XZ]: New member. [QEMUD_SAVE_FORMAT_LZMA]: Mark as deprecated. (qemudDomainSave, qemudDomainRestore): Handle the new member. * src/qemu.conf: Mention xz, too. --- src/qemu.conf | 2 +- src/qemu_driver.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu.conf b/src/qemu.conf index 06babc4..342bb8a 100644 --- a/src/qemu.conf +++ b/src/qemu.conf @@ -134,7 +134,7 @@ # memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite # a bit of space. If you would like to compress the images while they -# are being saved to disk, you can also set "gzip", "bzip2", "lzma" +# are being saved to disk, you can also set "gzip", "bzip2", "lzma", "xz", # or "lzop" for save_image_format. Note that this means you slow down # the process of saving a domain in order to save disk space. # diff --git a/src/qemu_driver.c b/src/qemu_driver.c index f64d70b..7b64712 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3622,7 +3622,8 @@ enum qemud_save_formats { QEMUD_SAVE_FORMAT_RAW, QEMUD_SAVE_FORMAT_GZIP, QEMUD_SAVE_FORMAT_BZIP2, - QEMUD_SAVE_FORMAT_LZMA, + QEMUD_SAVE_FORMAT_LZMA, /* deprecated, in favor of xz */ + QEMUD_SAVE_FORMAT_XZ, QEMUD_SAVE_FORMAT_LZOP, }; @@ -3664,6 +3665,8 @@ static int qemudDomainSave(virDomainPtr dom, header.compressed = QEMUD_SAVE_FORMAT_BZIP2; else if (STREQ(driver->saveImageFormat, "lzma")) header.compressed = QEMUD_SAVE_FORMAT_LZMA; + else if (STREQ(driver->saveImageFormat, "xz")) + header.compressed = QEMUD_SAVE_FORMAT_XZ; else if (STREQ(driver->saveImageFormat, "lzop")) header.compressed = QEMUD_SAVE_FORMAT_LZOP; else { @@ -3758,6 +3761,9 @@ static int qemudDomainSave(virDomainPtr dom, else if (header.compressed == QEMUD_SAVE_FORMAT_LZMA) internalret = virAsprintf(&command, "migrate \"exec:" "lzma -c >> '%s' 2>/dev/null\"", safe_path); + else if (header.compressed == QEMUD_SAVE_FORMAT_XZ) + internalret = virAsprintf(&command, "migrate \"exec:" + "xz -c >> '%s' 2>/dev/null\"", safe_path); else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP) internalret = virAsprintf(&command, "migrate \"exec:" "lzop -c >> '%s' 2>/dev/null\"", safe_path); @@ -4383,6 +4389,8 @@ static int qemudDomainRestore(virConnectPtr conn, intermediate_argv[0] = "bzip2"; else if (header.compressed == QEMUD_SAVE_FORMAT_LZMA) intermediate_argv[0] = "lzma"; + else if (header.compressed == QEMUD_SAVE_FORMAT_XZ) + intermediate_argv[0] = "xz"; else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP) intermediate_argv[0] = "lzop"; else if (header.compressed != QEMUD_SAVE_FORMAT_RAW) { -- 1.6.5.rc0.164.g5f6b0

5 19

[libvirt] [PATCH] Automagically check if libssh2 is new enough for Phyp-support to be build
by Maximilian Wilhelm 09 Sep '09

09 Sep '09

Hi! My buildbot spotted a problem with the latest changes to Phyp, as the function libssh2_session_block_directions() only is available with libssh2 version 1.0 and later. At least on Debian Lenny there is an older one which prevents libVirt from building, so I updated the configure.in script to add another piece of magic (and thereby fixed the indenation of the Phypchecks). See attached patch. Ciao Max -- "really soon now": an unspecified period of time, likly to be greater than any reasonable definition of "soon".

3 6

[libvirt] HVM startup problem"unknown root elementi for storage pool"
by Andreas Sommer 09 Sep '09

09 Sep '09

Hi, I'm having a problem with starting a HVM virtual machine on Xen-3.4 with python-libvirt. This is the XML: <?xml version="1.0" encoding="utf-8"?> <domain type="xen"> <name>b07d6538-60f5-44a9-90e7-761304968e17</name> <uuid>b07d6538-60f5-44a9-90e7-761304968e17</uuid> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <memory>131072</memory> <vcpu>1</vcpu> <os> <type>hvm</type> <boot dev="hd" /> </os> <devices> <graphics type="vnc" /> <input type="tablet" /> <interface type="bridge"> <source bridge="eth0" /> </interface> <disk type="file"> <source file="/xen-hvm-test/disk0.img" /> <target dev="sda1" /> </disk> </devices> </domain> Then I call connection.createXML(libvirtXmlDescription, 0) which leads to an exception "unknown root elementi for storage pool". I'm using the Debian package "libvirt0" 0.4.6-10. I guess that's 0.6.4 actually, please tell me if that's a wrong assumption?? The 0.6.4 source code seems to have corrected "elementi" to "element" that's why I'm wondering which version I actually have. Why does this happen? Is there anything missing in my XML description? Best regards

1 1

[libvirt] [PATCH] openvz_conf.c: remove dead store to "p"; use strchrnul
by Jim Meyering 09 Sep '09

09 Sep '09

I may separate this into two commits. Currently we can't use the part that adds the strchrnul use, since gnulib's module lists its license as LGPL, which means LGPLv3+, and that conflicts with libvirt's LGPLv2+ requirement. However, since strchrnul is derived from glibc, it should be easy to adjust that. I've asked the maintainer of that module on the bug-gnulib list. We'll see later today when the US wakes up. >From b76bc73df65c793958ce646fd80763c19a9e4dbd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 11:07:32 +0200 Subject: [PATCH] openvz_conf.c: remove dead store to "p"; use strchrnul * src/openvz_conf.c (openvzReadNetworkConf): Replace open-coded while loop with equivalent use of strchrnul. * bootstrap (modules): Add strchrnul. --- bootstrap | 1 + src/openvz_conf.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index 8b81e0e..5560792 100755 --- a/bootstrap +++ b/bootstrap @@ -89,6 +89,7 @@ send setsockopt socket stpcpy +strchrnul strndup strerror strsep diff --git a/src/openvz_conf.c b/src/openvz_conf.c index ce4fc6e..be94b9e 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -239,15 +239,14 @@ openvzReadNetworkConf(virConnectPtr conn, net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - char *p = token, *next = token; + char *p = token; char cpy_temp[32]; int len; /*parse string*/ do { - while (*next != '\0' && *next != ',') next++; + char *next = strchrnul (token, ','); if (STRPREFIX(p, "ifname=")) { - p += 7; /* skip in libvirt */ } else if (STRPREFIX(p, "host_ifname=")) { p += 12; -- 1.6.5.rc0.164.g5f6b0

2 2

[libvirt] [PATCH] two syntax-check related updates
by Jim Meyering 08 Sep '09

08 Sep '09

These changes affect only "make syntax-check". The first patch is clearing out now-useless or unnecessary exclusions. The second enables one more test and fixes the few small violations it spotted. >From e4719bd092b03ef666d196ebc4b97086a7ecae98 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 15:08:07 +0200 Subject: [PATCH 1/2] build: syntax-check: exclude fewer tests * cfg.mk (local-checks-to-skip): Don't skip tests that pass. Remove names of renamed or removed tests. --- cfg.mk | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/cfg.mk b/cfg.mk index 64bd26e..79dcb81 100644 --- a/cfg.mk +++ b/cfg.mk @@ -26,31 +26,17 @@ url_dir_list = \ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ - changelog-check \ - check-AUTHORS \ - makefile-check \ - makefile_path_separator_check \ - patch-check \ sc_GPL_version \ - sc_always_defined_macros \ - sc_cast_of_alloca_return_value \ - sc_dd_max_sym_length \ sc_error_exit_success \ sc_file_system \ sc_immutable_NEWS \ sc_makefile_path_separator_check \ - sc_obsolete_symbols \ - sc_prohibit_S_IS_definition \ sc_prohibit_atoi_atof \ - sc_prohibit_jm_in_m4 \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_stat_st_blocks \ - sc_root_tests \ sc_space_tab \ sc_sun_os_names \ - sc_system_h_headers \ - sc_tight_scope \ sc_two_space_separator_in_usage \ sc_error_message_uppercase \ sc_program_name \ -- 1.6.5.rc0.164.g5f6b0 >From 7bf84b60be8603f226af6244a3e63335586555d6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 15:24:46 +0200 Subject: [PATCH 2/2] build: no longer skip the makefile PATH separator check * cfg.mk (local-checks-to-skip): Remove sc_makefile_path_separator_check. * python/tests/Makefile.am (tests): Use $(PATH_SEPARATOR), not ":" in shell search PATH definitions. --- cfg.mk | 1 - python/tests/Makefile.am | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cfg.mk b/cfg.mk index 79dcb81..7e152f8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -30,7 +30,6 @@ local-checks-to-skip = \ sc_error_exit_success \ sc_file_system \ sc_immutable_NEWS \ - sc_makefile_path_separator_check \ sc_prohibit_atoi_atof \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 6011fef..11218a8 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -12,14 +12,21 @@ EXTRA_DIST = $(PYTESTS) if WITH_PYTHON tests: $(PYTESTS) @echo "## running Python regression tests" - -@(PYTHONPATH="..:../.libs:../src/.libs:$(srcdir)/../src:$$PYTHONPATH";\ - export PYTHONPATH; \ - LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH" ; \ - export LD_LIBRARY_PATH; \ - for test in $(PYTESTS) ; \ - do log=`$(PYTHON) $(srcdir)/$$test` ; \ - if [ "`echo $$log | grep OK`" = "" ] ; then \ - echo "-- $$test" ; echo "$$log" ; fi ; done) + -@(p=..; \ + -@(p="$$p$(PATH_SEPARATOR)../.libs"; \ + p="$$p$(PATH_SEPARATOR)../src/.libs"; \ + p="$$p$(PATH_SEPARATOR)$(srcdir)/../src"; \ + p="$$p$(PATH_SEPARATOR)$$PYTHONPATH"; \ + PYTHONPATH=$$p; export PYTHONPATH; \ + p="$(top_builddir)/src/.libs"; \ + p="$$p$(PATH_SEPARATOR)$$LD_LIBRARY_PATH"; \ + LD_LIBRARY_PATH=$$p; export LD_LIBRARY_PATH; \ + for test in $(PYTESTS); do \ + log=`$(PYTHON) $(srcdir)/$$test`; \ + if [ "`echo $$log | grep OK`" = "" ]; then \ + echo "-- $$test"; echo "$$log"; \ + fi; \ + done) else tests: endif -- 1.6.5.rc0.164.g5f6b0

1 0

[libvirt] Free name in xenDaemonLookupByID(), if virGetDomain() fails
by Matthias Bolte 08 Sep '09

08 Sep '09

Subject says it all. Matthias

2 3

[libvirt] rebased multipath patch
by Dave Allan 08 Sep '09

08 Sep '09

Here's the multipath patch, rebased against the current head. Dave >From 52cb0ff30dd5a52c5a246f3a2022f933cd2a0eab Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Tue, 21 Jul 2009 12:43:01 -0400 Subject: [PATCH] Add a simple pool type for multipath devices This pool type contains volumes for the multipath devices that are present on the host. It does not (yet) support any sort of multipath configuration, so that aspect of system administration must still be done at host build time. --- configure.in | 24 +++ po/POTFILES.in | 1 + src/Makefile.am | 9 + src/storage_backend.c | 82 ++++++++++ src/storage_backend.h | 5 +- src/storage_backend_mpath.c | 352 +++++++++++++++++++++++++++++++++++++++++++ src/storage_backend_mpath.h | 31 ++++ src/storage_conf.c | 7 +- src/storage_conf.h | 1 + 9 files changed, 510 insertions(+), 2 deletions(-) create mode 100644 src/storage_backend_mpath.c create mode 100644 src/storage_backend_mpath.h diff --git a/configure.in b/configure.in index d28c44a..7c93ab7 100644 --- a/configure.in +++ b/configure.in @@ -1046,6 +1046,8 @@ AC_ARG_WITH([storage-iscsi], [ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-scsi], [ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) +AC_ARG_WITH([storage-mpath], +[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) AC_ARG_WITH([storage-disk], [ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) @@ -1056,6 +1058,7 @@ if test "$with_libvirtd" = "no"; then with_storage_lvm=no with_storage_iscsi=no with_storage_scsi=no + with_storage_mpath=no with_storage_disk=no fi if test "$with_storage_dir" = "yes" ; then @@ -1177,6 +1180,26 @@ if test "$with_storage_scsi" = "check"; then fi AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"]) +if test "$with_storage_mpath" = "check"; then + with_storage_mpath=yes + + AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1, + [whether mpath backend for storage driver is enabled]) +fi +AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"]) + +if test "$with_storage_mpath" = "yes"; then + DEVMAPPER_REQUIRED=0.0 + DEVMAPPER_CFLAGS= + DEVMAPPER_LIBS= + PKG_CHECK_MODULES(DEVMAPPER, devmapper >= $DEVMAPPER_REQUIRED, + [], [ + AC_MSG_ERROR( + [You must install device-mapper-devel >= $DEVMAPPER_REQUIRED to compile libvirt]) + ]) +fi +AC_SUBST([DEVMAPPER_CFLAGS]) +AC_SUBST([DEVMAPPER_LIBS]) LIBPARTED_CFLAGS= LIBPARTED_LIBS= @@ -1677,6 +1700,7 @@ AC_MSG_NOTICE([ NetFS: $with_storage_fs]) AC_MSG_NOTICE([ LVM: $with_storage_lvm]) AC_MSG_NOTICE([ iSCSI: $with_storage_iscsi]) AC_MSG_NOTICE([ SCSI: $with_storage_scsi]) +AC_MSG_NOTICE([ mpath: $with_storage_mpath]) AC_MSG_NOTICE([ Disk: $with_storage_disk]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0a53dab..1586368 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,6 +38,7 @@ src/storage_backend_fs.c src/storage_backend_iscsi.c src/storage_backend_logical.c src/storage_backend_scsi.c +src/storage_backend_mpath.c src/storage_conf.c src/storage_driver.c src/storage_encryption_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index bedeb84..cf3420b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -199,6 +199,9 @@ STORAGE_DRIVER_ISCSI_SOURCES = \ STORAGE_DRIVER_SCSI_SOURCES = \ storage_backend_scsi.h storage_backend_scsi.c +STORAGE_DRIVER_MPATH_SOURCES = \ + storage_backend_mpath.h storage_backend_mpath.c + STORAGE_DRIVER_DISK_SOURCES = \ storage_backend_disk.h storage_backend_disk.c @@ -478,6 +481,10 @@ if WITH_STORAGE_SCSI libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) endif +if WITH_STORAGE_MPATH +libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) +endif + if WITH_STORAGE_DISK libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) endif @@ -539,6 +546,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_LVM_SOURCES) \ $(STORAGE_DRIVER_ISCSI_SOURCES) \ $(STORAGE_DRIVER_SCSI_SOURCES) \ + $(STORAGE_DRIVER_MPATH_SOURCES) \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ @@ -607,6 +615,7 @@ libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(LIBXML_LIBS) $(SELINUX_LIBS) \ $(XEN_LIBS) $(DRIVER_MODULE_LIBS) \ + $(DEVMAPPER_LIBS) \ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms diff --git a/src/storage_backend.c b/src/storage_backend.c index c818142..4dec06b 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -59,6 +59,9 @@ #if WITH_STORAGE_SCSI #include "storage_backend_scsi.h" #endif +#if WITH_STORAGE_MPATH +#include "storage_backend_mpath.h" +#endif #if WITH_STORAGE_DISK #include "storage_backend_disk.h" #endif @@ -89,6 +92,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_SCSI &virStorageBackendSCSI, #endif +#if WITH_STORAGE_MPATH + &virStorageBackendMpath, +#endif #if WITH_STORAGE_DISK &virStorageBackendDisk, #endif @@ -812,6 +818,82 @@ virStorageBackendUpdateVolTargetInfoFD(virConnectPtr conn, return 0; } + +struct diskType { + int part_table_type; + unsigned short offset; + unsigned short length; + unsigned long long magic; +}; + + +static struct diskType const disk_types[] = { + { VIR_STORAGE_POOL_DISK_LVM2, 0x218, 8, 0x31303020324D564CULL }, + { VIR_STORAGE_POOL_DISK_GPT, 0x200, 8, 0x5452415020494645ULL }, + { VIR_STORAGE_POOL_DISK_DVH, 0x0, 4, 0x41A9E50BULL }, + { VIR_STORAGE_POOL_DISK_MAC, 0x0, 2, 0x5245ULL }, + { VIR_STORAGE_POOL_DISK_BSD, 0x40, 4, 0x82564557ULL }, + { VIR_STORAGE_POOL_DISK_SUN, 0x1fc, 2, 0xBEDAULL }, + /* + * NOTE: pc98 is funky; the actual signature is 0x55AA (just like dos), so + * we can't use that. At the moment I'm relying on the "dummy" IPL + * bootloader data that comes from parted. Luckily, the chances of running + * into a pc98 machine running libvirt are approximately nil. + */ + /*{ 0x1fe, 2, 0xAA55UL },*/ + { VIR_STORAGE_POOL_DISK_PC98, 0x0, 8, 0x314C5049000000CBULL }, + /* + * NOTE: the order is important here; some other disk types (like GPT and + * and PC98) also have 0x55AA at this offset. For that reason, the DOS + * one must be the last one. + */ + { VIR_STORAGE_POOL_DISK_DOS, 0x1fe, 2, 0xAA55ULL }, + { -1, 0x0, 0, 0x0ULL }, +}; + + +int +virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, + virStorageVolTargetPtr target, + int fd) +{ + int i; + off_t start; + unsigned char buffer[1024]; + ssize_t bytes; + + /* make sure to set the target format "unknown" to begin with */ + target->format = VIR_STORAGE_POOL_DISK_UNKNOWN; + + start = lseek(fd, 0, SEEK_SET); + if (start < 0) { + virReportSystemError(conn, errno, + _("cannot seek to beginning of file '%s'"), + target->path); + return -1; + } + bytes = saferead(fd, buffer, sizeof(buffer)); + if (bytes < 0) { + virReportSystemError(conn, errno, + _("cannot read beginning of file '%s'"), + target->path); + return -1; + } + + for (i = 0; disk_types[i].part_table_type != -1; i++) { + if (disk_types[i].offset + disk_types[i].length > bytes) + continue; + if (memcmp(buffer+disk_types[i].offset, &disk_types[i].magic, + disk_types[i].length) == 0) { + target->format = disk_types[i].part_table_type; + break; + } + } + + return 0; +} + + void virStorageBackendWaitForDevices(virConnectPtr conn) { virWaitForDevices(conn); diff --git a/src/storage_backend.h b/src/storage_backend.h index e80b05d..eb5bf87 100644 --- a/src/storage_backend.h +++ b/src/storage_backend.h @@ -91,7 +91,10 @@ int virStorageBackendUpdateVolTargetInfoFD(virConnectPtr conn, int fd, unsigned long long *allocation, unsigned long long *capacity); - +int +virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, + virStorageVolTargetPtr target, + int fd); void virStorageBackendWaitForDevices(virConnectPtr conn); char *virStorageBackendStablePath(virConnectPtr conn, diff --git a/src/storage_backend_mpath.c b/src/storage_backend_mpath.c new file mode 100644 index 0000000..41dadf1 --- /dev/null +++ b/src/storage_backend_mpath.c @@ -0,0 +1,352 @@ +/* + * storage_backend_mpath.c: storage backend for multipath handling + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange redhat com> + */ + +#include <config.h> + +#include <unistd.h> +#include <stdio.h> +#include <dirent.h> +#include <fcntl.h> + +#include <libdevmapper.h> + +#include "virterror_internal.h" +#include "storage_conf.h" +#include "storage_backend.h" +#include "memory.h" +#include "logging.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +static int +virStorageBackendMpathUpdateVolTargetInfo(virConnectPtr conn, + virStorageVolTargetPtr target, + unsigned long long *allocation, + unsigned long long *capacity) +{ + int ret = 0; + int fd = -1; + + if ((fd = open(target->path, O_RDONLY)) < 0) { + virReportSystemError(conn, errno, + _("cannot open volume '%s'"), + target->path); + ret = -1; + goto out; + } + + if (virStorageBackendUpdateVolTargetInfoFD(conn, + target, + fd, + allocation, + capacity) < 0) { + + VIR_ERROR(_("Failed to update volume target info for %s"), + target->path); + + ret = -1; + goto out; + } + + if (virStorageBackendUpdateVolTargetFormatFD(conn, + target, + fd) < 0) { + VIR_ERROR(_("Failed to update volume target format for %s"), + target->path); + + ret = -1; + goto out; + } + +out: + if (fd != -1) { + close(fd); + } + return ret; +} + + +static int +virStorageBackendMpathNewVol(virConnectPtr conn, + virStoragePoolObjPtr pool, + const int devnum, + const char *dev) +{ + virStorageVolDefPtr vol; + int retval = 0; + + if (VIR_ALLOC(vol) < 0) { + virReportOOMError(conn); + retval = -1; + goto out; + } + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (virAsprintf(&(vol->name), "dm-%u", devnum) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + if (virAsprintf(&vol->target.path, "/dev/%s", dev) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + if (virStorageBackendMpathUpdateVolTargetInfo(conn, + &vol->target, + &vol->allocation, + &vol->capacity) < 0) { + + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to update volume for '%s'"), + vol->target.path); + retval = -1; + goto free_vol; + } + + /* XXX should use logical unit's UUID instead */ + vol->key = strdup(vol->target.path); + if (vol->key == NULL) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + pool->def->capacity += vol->capacity; + pool->def->allocation += vol->allocation; + + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count + 1) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + pool->volumes.objs[pool->volumes.count++] = vol; + + goto out; + +free_vol: + virStorageVolDefFree(vol); +out: + return retval; +} + + +static int +virStorageBackendIsMultipath(const char *devname) +{ + int ret = 0; + struct dm_task *dmt = NULL; + void *next = NULL; + uint64_t start, length; + char *target_type = NULL; + char *params = NULL; + + dmt = dm_task_create(DM_DEVICE_TABLE); + if (dmt == NULL) { + ret = -1; + goto out; + } + + if (dm_task_set_name(dmt, devname) == 0) { + ret = -1; + goto out; + } + + dm_task_no_open_count(dmt); + + if (!dm_task_run(dmt)) { + ret = -1; + goto out; + } + + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, &params); + + if (target_type == NULL) { + ret = -1; + goto out; + } + + if (!(strcmp(target_type, "multipath"))) { + ret = 1; + } + +out: + if (dmt != NULL) { + dm_task_destroy(dmt); + } + return ret; +} + + +static int +virStorageBackendGetMinorNumber(const char *devname, uint32_t *minor) +{ + int ret = -1; + struct dm_task *dmt; + struct dm_info info; + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { + goto out; + } + + if (!dm_task_set_name(dmt, devname)) { + goto out; + } + + if (!dm_task_run(dmt)) { + goto out; + } + + if (!dm_task_get_info(dmt, &info)) { + goto out; + } + + *minor = info.minor; + ret = 0; + +out: + if (dmt != NULL) { + dm_task_destroy(dmt); + } + + return ret; +} + + +static int +virStorageBackendCreateVols(virConnectPtr conn, + virStoragePoolObjPtr pool, + struct dm_names *names) +{ + int retval = 0, is_mpath = 0; + char *map_device = NULL; + uint32_t minor = -1; + + do { + is_mpath = virStorageBackendIsMultipath(names->name); + + if (is_mpath < 0) { + retval = -1; + goto out; + } + + if (is_mpath == 1) { + + if (virAsprintf(&map_device, "mapper/%s", names->name) < 0) { + virReportOOMError(conn); + retval = -1; + goto out; + } + + if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { + retval = -1; + goto out; + } + + virStorageBackendMpathNewVol(conn, + pool, + minor, + map_device); + + VIR_FREE(map_device); + } + + /* Given the way libdevmapper returns its data, I don't see + * any way to avoid this series of casts. */ + names = (struct dm_names *)(((char *)names) + names->next); + + } while (names->next); + +out: + return retval; +} + + +static int +virStorageBackendGetMaps(virConnectPtr conn, + virStoragePoolObjPtr pool) +{ + int retval = 0; + struct dm_task *dmt = NULL; + struct dm_names *names = NULL; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) { + retval = 1; + goto out; + } + + dm_task_no_open_count(dmt); + + if (!dm_task_run(dmt)) { + retval = 1; + goto out; + } + + if (!(names = dm_task_get_names(dmt))) { + retval = 1; + goto out; + } + + if (!names->dev) { + /* No devices found */ + goto out; + } + + virStorageBackendCreateVols(conn, pool, names); + +out: + if (dmt != NULL) { + dm_task_destroy (dmt); + } + return retval; +} + + +static int +virStorageBackendMpathRefreshPool(virConnectPtr conn, + virStoragePoolObjPtr pool) +{ + int retval = 0; + + VIR_ERROR(_("in %s"), __func__); + + pool->def->allocation = pool->def->capacity = pool->def->available = 0; + + virStorageBackendWaitForDevices(conn); + + virStorageBackendGetMaps(conn, pool); + + return retval; +} + + +virStorageBackend virStorageBackendMpath = { + .type = VIR_STORAGE_POOL_MPATH, + + .refreshPool = virStorageBackendMpathRefreshPool, +}; diff --git a/src/storage_backend_mpath.h b/src/storage_backend_mpath.h new file mode 100644 index 0000000..9de2b79 --- /dev/null +++ b/src/storage_backend_mpath.h @@ -0,0 +1,31 @@ +/* + * storage_backend_scsi.h: storage backend for SCSI handling + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange redhat com> + */ + +#ifndef __VIR_STORAGE_BACKEND_MPATH_H__ +#define __VIR_STORAGE_BACKEND_MPATH_H__ + +#include "storage_backend.h" + +extern virStorageBackend virStorageBackendMpath; + +#endif /* __VIR_STORAGE_BACKEND_MPATH_H__ */ diff --git a/src/storage_conf.c b/src/storage_conf.c index c446069..af04080 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi") + "scsi", "mpath") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -198,6 +198,11 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatToString = virStoragePoolFormatDiskTypeToString, } }, + { .poolType = VIR_STORAGE_POOL_MPATH, + .volOptions = { + .formatToString = virStoragePoolFormatDiskTypeToString, + } + }, { .poolType = VIR_STORAGE_POOL_DISK, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_DEVICE), diff --git a/src/storage_conf.h b/src/storage_conf.h index bcf9b93..421d305 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -119,6 +119,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_DISK, /* Disk partitions */ VIR_STORAGE_POOL_ISCSI, /* iSCSI targets */ VIR_STORAGE_POOL_SCSI, /* SCSI HBA */ + VIR_STORAGE_POOL_MPATH, /* Multipath devices */ VIR_STORAGE_POOL_LAST, }; -- 1.6.0.6

3 3

Re: [libvirt] [PATCH 04/10] Secret manipulation step 7: Local driver
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > On Mon, Sep 07, 2009 at 04:12:39PM +0200, Miloslav Trmač wrote: > > + if ((size_t)st.st_size != st.st_size) { > > shouldn't we chaeck against SECRET_MAX_XML_FILE instead ? No, this code reads the secret value, not the XML, and there's little reason to impose an arbitrary limit on the size. SECRET_MAX_XML_FILE is a left-over from an earlier version, the attached updated patch removes the definition. Mirek

1 0

Re: [libvirt] [PATCH 03/10] Add an internal <secret> XML handling API
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > > + default: > > + VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type); > > + break; > > Hum, since the virSecretDefPtr is allocated by our own code, it's > probably better to remove the default so that the compiler can tell us > we missed one enum case if new ones gets added. > > + type_str = virXPathString(conn, "string(./usage/@type)", ctxt); > > + if (type_str == NULL) { > > + virSecretReportError(conn, VIR_ERR_XML_ERROR, "%s", > > + _("unknown secret usage type")); > > _("missing secret usage type") would be more appropriate I guess > > + case VIR_SECRET_USAGE_TYPE_VOLUME: > > + def->usage.volume = virXPathString(conn, "string(./usage/volume)", > > + ctxt); > > + break; > > + > > + default: > > Again default: here means a mismatch between > virSecretUsageTypeTypeFromString and this function, best handled > statically IMHO. Thanks for the review, attached is an updated patch. Mirek

1 0

Re: [libvirt] [PATCH 02/10] Add VIR_SECRET_GET_VALUE_INTERNAL_CALL.
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > > +/* Make sure ... INTERNAL_CALL can not be set by the caller */ > > +verify((VIR_SECRET_GET_VALUE_INTERNAL_CALL & > > + VIR_SECRET_GET_VALUE_FLAGS_MASK) == 0); > > ??? what's that ? an assert at compile time ? I don't know that construct > I would rather avoid it if it's not portable. Yes, a compile-time assert, provided by gnulib. The mechanism depends only on ISO C, and gnulib/lib/verify.h contains detailed comments about why the particular variant was chosen. It seems safe enough to me. Mirek

1 0

[libvirt] [PATCH]: Fixed minor bugs in display and added OOM checks.
by Pritesh Kothari 08 Sep '09

08 Sep '09

Hi All, There was a minor bug in selecting the graphics type. if the graphics type was desktop it was assumed that display is set for it, and thus crashed on strdup, so now checking if display is present before setting it. The second bug was while setting the 3d acceleration parameter, VIR_ALLOC() returns 0 or greater if success and not the other way round. Lastly added OOM checks in few places which were missed earlier. Regards, Pritesh

3 4

[libvirt] [PATCH] 6 dead-store patches
by Jim Meyering 07 Sep '09

07 Sep '09

>From 129dc57243df4e73daa24aac671087bcd25f51ad Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 16:49:37 +0200 Subject: [PATCH 1/6] xm_internal.c: remove dead stores of local, "type" * src/xm_internal.c (xenXMDomainConfigParse): Remove declaration and useless containing if-block, too. --- src/xm_internal.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 9627ffb..661172b 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1,7 +1,7 @@ /* * xm_internal.h: helper routines for dealing with inactive domains * - * Copyright (C) 2006-2007 Red Hat + * Copyright (C) 2006-2007, 2009 Red Hat * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -995,7 +995,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (list && list->type == VIR_CONF_LIST) { list = list->list; while (list) { - int type = -1; char script[PATH_MAX]; char model[10]; char ip[16]; @@ -1031,7 +1030,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { mac[len] = '\0'; } else if (STRPREFIX(key, "bridge=")) { int len = nextkey ? (nextkey - data) : sizeof(bridge)-1; - type = 1; if (len > (sizeof(bridge)-1)) len = sizeof(bridge)-1; strncpy(bridge, data, len); @@ -1069,11 +1067,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { key = nextkey; } - /* XXX Forcing to pretend its a bridge */ - if (type == -1) { - type = 1; - } - if (VIR_ALLOC(net) < 0) goto cleanup; -- 1.6.4.2.419.gab238 >From b8b1ea4894ac9bf2a59472958a8bb0749526847f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:22:19 +0200 Subject: [PATCH 2/6] xm_internal.c: remove two ret=... dead stores * src/xm_internal.c (xenXMDomainCreate): Remove dead stores. --- src/xm_internal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 661172b..de3aca9 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1850,10 +1850,10 @@ int xenXMDomainCreate(virDomainPtr domain) { goto error; domain->id = ret; - if ((ret = xend_wait_for_devices(domain->conn, domain->name)) < 0) + if (xend_wait_for_devices(domain->conn, domain->name) < 0) goto error; - if ((ret = xenDaemonDomainResume(domain)) < 0) + if (xenDaemonDomainResume(domain) < 0) goto error; xenUnifiedUnlock(priv); -- 1.6.4.2.419.gab238 >From a74d747d27bde38ece90df9a14acb648d83b9993 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:27:34 +0200 Subject: [PATCH 3/6] domain_conf.c: remove two dead stores * src/domain_conf.c (virDomainSaveXML): Remove use and decl of "err". (virDomainDefParseXML): Likewise. --- src/domain_conf.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 8dde5dd..050cf50 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2520,8 +2520,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, /* Extract domain uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; @@ -4456,12 +4455,11 @@ int virDomainSaveXML(virConnectPtr conn, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if (virFileMakePath(configDir)) { virReportSystemError(conn, errno, _("cannot create config directory '%s'"), configDir); -- 1.6.4.2.419.gab238 >From b9c2d697d732b4c740fd9e1f87ad135c52e02c34 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 18:53:20 +0200 Subject: [PATCH 4/6] util.c: avoid dead store to "flag" * src/util.c (virExecDaemonize): Change flag |= VAR to "flag | VAR". --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 2529837..af50028 100644 --- a/src/util.c +++ b/src/util.c @@ -663,7 +663,7 @@ int virExecDaemonize(virConnectPtr conn, ret = virExecWithHook(conn, argv, envp, keepfd, retpid, infd, outfd, errfd, - flags |= VIR_EXEC_DAEMON, + flags | VIR_EXEC_DAEMON, hook, data, pidfile); /* __virExec should have set an error */ -- 1.6.4.2.419.gab238 >From 6470cb9312a13fd018fb83b79e66cb50190b1f4f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:36:17 +0200 Subject: [PATCH 5/6] iptables.c: remove dead store to "s" * src/iptables.c (iptablesAddRemoveRule): Remove dead store. --- src/iptables.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/iptables.c b/src/iptables.c index 73b39d1..4562800 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -398,7 +398,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) 1; /* arg */ va_start(args, arg); - while ((s = va_arg(args, const char *))) + while (va_arg(args, const char *)) n++; va_end(args); -- 1.6.4.2.419.gab238 >From 65c10b030fb43d6678be9bd5eeeb326a024d6902 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:37:37 +0200 Subject: [PATCH 6/6] network_driver.c: remove dead store to "err" * src/network_driver.c (networkSetAutostart): ...and its decl. --- src/network_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index 84910ab..49855bf 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -1428,9 +1428,7 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->networkAutostartDir))) { + if (virFileMakePath(driver->networkAutostartDir)) { virReportSystemError(net->conn, errno, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); -- 1.6.4.2.419.gab238

2 3

[libvirt] [PATCH] xm_internal.c: remove dead store and associated leak
by Jim Meyering 07 Sep '09

07 Sep '09

This one took a little thinking. I'm not 100% sure that the comment in my log is sufficient justification for removing the virGetDomain call. If we leave it, we'll have to free it and remove the XXX comment. >From 324e07f17e6a2ed6df236af955adc693670d1b16 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:46:59 +0200 Subject: [PATCH] xm_internal.c: remove dead store and associated leak * src/xm_internal.c (xenXMDomainDefineXML): Dead store to "olddomain" -- and comment ;-) highlighted that the virGetDomain call represented a leak. It was also useless, seeing as how preceding call to virHashLookup(priv->nameConfigMap found def->name. --- src/xm_internal.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index de3aca9..e7f6a55 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2532,7 +2532,6 @@ cleanup: */ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainPtr ret; - virDomainPtr olddomain; char filename[PATH_MAX]; const char * oldfilename; virDomainDefPtr def = NULL; @@ -2578,10 +2577,6 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { goto error; } - /* XXX wtf.com is this line for - it appears to be amemory leak */ - if (!(olddomain = virGetDomain(conn, def->name, entry->def->uuid))) - goto error; - /* Remove the name -> filename mapping */ if (virHashRemoveEntry(priv->nameConfigMap, def->name, NULL) < 0) { xenXMError(conn, VIR_ERR_INTERNAL_ERROR, -- 1.6.4.2.419.gab238

2 1

[libvirt] [PATCH] network_conf.c: remove dead store to "err"
by Jim Meyering 07 Sep '09

07 Sep '09

>From 66133e3b9d80e9fadefd810786b0ff2f5c8e6875 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:15:51 +0200 Subject: [PATCH] network_conf.c: remove dead store to "err" * src/network_conf.c (virNetworkDefParseXML): ...and its decl. --- src/network_conf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/network_conf.c b/src/network_conf.c index 58a4f32..3764bb4 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -1,7 +1,7 @@ /* * network_conf.c: network XML handling * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2009 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -329,8 +329,7 @@ virNetworkDefParseXML(virConnectPtr conn, /* Extract network uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; -- 1.6.4.2.409.g85dc3

2 1

[libvirt] merge-commit push prohibition now in place, for master
by Jim Meyering 07 Sep '09

07 Sep '09

Just today we noticed that it was possible to push accidental merge commits to "master". While the commit hook to prevent that was in place, the config setting to enable the hook for "master" was missing. I've just done this on the server: git --git-dir /git/libvirt.git config hooks.denymerge.master true so *now*, we should be protected from ourselves.

2 1

[libvirt] [PATCH] xend_internal.c: Remove two dead stores to "ret"
by Jim Meyering 07 Sep '09

07 Sep '09

>From 99610dd77b95914623bd78f2bcac5d15a6c87024 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:14:09 +0200 Subject: [PATCH] xend_internal.c: Remove two dead stores to "ret" * src/xend_internal.c (xenDaemonCreateXML): Don't set "ret" after last use. --- src/xend_internal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xend_internal.c b/src/xend_internal.c index cf45cd6..2fa08f1 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4028,10 +4028,10 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, if (!(dom = virDomainLookupByName(conn, def->name))) goto error; - if ((ret = xend_wait_for_devices(conn, def->name)) < 0) + if (xend_wait_for_devices(conn, def->name) < 0) goto error; - if ((ret = xenDaemonDomainResume(dom)) < 0) + if (xenDaemonDomainResume(dom) < 0) goto error; virDomainDefFree(def); -- 1.6.4.2.409.g85dc3

2 1

[libvirt] [PATCH] openvz_driver.c: avoid dead store to "err"
by Jim Meyering 07 Sep '09

07 Sep '09

>From 559c1ba31a89fd3a6ed54631d5d900fa16140187 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:11:31 +0200 Subject: [PATCH] openvz_driver.c: avoid dead store to "err" * src/openvz_driver.c (openvzGenerateContainerVethName): Remove use and decl of "err". --- src/openvz_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/openvz_driver.c b/src/openvz_driver.c index 43d54f9..a8c24ba 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -504,11 +504,10 @@ openvzGenerateVethName(int veid, char *dev_name_ve) static char * openvzGenerateContainerVethName(int veid) { - int ret; char temp[1024]; /* try to get line "^NETIF=..." from config */ - if ( (ret = openvzReadVPSConfigParam(veid, "NETIF", temp, sizeof(temp))) <= 0) { + if (openvzReadVPSConfigParam(veid, "NETIF", temp, sizeof(temp)) <= 0) { snprintf(temp, sizeof(temp), "eth0"); } else { char *saveptr; -- 1.6.4.2.409.g85dc3

2 1

[libvirt] 3 more dead stores
by Jim Meyering 07 Sep '09

07 Sep '09

>From 7a2202539b6445017c420644e5327ce64eaf3bac Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:27:34 +0200 Subject: [PATCH 1/2] domain_conf.c: remove two dead stores * src/domain_conf.c (virDomainSaveXML): Remove use and decl of "err". (virDomainDefParseXML): Likewise. --- src/domain_conf.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 8dde5dd..050cf50 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2520,8 +2520,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, /* Extract domain uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; @@ -4456,12 +4455,11 @@ int virDomainSaveXML(virConnectPtr conn, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if (virFileMakePath(configDir)) { virReportSystemError(conn, errno, _("cannot create config directory '%s'"), configDir); -- 1.6.4.2.409.g85dc3 >From 89e2837b4382690e4d434c086541da1dcd3d4c58 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 18:53:20 +0200 Subject: [PATCH 2/2] util.c: avoid dead store to "flag" * src/util.c (virExecDaemonize): Change flag |= VAR to "flag | VAR". --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 2529837..af50028 100644 --- a/src/util.c +++ b/src/util.c @@ -663,7 +663,7 @@ int virExecDaemonize(virConnectPtr conn, ret = virExecWithHook(conn, argv, envp, keepfd, retpid, infd, outfd, errfd, - flags |= VIR_EXEC_DAEMON, + flags | VIR_EXEC_DAEMON, hook, data, pidfile); /* __virExec should have set an error */ -- 1.6.4.2.409.g85dc3

2 1

Re: [libvirt] [PATCH 0/6] sVirt AppArmor security driver
by Daniel Veillard 07 Sep '09

07 Sep '09

[ Sending again as my mail Sat, Sep 05, 2009 at 11:00:46AM +0200 didn't seem to have reach the list, Daniel ] On Fri, Sep 04, 2009 at 04:03:50PM -0500, Jamie Strandboge wrote: > On Fri, 04 Sep 2009, Daniel Veillard wrote: > > > On Fri, Sep 04, 2009 at 12:23:33PM -0500, Jamie Strandboge wrote: > > > This patch series implements the AppArmor security driver for sVirt. > > > This implementation was developed for the Ubuntu AppArmorLibvirtProfile > > > specification[1], but is general enough for any AppArmor deployment > > > (such as Ubuntu, *SUSE and Mandriva). > > > > > > This patch has seen quite a bit of real world testing in Ubuntu 9.10 > > > (our development release) in our 0.7.0-1ubuntu3 package. I did make a > > > few small changes after going through HACKING, but mostly I got the > > > tests going and added documentation. > > > > Could you triple check that the make syntax-check run clean with > > your patches applied, because a very quick glimpse shows up a number > > of malloc() which we don't allow for example. It may be because you > > didn't enter the files in the SCM but the checks should be done anyway > > on the new files please. > > > > I noticed that syntax-check wouldn't scan the new files unless I did a > git commit first. I did not run 'syntax-check' after adding the > documention examples, and just found that examples/apparmor/libvirt-qemu > had a trailing blank line (I was a bit surprised syntax-check checked > these files (attached is an updated docs patch)). okay > I can demonstrate that the files are being checked by removing the > '#include <config.h>' line in security_apparmor.c and virt-aa-helper.c > and syntax-check failing: [...] > I don't see that 'syntax-check' enforces not using *alloc, but I did > read in HACKING that *alloc are deprecated, though I had already written > the code before reading it. I do see other examples of *alloc in the I really though all cases of direct malloc or realloc had been eliminated, apparently it's not the case yet, and syntax-check doesn't enforce it... we need to do this. I note we also still have a few free() left around in the code base to cleanup too. > codebase, and I do properly check the return code of all calls to *alloc. > If you insist on those calls being replaced, I can do that, but I didn't > before submitting because I knew the current calls were correct and > didn't want to introduce bugs into the code. yeah, I think it's better to fix them before. In any case we have a week of bug fix only before the next release in a week, so best is to fix them now, wait for the actual reviews and then resubmit patches for inclusion. thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0