- Devel - libvirt List Archives

[libvirt] [PATCH] vircgroup: Don't leak keypath if failed to kill process
by Chen Hanxiao 16 May '14

16 May '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/vircgroup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index fce380a..c578bd0 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3370,7 +3370,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, int rc; bool killedAny = false; char *keypath = NULL; - DIR *dp; + DIR *dp = NULL; virCgroupPtr subgroup = NULL; struct dirent *ent; int direrr; @@ -3381,7 +3381,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, return -1; if ((rc = virCgroupKillInternal(group, signum, pids)) < 0) - return -1; + goto cleanup; if (rc == 1) killedAny = true; @@ -3394,7 +3394,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, } virReportSystemError(errno, _("Cannot open %s"), keypath); - return -1; + goto cleanup; } while ((direrr = virDirRead(dp, &ent, keypath)) > 0) { @@ -3429,7 +3429,9 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, cleanup: virCgroupFree(&subgroup); - closedir(dp); + VIR_FREE(keypath); + if (dp) + closedir(dp); return ret; } -- 1.9.0

3 2

[libvirt] [libvirt-python PATCH v2] override: add virDomainFSFreeze and virDomainFSThaw API
by Michal Privoznik 16 May '14

16 May '14

From: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> Add binding for the new virDomainFSFreeze and virDomainFSThaw functions added in libvirt 1.2.5. These require override since these take a list of mountpoints path string. The methods are named 'fsFreeze' and 'fsThaw'. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Eric's and mine review comments worked in generator.py | 3 ++ libvirt-override-virDomain.py | 12 ++++++ libvirt-override.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) diff --git a/generator.py b/generator.py index 05ec743..e7b4643 100755 --- a/generator.py +++ b/generator.py @@ -517,6 +517,9 @@ skip_function = ( 'virDomainCreateXMLWithFiles', # overridden in virConnect.py 'virDomainCreateWithFiles', # overridden in virDomain.py + 'virDomainFSFreeze', # overridden in virDomain.py + 'virDomainFSThaw', # overridden in virDomain.py + # 'Ref' functions have no use for bindings users. "virConnectRef", "virDomainRef", diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index c96cc5e..e61ad00 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -47,3 +47,15 @@ ret = libvirtmod.virDomainCreateWithFiles(self._o, files, flags) if ret == -1: raise libvirtError ('virDomainCreateWithFiles() failed', dom=self) return ret + + def fsFreeze(self, mountpoints=None, flags=0): + """Freeze specified filesystems within the guest """ + ret = libvirtmod.virDomainFSFreeze(self._o, mountpoints, flags) + if ret == -1: raise libvirtError ('virDomainFSFreeze() failed', dom=self) + return ret + + def fsThaw(self, mountpoints=None, flags=0): + """Thaw specified filesystems within the guest """ + ret = libvirtmod.virDomainFSThaw(self._o, mountpoints, flags) + if ret == -1: raise libvirtError ('virDomainFSThaw() failed', dom=self) + return ret diff --git a/libvirt-override.c b/libvirt-override.c index 3fa9b9b..c4ac223 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7554,6 +7554,99 @@ cleanup: #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) +static PyObject * +libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSFreeze", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSFreeze(domain, (const char **) mountpoints, + nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + + py_retval = libvirt_intWrap(c_retval); + +cleanup: + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + return py_retval; +} + + +static PyObject * +libvirt_virDomainFSThaw(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSThaw", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSThaw(domain, (const char **) mountpoints, + nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + + py_retval = libvirt_intWrap(c_retval); + + cleanup: + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ + /************************************************************************ * * * The registration stuff * @@ -7729,6 +7822,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainCreateXMLWithFiles", libvirt_virDomainCreateXMLWithFiles, METH_VARARGS, NULL}, {(char *) "virDomainCreateWithFiles", libvirt_virDomainCreateWithFiles, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) + {(char *) "virDomainFSFreeze", libvirt_virDomainFSFreeze, METH_VARARGS, NULL}, + {(char *) "virDomainFSThaw", libvirt_virDomainFSThaw, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ {NULL, NULL, 0, NULL} }; -- 1.9.3

3 2

[libvirt] [PATCHv2 0/2] Honor DAC norelabel attribute
by Michal Privoznik 16 May '14

16 May '14

Version two, this time split into two patches. Michal Privoznik (2): security_dac: Rework to make it more readable security_dac: Honor norelabel attribute src/security/security_dac.c | 355 ++++++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 142 deletions(-) -- 1.9.0

3 5

[libvirt] [PATCH 1/3] virutil: Introduce a new macro named CLAMP.
by Dongsheng Yang 16 May '14

16 May '14

This patch introduce a new macro to return a value clamped to a given range. Signed-off-by: Dongsheng Yang <yangds.fnst(a)cn.fujitsu.com> --- src/util/virutil.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virutil.h b/src/util/virutil.h index 2bb74e2..e8536d8 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -37,6 +37,12 @@ # ifndef MAX # define MAX(a, b) ((a) > (b) ? (a) : (b)) # endif +# ifndef CLAMP +# define CLAMP(v, min, max) ({ \ + typeof(v) _v = v; \ + _v = _v < min ? min: _v; \ + _v > max ? max: _v; }) +# endif int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; -- 1.8.2.1

4 17

[libvirt] [PATCH] Hyper-V 2012 R2 support
by vikhyath reddy 16 May '14

16 May '14

Hi, This patch adds support to libvirt to work with Hyper-V 2012 R2. This will however mean that Hyper-V 2008 will no longer be supported. Microsoft supports hyperv 2008 management via windows 7 and hyperv 2012 via windows 8.1 (note that the reverse is not true, that is, win 7 cannot manage hyperv 2012 and win 8.1 cannot manage hyperv 2008). I think they wanted to keep the application code separate, in the sense that one manages the old namespace and the new one manages the new v2 namespace. The difference between the two namespaces is not great either, sadly, both of them have same class names but with different field types (int, string etc.) which have been separated by the namespace root/virtualization vs root/virtualization/v2 For users who wish to use libvirt to manage Hyper-V 2008, using an older version of libvirt <= 1.4.2 should work. Since new Hyper-V 2008 drivers wont be contributed to libvirt anyway, so it is not like the users will be missing on features. And it is more likely that all future contributions to libvirt will be on Hyper-V 2012 R2 and beyond. diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index aed9307..0253496 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -893,8 +893,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (VIR_STRDUP(def->name, computerSystem->data->ElementName) < 0) goto cleanup; - if (VIR_STRDUP(def->description, virtualSystemSettingData->data->Notes) < 0) - goto cleanup; + // No need to check length of Notes, it is now a dynamic array def->mem.max_balloon = memorySettingData->data->Limit * 1024; /* megabyte to kilobyte */ def->mem.cur_balloon = memorySettingData->data->VirtualQuantity * 1024; /* megabyte to kilobyte */ diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 6e6f629..4c9ad34 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -39,7 +39,7 @@ "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/*" #define ROOT_VIRTUALIZATION \ - "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/*" + "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/v2/*" #define VIR_FROM_THIS VIR_FROM_HYPERV diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index 97f9dff..bb0e8c1 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -20,6 +20,9 @@ # # Based on MSDN Hyper-V WMI Classes: # http://msdn.microsoft.com/en-us/library/cc136986%28v=vs.85%29.aspx +# Hyper-V 2012 version (root/virtualization/v2 namespace): http://msdn.microsoft.com/en-us/library/hh850257(v=vs.85).aspx +# + Currently, Classes {Msvm_MemorySettingData, Msvm_ProcessorSettingData, Msvm_VirtualSystemSettingData} are in v2 namespace +# + Will eventually need to upgrade the remainder of the classes as well. # @@ -97,80 +100,90 @@ end class Msvm_MemorySettingData - string Caption - string Description - string InstanceID - string ElementName - uint16 ResourceType - string OtherResourceType - string ResourceSubType - string PoolID - uint16 ConsumerVisibility - string HostResource[] - string AllocationUnits - uint64 VirtualQuantity - uint64 Reservation - uint64 Limit - uint32 Weight - boolean AutomaticAllocation - boolean AutomaticDeallocation - string Parent - string Connection[] - string Address - uint16 MappingBehavior - boolean IsVirtualized - string DeviceID - string DeviceIDFormat - boolean DynamicMemoryEnabled -# uint32 TargetMemoryBuffer # Available only on Windows Server 2008 R2 SP1 + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + boolean DynamicMemoryEnabled + uint32 TargetMemoryBuffer + boolean IsVirtualized + boolean SwapFilesInUse + uint64 MaxMemoryBlocksPerNumaNode end class Msvm_ProcessorSettingData - string Caption - string Description - string InstanceID - string ElementName - uint16 ResourceType - string OtherResourceType - string ResourceSubType - string PoolID - uint16 ConsumerVisibility - string HostResource[] - string AllocationUnits - uint64 VirtualQuantity - uint64 Reservation - uint64 Limit - uint32 Weight - boolean AutomaticAllocation - boolean AutomaticDeallocation - string Parent - string Connection[] - string Address - uint16 MappingBehavior - boolean IsVirtualized - string DeviceID - string DeviceIDFormat - uint16 ProcessorsPerSocket - uint16 SocketCount - boolean ThreadsEnabled - boolean LimitCPUID - boolean LimitProcessorFeatures + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + boolean LimitCPUID + boolean LimitProcessorFeatures + uint64 MaxProcessorsPerNumaNode + uint64 MaxNumaNodesPerSocket end class Msvm_VirtualSystemSettingData + string InstanceID string Caption string Description string ElementName - string InstanceID - string SystemName - uint16 SettingType - uint16 VirtualSystemType - string OtherVirtualSystemType - boolean AutoActivate + string VirtualSystemIdentifier + string VirtualSystemType + string Notes[] datetime CreationTime - string Notes + string ConfigurationID + string ConfigurationDataRoot + string ConfigurationFile + string SnapshotDataRoot + string SuspendDataRoot + string SwapFileDataRoot + string LogDataRoot + uint16 AutomaticStartupAction + datetime AutomaticStartupActionDelay + uint16 AutomaticStartupActionSequenceNumber + uint16 AutomaticShutdownAction + uint16 AutomaticRecoveryAction + string RecoveryFile string BIOSGUID string BIOSSerialNumber string BaseBoardSerialNumber @@ -179,8 +192,22 @@ class Msvm_VirtualSystemSettingData boolean BIOSNumLock uint16 BootOrder[] string Parent - uint16 NumaNodeList[] - boolean NumaNodesAreRequired + boolean IsSaved + string AdditionalRecoveryInformation + boolean AllowFullSCSICommandSet + uint32 DebugChannelId + uint16 DebugPortEnabled + uint32 DebugPort + string Version + boolean IncrementalBackupEnabled + boolean VirtualNumaEnabled + boolean AllowReducedFcRedundancy + string VirtualSystemSubType + string BootSourceOrder[] + boolean PauseAfterBootFailure + uint16 NetworkBootPreferredProtocol + boolean SecureBootEnabled + uint64 LowMmioGapSize end diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index f767d54..af3ce7e 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -71,7 +71,7 @@ class Class: if self.name.startswith("Win32_"): header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/%s\"\n" % self.name else: - header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/%s\"\n" % self.name + header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/v2/%s\"\n" % self.name header += "\n" header += "#define %s_CLASSNAME \\\n" % name_upper

1 0

[libvirt] [PATCH 0/3] Minor chardev fixes
by Ján Tomko 15 May '14

15 May '14

Ján Tomko (3): Remove chardev port calculation from DomainDefParse Move console target port setting to DeviceDefPostParse Create a console stub for the first serial device src/conf/domain_conf.c | 77 ++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 47 deletions(-) -- 1.8.3.2

1 3

[libvirt] [PATCHv4 0/3] Time setting and getting in qemu guests
by Michal Privoznik 15 May '14

15 May '14

Hopefully the last round. diff to v3: -rebase & resend Michal Privoznik (3): Introduce virDomain{Get,Set}Time APIs virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 37 ++++++++++++ include/libvirt/libvirt.h.in | 14 +++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 7 ++- src/driver.h | 14 +++++ src/libvirt.c | 94 ++++++++++++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_agent.c | 99 ++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 8 +++ src/qemu/qemu_driver.c | 109 +++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 35 ++++++++++++ src/remote/remote_protocol.x | 31 +++++++++- src/remote_protocol-structs | 16 ++++++ tools/virsh-domain-monitor.c | 132 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 ++++++ 15 files changed, 613 insertions(+), 3 deletions(-) -- 1.9.0

2 10

[libvirt] [PATCH] qemu: Avoid leak in qemuDomainCheckRemoveOptionalDisk
by Jiri Denemark 15 May '14

15 May '14

Coverity complains about event being leaked in qemuDomainCheckRemoveOptionalDisk. The best fix for it is to avoid searching for the disk (using its srouce path even) we got by walking through vm->def->disks array. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7a0be12..78cfdc6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2176,11 +2176,11 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver, static int qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr disk) + size_t diskIndex) { char uuid[VIR_UUID_STRING_BUFLEN]; virObjectEventPtr event = NULL; - virDomainDiskDefPtr del_disk = NULL; + virDomainDiskDefPtr disk = vm->def->disks[diskIndex]; const char *src = virDomainDiskGetSource(disk); virUUIDFormat(vm->def->uuid, uuid); @@ -2200,13 +2200,8 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver, event = virDomainEventDiskChangeNewFromObj(vm, src, NULL, disk->info.alias, VIR_DOMAIN_EVENT_DISK_DROP_MISSING_ON_START); - - if (!(del_disk = virDomainDiskRemoveByName(vm->def, src))) { - virReportError(VIR_ERR_INVALID_ARG, - _("no source device %s"), src); - return -1; - } - virDomainDiskDefFree(del_disk); + virDomainDiskRemove(vm->def, diskIndex); + virDomainDiskDefFree(disk); } if (event) @@ -2218,11 +2213,11 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver, static int qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr disk, + size_t diskIndex, bool cold_boot) { char uuid[VIR_UUID_STRING_BUFLEN]; - int startupPolicy = disk->startupPolicy; + int startupPolicy = vm->def->disks[diskIndex]->startupPolicy; virUUIDFormat(vm->def->uuid, uuid); @@ -2244,7 +2239,7 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, break; } - if (qemuDomainCheckRemoveOptionalDisk(driver, vm, disk) < 0) + if (qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex) < 0) goto error; return 0; @@ -2282,11 +2277,11 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, { int ret = -1; size_t i; - virDomainDiskDefPtr disk; VIR_DEBUG("Checking for disk presence"); for (i = vm->def->ndisks; i > 0; i--) { - disk = vm->def->disks[i - 1]; + size_t idx = i - 1; + virDomainDiskDefPtr disk = vm->def->disks[idx]; const char *path = virDomainDiskGetSource(disk); virStorageFileFormat format = virDomainDiskGetFormat(disk); virStorageType type = virStorageSourceGetActualType(&disk->src); @@ -2308,7 +2303,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, continue; if (disk->startupPolicy && - qemuDomainCheckDiskStartupPolicy(driver, vm, disk, + qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= 0) { virResetLastError(); continue; -- 1.9.3

5 5

[libvirt] [PATCH] virsh: For virsh migrate --tunnelled, use the virDomainMigrateToURI3 API.
by Richard W.M. Jones 15 May '14

15 May '14

Using virsh migrate + the --tunnelled flag causes virsh to use the wrong API. This gives the error: error: use virDomainMigrateToURI3 for peer-to-peer migration As the error message is wrong, this patch also corrects the error message. https://bugzilla.redhat.com/show_bug.cgi?id=1095924 Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt.c | 2 +- tools/virsh-domain.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2cd793c..6a361f6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5726,7 +5726,7 @@ virDomainMigrate3(virDomainPtr domain, if (flags & (VIR_MIGRATE_PEER2PEER | VIR_MIGRATE_TUNNELLED)) { virReportInvalidArg(flags, "%s", _("use virDomainMigrateToURI3 for peer-to-peer " - "migration")); + "or tunnelled migration")); goto error; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a7c260..5a5ce9d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8959,6 +8959,7 @@ doMigrate(void *opaque) flags |= VIR_MIGRATE_ABORT_ON_ERROR; if ((flags & VIR_MIGRATE_PEER2PEER) || + (flags & VIR_MIGRATE_TUNNELLED) || vshCommandOptBool(cmd, "direct")) { /* migrateuri doesn't make sense for tunnelled migration */ -- 1.9.0

2 2

[libvirt] [PATCH 0/3] security_dac: trivial cleanups
by Jim Fehlig 14 May '14

14 May '14

A while back, Michal Privoznik posted a small series to honor the DAC norelabel attribute https://www.redhat.com/archives/libvir-list/2014-April/msg00196.html When reviewing patch 1, Jan Tomko noted that trivial whitespace changes and the like should be separate from changes to the callback parameter passing. This small series contains the most trivial changes Michal made to patch 1. By "most trivial", I mean these could probably be pushed under the trivail rule, but posting for a quick review nonetheless. Jim Fehlig (3): security_dac: Remove unnecessary ATTRIBUTE_UNUSED security_dac: Remove unnecessary curly braces security_dac: Fix indentation src/security/security_dac.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- 1.8.1.4

2 6

[libvirt] [PATCH] virsh: Return false if only '--wipe-storage' is assigned when undefine a domain
by Li Yang 14 May '14

14 May '14

For now, if only '--wipe-storage' is assigned, user can undefine a domain normally. But actually '--wipe-storage' doesn't work, this may confuse user. And since '--wipe-storage' wipes data on the removed volumes, if no removed volume storage assigned, we'd better raise an error message. Before: $ virsh undefine virt-tests-vm1 --wipe-storage Domain virt-tests-vm1 has been undefined After: $ virsh undefine virt-tests-vm1 --wipe-storage error: '--wipe-storage' needs storage volume deletion: '--stroage <string>' or '--remove-all-storage' is necessary. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a7c260..25236a0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2982,6 +2982,14 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) ignore_value(vshCommandOptString(cmd, "storage", &vol_string)); + if (!(vol_string || remove_all_storage) && wipe_storage) { + vshError(ctl, + _("'--wipe-storage' needs storage volume deletion: " + "'--stroage <string>' or '--remove-all-storage' " + "is necessary.")); + return false; + } + if (managed_save) { flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; managed_save_safe = true; -- 1.7.1

2 1

[libvirt] [PATCH 1/4] conf: use typedefs for enums in "src/conf/{node_device_conf, nwfilter_params}.h"
by Julio Faracco 14 May '14

14 May '14

In "src/conf/" there are many enumeration (enum) declarations. Similar to the recent cleanup to "src/util" directory, it's better to use a typedef for variable types, function types and other usages. Other enumeration and folders will be changed to typedef's in the future. Most of the files changed in this commit are reltaed to Network (node_device_conf.h and nwfilter_params.*) enums. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/node_device_conf.h | 24 ++++++++++++------------ src/conf/nwfilter_params.c | 2 +- src/conf/nwfilter_params.h | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 9b5d172..50e6805 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -35,7 +35,7 @@ # define CREATE_DEVICE 1 # define EXISTING_DEVICE 0 -enum virNodeDevCapType { +typedef enum { /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */ VIR_NODE_DEV_CAP_SYSTEM, /* System capability */ VIR_NODE_DEV_CAP_PCI_DEV, /* PCI device */ @@ -51,38 +51,38 @@ enum virNodeDevCapType { VIR_NODE_DEV_CAP_SCSI_GENERIC, /* SCSI generic device */ VIR_NODE_DEV_CAP_LAST -}; +} virNodeDevCapType; -enum virNodeDevNetCapType { +typedef enum { /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */ VIR_NODE_DEV_CAP_NET_80203, /* 802.03 network device */ VIR_NODE_DEV_CAP_NET_80211, /* 802.11 network device */ VIR_NODE_DEV_CAP_NET_LAST -}; +} virNodeDevNetCapType; VIR_ENUM_DECL(virNodeDevCap) VIR_ENUM_DECL(virNodeDevNetCap) -enum virNodeDevStorageCapFlags { +typedef enum { VIR_NODE_DEV_CAP_STORAGE_REMOVABLE = (1 << 0), VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE = (1 << 1), VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE = (1 << 2), -}; +} virNodeDevStorageCapFlags; -enum virNodeDevSCSIHostCapFlags { +typedef enum { VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST = (1 << 0), VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS = (1 << 1), -}; +} virNodeDevSCSIHostCapFlags; -enum virNodeDevPCICapFlags { +typedef enum { VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION = (1 << 0), VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION = (1 << 1), -}; +} virNodeDevPCICapFlags; typedef struct _virNodeDevCapsDef virNodeDevCapsDef; typedef virNodeDevCapsDef *virNodeDevCapsDefPtr; struct _virNodeDevCapsDef { - enum virNodeDevCapType type; + virNodeDevCapType type; union _virNodeDevCapData { struct { char *product_name; @@ -135,7 +135,7 @@ struct _virNodeDevCapsDef { char *address; unsigned int address_len; char *ifname; - enum virNodeDevNetCapType subtype; /* LAST -> no subtype */ + virNodeDevNetCapType subtype; /* LAST -> no subtype */ } net; struct { unsigned int host; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index ac4d4a8..a12e645 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -1061,7 +1061,7 @@ virNWFilterVarAccessGetVarName(const virNWFilterVarAccess *vap) return vap->varName; } -enum virNWFilterVarAccessType +virNWFilterVarAccessType virNWFilterVarAccessGetType(const virNWFilterVarAccess *vap) { return vap->accessType; diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 08e448f..98610a7 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -27,17 +27,17 @@ # include "virbuffer.h" # include "virmacaddr.h" -enum virNWFilterVarValueType { +typedef enum { NWFILTER_VALUE_TYPE_SIMPLE, NWFILTER_VALUE_TYPE_ARRAY, NWFILTER_VALUE_TYPE_LAST -}; +} virNWFilterVarValueType; typedef struct _virNWFilterVarValue virNWFilterVarValue; typedef virNWFilterVarValue *virNWFilterVarValuePtr; struct _virNWFilterVarValue { - enum virNWFilterVarValueType valType; + virNWFilterVarValueType valType; union { struct { char *value; @@ -98,17 +98,17 @@ bool virNWFilterHashTableEqual(virNWFilterHashTablePtr a, # define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" # define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" -enum virNWFilterVarAccessType { +typedef enum { VIR_NWFILTER_VAR_ACCESS_ELEMENT = 0, VIR_NWFILTER_VAR_ACCESS_ITERATOR = 1, VIR_NWFILTER_VAR_ACCESS_LAST, -}; +} virNWFilterVarAccessType; typedef struct _virNWFilterVarAccess virNWFilterVarAccess; typedef virNWFilterVarAccess *virNWFilterVarAccessPtr; struct _virNWFilterVarAccess { - enum virNWFilterVarAccessType accessType; + virNWFilterVarAccessType accessType; union { struct { unsigned int index; @@ -128,7 +128,7 @@ virNWFilterVarAccessPtr virNWFilterVarAccessParse(const char *varAccess); void virNWFilterVarAccessPrint(virNWFilterVarAccessPtr vap, virBufferPtr buf); const char *virNWFilterVarAccessGetVarName(const virNWFilterVarAccess *vap); -enum virNWFilterVarAccessType virNWFilterVarAccessGetType( +virNWFilterVarAccessType virNWFilterVarAccessGetType( const virNWFilterVarAccess *vap); unsigned int virNWFilterVarAccessGetIterId(const virNWFilterVarAccess *vap); unsigned int virNWFilterVarAccessGetIndex(const virNWFilterVarAccess *vap); -- 1.7.10.4

4 12

[libvirt] submitted patch, don't see in pending.
by vikhyath reddy 14 May '14

14 May '14

Hi all, I had a question regarding submitting patches for libvirt. I submitted a hyperv patch about two weeks back using the tips mentioned in http://libvirt.org/hacking.html#patches using git send-email But I dont see the patch in the pending list at http://libvirt.org/pending.html (Is there something I missed or something failed to work as expected) OR (is the pending list not real time)? Thanks guys for all your help! Vik.

2 2

[libvirt] [PATCH 0/3] qemu: Ignore temporary job errors when checking migration status
by Jiri Denemark 14 May '14

14 May '14

https://bugzilla.redhat.com/show_bug.cgi?id=1083238 Jiri Denemark (3): qemu: Make qemuDomainObjBeginNestedJob static qemuDomainObjBeginNestedJob: Return -2 for temporary failures qemu: Ignore temporary job errors when checking migration status src/qemu/qemu_domain.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_domain.h | 4 ---- src/qemu/qemu_migration.c | 7 ++++--- 3 files changed, 31 insertions(+), 21 deletions(-) -- 1.9.3

2 10

[libvirt] [PATCH] Don't log an internal error when the guest hasn't updated balloon stats
by Ján Tomko 14 May '14

14 May '14

If virDomainMemoryStats is called too soon after domain startup, QEMU returns: "error":{"class":"GenericError","desc":"guest hasn't updated any stats yet"} when we try to query balloon stats. Check for this reply and log it as OPERATION_INVALID instead of INTERNAL_ERROR. This means the daemon only logs it at the debug level, without polluting system logs. Reported by Laszlo Pal: https://www.redhat.com/archives/libvirt-users/2014-May/msg00023.html --- src/qemu/qemu_monitor_json.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f8ab975..88f6b6c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1460,26 +1460,38 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; if (!(cmd = qemuMonitorJSONMakeCommand("qom-get", "s:path", balloonpath, "s:property", "guest-stats", NULL))) goto cleanup; ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (ret == 0) - ret = qemuMonitorJSONCheckError(cmd, reply); - if (ret < 0) goto cleanup; + if ((data = virJSONValueObjectGet(reply, "error"))) { + const char *klass = virJSONValueObjectGetString(data, "class"); + const char *desc = virJSONValueObjectGetString(data, "desc"); + + if (STREQ_NULLABLE(klass, "GenericError") && + STREQ_NULLABLE(desc, "guest hasn't updated any stats yet")) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("the guest hasn't updated any stats yet")); + ret = -1; + goto cleanup; + } + } + + ret = qemuMonitorJSONCheckError(cmd, reply); + if (!(data = virJSONValueObjectGet(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-get reply was missing return data")); goto cleanup; } if (!(statsdata = virJSONValueObjectGet(data, "stats"))) { VIR_DEBUG("data does not include 'stats'"); goto cleanup; } -- 1.8.3.2

2 1

[libvirt] [PATCH] Prevent guest be paused when do external system checkpoint snapshot
by Shanzhi Yu 14 May '14

14 May '14

https://bugzilla.redhat.com/show_bug.cgi?id=1097503 Guest will be paused when do external system checkpoint snapshot with invalid compression format. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5c7f4f..0761760 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13207,13 +13207,13 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Invalid snapshot image format specified " "in configuration file")); - goto cleanup; + goto endjob; } if (!qemuCompressProgramAvailable(compressed)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); - goto cleanup; + goto endjob; } } -- 1.8.3.1

2 1

[libvirt] [PATCH] network: Defer online of macvtap during qemu migration
by Matthew Rosato 14 May '14

14 May '14

When generating macvtaps via virNetDevMacVLanCreateWithVPortProfile, the macvtap device is unconditionally set to the up state. However, during migration, this results in a case where both the source and target system are simultaneously up with the same MAC address. This patch defers bringing the target macvtap up until later in the migration to shrink this window. Signed-off-by: Matthew Rosato <mjrosato(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 18 ++++++++++++++++++ src/util/virnetdevmacvlan.c | 11 ++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a9f7fea..aee803a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -56,6 +56,7 @@ #include "virhook.h" #include "virstring.h" #include "virtypedparam.h" +#include "virnetdev.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -4468,6 +4469,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; unsigned short port; + virDomainNetDefPtr net; + size_t i; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -4574,6 +4577,21 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { + /* Macvtaps were previously left offline, bring them online now */ + for (i = 0; i < vm->def->nnets; i++) { + net = vm->def->nets[i]; + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevVPortProfileDisassociate(net->ifname, + virDomainNetGetActualVirtPortProfile(net), + &net->mac, + virDomainNetGetActualDirectDev(net), + -1, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); + ignore_value(virNetDevMacVLanDelete(net->ifname)); + } + } + } /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 7bbf540..3da845b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -898,9 +898,14 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, goto link_del_exit; } - if (virNetDevSetOnline(cr_ifname, true) < 0) { - rc = -1; - goto disassociate_exit; + /* If this device is being created as part of an inbound + * migration, leave the device offline for now. + */ + if (vmOp != VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START) { + if (virNetDevSetOnline(cr_ifname, true) < 0) { + rc = -1; + goto disassociate_exit; + } } if (withTap) { -- 1.7.9.5

3 5

[libvirt] [PATCH] qemu: snapshot: Terminate job when memory compression program isn't found
by Peter Krempa 14 May '14

14 May '14

If the compression program for external snapshot memory image isn't found we exitted the function without terminating the domain job. This caused the domain to be unusable. The problem was introduced in commit 7df5093f. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1097503 --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5c7f4f..52ca47c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13207,13 +13207,14 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Invalid snapshot image format specified " "in configuration file")); - goto cleanup; + goto endjob; } + if (!qemuCompressProgramAvailable(compressed)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); - goto cleanup; + goto endjob; } } -- 1.9.2

2 2

[libvirt] daemon-config-network dependency
by Cedric Bosdonnat 13 May '14

13 May '14

Hi all, The libvirt-daemon-config-network package is only pulled by libvirt. So a user installing only libvirt-daemon-lxc (qemu, xen, etc) won't get that package... and no default network. Would it be OK if I move the dependency to libvirt-daemon-{lxc,qemu,xen,...} packages? -- Cedric

2 2

Re: [libvirt] [Qemu-devel] qemu leaving unix sockets behind after VM is shut down
by Stefan Hajnoczi 13 May '14

13 May '14

On Tue, Apr 01, 2014 at 02:34:58PM -0600, Chris Friesen wrote: > When running qemu with something like this > > -device virtio-serial \ > -chardev socket,path=/tmp/foo,server,nowait,id=foo \ > -device virtserialport,chardev=foo,name=host.port.0 > > the VM starts up as expected and creates a socket at /tmp/foo as expected. > > However, when I shut down the VM the socket at /tmp/foo is left > behind in the filesystem. Basically qemu has "leaked" a file. > > With something like OpenStack where we could be creating/destroying > many VMs this could end up creating a significant number of files in > the specified directory. > > Has any thought been given to either automatically cleaning up the > unix socket in the filesystem when qemu exits, or else supporting > the abstract namespace for unix sockets to allow for automatic > cleanup? Libvirt has a special case for the monitor socket in its qemuProcessStop() function. Are you using the OpenStack libvirt driver? Perhaps QEMU should support cleanup but first I think we should check the situation with libvirt. Stefan

5 4

[libvirt] [libvirt-python PATCH] override: add virDomainFSFreeze and virDomainFSThaw API
by Tomoki Sekiyama 13 May '14

13 May '14

Add binding for the new virDomainFSFreeze and virDomainFSThaw functions added in libvirt 1.2.5. These require override since these take a list of mountpoints path string. The methods are named 'fSFreeze' and 'fSThaw', like a existing 'fSTrim' method. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> --- generator.py | 2 + libvirt-override-api.xml | 14 +++++++ libvirt-override.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+) diff --git a/generator.py b/generator.py index 05ec743..eec81b0 100755 --- a/generator.py +++ b/generator.py @@ -462,6 +462,8 @@ skip_impl = ( 'virDomainMigrate3', 'virDomainMigrateToURI3', 'virConnectGetCPUModelNames', + 'virDomainFSFreeze', + 'virDomainFSThaw', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index d5b25b5..a3db33e 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -624,5 +624,19 @@ <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> <arg name='flags' type='int' info='unused, pass 0'/> </function> + <function name='virDomainFSFreeze' file='python'> + <info>Freeze specified filesystems within the guest</info> + <return type='int' info='the number of frozen filesystems on success, -1 otherwise.'/> + <arg name='dom' type='virDomainPtr' info='a domain object'/> + <arg name='mountpoints' type='const char **' info='list of mount points to be frozen, or None'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + </function> + <function name='virDomainFSThaw' file='python'> + <info>Thaw specified filesystems within the guest</info> + <return type='int' info='the number of thawed filesystems on success, -1 otherwise.'/> + <arg name='dom' type='virDomainPtr' info='a domain object'/> + <arg name='mountpoints' type='const char **' info='list of mount points to be thawed, or None'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 3fa9b9b..d0557c2 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7554,6 +7554,99 @@ cleanup: #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) +static PyObject * +libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + const char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSFreeze", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + (char **)mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSFreeze(domain, mountpoints, nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap((int) c_retval); + +cleanup: + if (mountpoints) { + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + } + return py_retval; +} + + +static PyObject * +libvirt_virDomainFSThaw(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + const char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSThaw", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + (char **)mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSThaw(domain, mountpoints, nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap((int) c_retval); + +cleanup: + if (mountpoints) { + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + } + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ + /************************************************************************ * * * The registration stuff * @@ -7729,6 +7822,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainCreateXMLWithFiles", libvirt_virDomainCreateXMLWithFiles, METH_VARARGS, NULL}, {(char *) "virDomainCreateWithFiles", libvirt_virDomainCreateWithFiles, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) + {(char *) "virDomainFSFreeze", libvirt_virDomainFSFreeze, METH_VARARGS, NULL}, + {(char *) "virDomainFSThaw", libvirt_virDomainFSThaw, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ {NULL, NULL, 0, NULL} };

4 5

[libvirt] [Question] (python API) setMemoryParameters doesn't support flags CONFIG | LIVE
by Wangrui (K) 13 May '14

13 May '14

Hi, all when I use (python API) setMemoryParameters with flags= VIR_DOMAIN_AFFECT_CONFIG|VIR_DOMAIN_AFFECT_LIVE , an error occurs as follow: (libvirt 1.2.4) libvirt: error : flags 'affect live' and 'affect config' in virDomainGetMemoryParameters are mutually exclusive I check the function libvirt_virDomainSetMemoryParameters in libvirt-override.c and find the code below: Line 1204-1206: LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetMemoryParameters(domain, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; Line 1220-1222: LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetMemoryParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; Function virDomainGetMemoryParameters doesn't support flags VIR_DOMAIN_AFFECT_CONFIG|VIR_DOMAIN_AFFECT_LIVE. So the error above occurs. The first call of virDomainGetMemoryParameters is to "cause @nparams on output to contain the number of parameters supported by the hypervisor". And what's the role of the second call? Maybe, so do other functions such as *libvirt_virDomainSetSchedulerParameters, *libvirt_virDomainSetBlkioParameters In commit 56cec18d761a1f99862c43811de60380c65881e6. IMHO, an example flag (such as VIR_DOMAIN_AFFECT_CONFIG) can be used in virDomainGetMemoryParameters just to get something from hypervisor rather than @flags which is a parameter of setMemoryParameters .

1 0

[libvirt] [PATCH] Improve the error info when fail to start guest due to lack of cgroup controller
by Shanzhi Yu 13 May '14

13 May '14

When cgroup controller cpu, cpuset and cpuacct are all unmounted, fail to start guest. The error info is not accurate. It will report "At least one cgroup controller is required" even though there is cgroup controller memory or blkio. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/util/vircgroup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index fce380a..c609eb3 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -586,6 +586,11 @@ virCgroupDetect(virCgroupPtr group, if (!group->controllers[i].mountPoint) { VIR_DEBUG("Requested controller '%s' not mounted, ignoring", virCgroupControllerTypeToString(i)); + if ( i==2 ) { + virReportSystemError(ENXIO, "%s", + _("At least one cgroup controller cpu or cpuacct or cpuset is required")); + return -1; + } controllers &= ~(1 << i); } } else { -- 1.8.3.1

1 0

[libvirt] [PATCH] sanlock: avoid leak in acquire()
by Martin Kletzander 13 May '14

13 May '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index b3d31bf..e4b4e8e 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -907,9 +907,6 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, return -1; } - if (VIR_ALLOC(opt) < 0) - return -1; - /* We only initialize 'sock' if we are in the real * child process and we need it to be inherited * @@ -944,6 +941,9 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, return 0; } + if (VIR_ALLOC(opt) < 0) + return -1; + /* sanlock doesn't use owner_name for anything, so it's safe to take just * the first SANLK_NAME_LEN - 1 characters from vm_name */ ignore_value(virStrncpy(opt->owner_name, priv->vm_name, -- 1.9.3

2 2

[libvirt] [PATCH 1/2] sanlock: code movement in virLockManagerSanlockAcquire
by Martin Kletzander 13 May '14

13 May '14

Just move some code around for future patches to ease the review. With this patch there is no need for drastic cleanup path later. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7e4258d..01441a0 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -896,31 +896,6 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if (VIR_ALLOC(opt) < 0) return -1; - /* sanlock doesn't use owner_name for anything, so it's safe to take just - * the first SANLK_NAME_LEN - 1 characters from vm_name */ - ignore_value(virStrncpy(opt->owner_name, priv->vm_name, - SANLK_NAME_LEN - 1, SANLK_NAME_LEN)); - - if (state && STRNEQ(state, "")) { - if ((rv = sanlock_state_to_args((char *)state, - &res_count, - &res_args)) < 0) { - if (rv <= -200) - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse lock state %s: error %d"), - state, rv); - else - virReportSystemError(-rv, - _("Unable to parse lock state %s"), - state); - goto error; - } - res_free = true; - } else { - res_args = priv->res_args; - res_count = priv->res_count; - } - /* We only initialize 'sock' if we are in the real * child process and we need it to be inherited * @@ -949,6 +924,31 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, } } + /* sanlock doesn't use owner_name for anything, so it's safe to take just + * the first SANLK_NAME_LEN - 1 characters from vm_name */ + ignore_value(virStrncpy(opt->owner_name, priv->vm_name, + SANLK_NAME_LEN - 1, SANLK_NAME_LEN)); + + if (state && STRNEQ(state, "")) { + if ((rv = sanlock_state_to_args((char *)state, + &res_count, + &res_args)) < 0) { + if (rv <= -200) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse lock state %s: error %d"), + state, rv); + else + virReportSystemError(-rv, + _("Unable to parse lock state %s"), + state); + goto error; + } + res_free = true; + } else { + res_args = priv->res_args; + res_count = priv->res_count; + } + if (!(flags & VIR_LOCK_MANAGER_ACQUIRE_REGISTER_ONLY)) { VIR_DEBUG("Acquiring object %u", priv->res_count); if ((rv = sanlock_acquire(sock, priv->vm_pid, 0, -- 1.9.2

3 5