- Devel - libvirt List Archives

[libvirt] [PATCH] conf: fix cannot start a guest have a shareable network iscsi hostdev
by Luyao Huang 17 Dec '14

17 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1174569 We should do nothing for the shareable network iscsi hostdev in qemuAddSharedHostdev and qemuRemoveSharedHostdev. Shareable for a network iscsi hostdev is not valid, so just ignore it. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 8d3818e..9539231 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1158,7 +1158,8 @@ qemuAddSharedHostdev(virQEMUDriverPtr driver, if (!hostdev->shareable || !(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI)) + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + hostdev->source.subsys.u.scsi.protocol != VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)) return 0; if (!(key = qemuGetSharedHostdevKey(hostdev))) @@ -1261,7 +1262,8 @@ qemuRemoveSharedHostdev(virQEMUDriverPtr driver, if (!hostdev->shareable || !(hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI)) + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + hostdev->source.subsys.u.scsi.protocol != VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)) return 0; if (!(key = qemuGetSharedHostdevKey(hostdev))) -- 1.8.3.1

3 4

[libvirt] [PATCHv2] logical: Add "--type snapshot" to lvcreate command
by John Ferlan 17 Dec '14

17 Dec '14

A recent lvm change has resulted in a change for the "default" type of logical volume created when the "--virtualsize" or "--V" is supplied on the command line (e.g. when the allocation and capacity values of a to be created volume differ). It seems that at the very least the following change adjusts the default type: https://git.fedorahosted.org/cgit/lvm2.git/commit/?id=e0164f21 and the following may also have some impact. https://git.fedorahosted.org/cgit/lvm2.git/commit/?id=87fc3b71 When using the virsh vol-create-as or vol-create xmlfile commands, the result is that libvirt will now create a "thin logical volume" and a "thin logical volume pool" rather than just a "thin snapshot logical volume". For example the following sequence: # lvcreate --name test -L 2M -V 5M lvm_test Rounding up size to full physical extent 4.00 MiB Rounding up size to full physical extent 8.00 MiB Logical volume "test" created. # lvs lvm_test LV VG Attr LSize Pool Origin Data% Meta% Move Log Cpy%Sync Convert lvol1 lvm_test twi-a-tz-- 4.00m 0.00 0.98 test lvm_test Vwi-a-tz-- 8.00m lvol1 0.00 compared to the former code which had the following: LV VG Attr LSize Pool Origin Data% Move Log Cpy%Sync Convert test LVM_Test swi-a-s--- 4.00m [test_vorigin] 0.00 Since libvirt doesn't know how to parse the thin logical volume and pool, it will fail to find the newly created volume and pool even though it exists in the volume group. It cannot find since the command used to find/parse returns a thin volume 'test' with no associated device, for example the output is: lvol1##UgUwkp-fTFP-C0rc-ufue-xrYh-dkPr-FGPFPx#lvol1_tdata(0)#thin-pool#1#4194304#4194304#4194304#twi-a-tz-- test##NcaIoH-4YWJ-QKu3-sJc3-EOcS-goff-cThLIL##thin#0#8388608#4194304#8388608#Vwi-a-tz-- as compared to the former which had the following: test#[test_vorigin]#Dt5Of3-4WE6-buvw-CWJ4-XOiz-ywOU-YULYw6#/dev/sda3(1300)#linear#1#4194304#4194304#4194304#swi-a-s--- While it's possible to generate code to handle the new thin lv and pool, this patch will add a "--type snapshot" onto the lvcreate command libvirt uses in order to "for now" be able to continue to utilize the thin snapshots Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: http://www.redhat.com/archives/libvir-list/2014-December/msg00705.html The first version replaces thin snapshots with thin volumes and pools. Although it got an ACK, Jan Tomko points out rightfully so that perhaps we need more time to vet a change such as this - since it could be considered a few feature. So since using --type snapshot restores former functionality that should suffice until we can make sure we understand more about the differences between thin snapshots and thin volumes. src/storage/storage_backend_logical.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4959985..8aa68a6 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -758,6 +758,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->target.allocation ? vol->target.allocation : 1, 1024)); + virCommandAddArgList(cmd, "--type", "snapshot", NULL); virCommandAddArg(cmd, "--virtualsize"); vol->target.sparse = true; } -- 1.9.3

2 1

[libvirt] [PATCH] conf: move the check for secondary consoles of targetType serial
by Erik Skultety 17 Dec '14

17 Dec '14

For historical reasons, only the first <console> element might be of targetType serial, but we checked for other consoles of targetType serial in our post-parse callback if and only if we knew the first console was serial, otherwise the check was skipped. This patch moves the check one level up, so first the check for secondary console of type serial is performed and then the rest of operations continue unchanged. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1170092 --- src/conf/domain_conf.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ec45b8c..dc0b167 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3023,19 +3023,22 @@ virDomainDefPostParseInternal(virDomainDefPtr def, * We then fill def->consoles[0] with a stub just so we get sequencing * correct for consoles > 0 */ + + /* Only the first console (if there are any) can be of type serial, + * verify that no other console is of type serial + */ + for (i = 1; i < def->nconsoles; i++) { + virDomainChrDefPtr cons = def->consoles[i]; + + if (cons->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only the first console can be a serial port")); + return -1; + } + } if (def->nconsoles > 0 && STREQ(def->os.type, "hvm") && (def->consoles[0]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL || def->consoles[0]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE)) { - /* First verify that only the first console is of type serial */ - for (i = 1; i < def->nconsoles; i++) { - virDomainChrDefPtr cons = def->consoles[i]; - - if (cons->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only the first console can be a serial port")); - return -1; - } - } /* If there isn't a corresponding serial port: * - create one and set, the console to be an alias for it -- 1.9.3

2 3

[libvirt] [PATCH] avoid using deprecated udev logging functions
by Daniel P. Berrange 17 Dec '14

17 Dec '14

In systemd >= 218, the udev_set_log_fn method has been marked deprecated and turned into a no-op. Nothing in the udev client library will print to stderr by default anymore, so we can just stop installing a logging hook for new enough udev. --- m4/virt-udev.m4 | 7 +++++++ src/node_device/node_device_udev.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 index 55673bf..0d785c4 100644 --- a/m4/virt-udev.m4 +++ b/m4/virt-udev.m4 @@ -24,6 +24,13 @@ AC_DEFUN([LIBVIRT_CHECK_UDEV],[ if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then AC_MSG_ERROR([You must install the pciaccess module to build with udev]) fi + + if test "$with_udev" = "yes" ; then + PKG_CHECK_EXISTS(libudev >= 218, [with_udev_logging=no], [with_udev_logging=yes]) + if test "$with_udev_logging" = "yes" ; then + AC_DEFINE_UNQUOTED([HAVE_UDEV_LOGGING], 1, [whether libudev logging can be used]) + fi + fi ]) AC_DEFUN([LIBVIRT_RESULT_UDEV],[ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 343ef85..1a35c07 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -340,7 +340,7 @@ static int udevGenerateDeviceName(struct udev_device *device, return ret; } - +#if HAVE_UDEV_LOGGING typedef void (*udevLogFunctionPtr)(struct udev *udev, int priority, const char *file, @@ -373,6 +373,7 @@ udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, VIR_FREE(format); } +#endif static int udevTranslatePCIIds(unsigned int vendor, @@ -1759,8 +1760,10 @@ static int nodeStateInitialize(bool privileged, * its return value. */ udev = udev_new(); +#if HAVE_UDEV_LOGGING /* cast to get rid of missing-format-attribute warning */ udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction); +#endif priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (priv->udev_monitor == NULL) { -- 2.1.0

3 4

[libvirt] [PATCH V2 0/5] support sending sysrq key
by Chunyan Liu 17 Dec '14

17 Dec '14

xend/libxl support sending sysrq key to guest kernel but not support sending any key sequence as virDomainSendKey is expected to do. To add equivalant sysrq functionality in libvirt for xen/libxl, add a new virDomainSendSysrq API and add related codes to virsh, remote driver, xen/libxl driver. Changes: * add new API virDomainSendSysrq instead of hacking virDomainSendKey. * add related changes according to new API, including libvirt API, remote protocol, virsh and libxl/xen driver. v1 is here: https://www.redhat.com/archives/libvir-list/2014-December/msg00480.html Chunyan Liu (5): Add public API virDomainSendSysrq implement remote protocol for domainSendSysrq virsh: add 'sysrq' command libxl: implement .domainSendSysrq method xen: add .domainSendSysrq method include/libvirt/libvirt-domain.h | 3 +++ src/driver-hypervisor.h | 4 +++ src/libvirt-domain.c | 38 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 23 +++++++++++++++++ src/remote/remote_driver.c | 2 +- src/remote/remote_protocol.x | 13 +++++++++- src/xen/xen_driver.c | 19 ++++++++++++++ src/xen/xend_internal.c | 20 +++++++++++++++ src/xen/xend_internal.h | 2 ++ tools/virsh-domain.c | 54 ++++++++++++++++++++++++++++++++++++++++ 11 files changed, 177 insertions(+), 2 deletions(-) -- 1.8.4.5

7 21

[libvirt] virDomainGetBlockInfo meanings
by Eric Blake 17 Dec '14

17 Dec '14

I'm really struggling with how to interpret the virDomainBlockInfo struct, and think that we may want to consider the current behavior buggy and offer improved behavior going forward. For starters, even though the stats reported by virDomainListGetStats are _supposed_ to mirror the older API of virDomainGetBlockInfo, they currently do not (the newer API reads values from qemu, the older API reads values from stat) - in order to make the two consistent, I need to share code - but in order to share code, I need to know WHICH values make the most sense. Here's the current documentation: /** virDomainBlockInfo: * * This struct provides information about the size of a block device * backing store * * Examples: * * - Fully allocated raw file in filesystem: * * capacity, allocation, physical: All the same * * - Sparse raw file in filesystem: * * capacity: logical size of the file * * allocation, physical: number of blocks allocated to file * * - qcow2 file in filesystem * * capacity: logical size from qcow2 header * * allocation, physical: logical size of the file / * highest qcow extent (identical) * * - qcow2 file in a block device * * capacity: logical size from qcow2 header * * allocation: highest qcow extent written for an active domain * * physical: size of the block device container */ typedef struct _virDomainBlockInfo virDomainBlockInfo; typedef virDomainBlockInfo *virDomainBlockInfoPtr; struct _virDomainBlockInfo { unsigned long long capacity; /* logical size in bytes of the block device backing image */ unsigned long long allocation; /* highest allocated extent in bytes of the block device backing image */ unsigned long long physical; /* physical size in bytes of the container of the backing image */ }; I interpret this to mean that 'capacity' is the size that the guest sees, that 'allocation' is how much host space is required to represent that to the guest, and 'physical' is the size of the container on the host. So there are at least two things that strike me as incorrect or confusing in that documentation. First, our usage of 'physical' in the examples _changes_ depending on whether the file is raw or a block device. I think that 'physical' should represent the size of a file that 'ls' would show, no matter what, while 'allocation' is what 'du' would show. That is, for the 'sparse raw file in filesystem', I think we want 'capacity == physical == size guest would see', and only 'allocation' would be smaller; our example of 'physical == allocation' for a sparse file sounds wrong, because 'physical' should be the size of the container (the host file) rather than the amount of host storage used. Second, when this struct was first introduced, it predated the ability of the kernel to punch holes in a file. But now qemu can do a very good job of reclaiming space in a qcow2 file by punching holes and making the file sparse. So I think that 'qcow2 file in filesystem' should allow for 'allocation < physical' - again, with the notion that 'physical' is the size of the qcow2 file in the host that 'ls' would show, and 'allocation' is the storage occupied on the host as 'du' would show. This would make things more consistent with the 'qcow2 file in a block device', where 'physical' is the size of the device (well, 'ls' doesn't show that, so you have to open/lseek the device to find it) and where 'allocation' is the amount of the device used (here, relying on qemu to tell us the highest extent written so far, since block devices don't have holes). Oh, and qemu has a limitation - it only reports highest extent written when it actually writes to an image; if a file is opened read-only (such as a backing file), qemu reports 0 as the highest extent written, even though that cannot be true (for a qcow2 file to exist, at least the first cluster must have been previously written with metadata) - so it would be nice if future qemu could be patched to determine the highest extent when opening an image, rather than on first write to the image. Also, it is annoying that qemu splits its reporting: 'capacity' is reported via 'query-block' (the "actual-size" value); this command also gives what appears to be a great 'physical' value for files (the "actual-size" parameter) although that size is always 0 for block devices; meanwhile, the highest extent written ('allocation' for block devices) is reported via 'query-blockstats' (the "wr_highest_offset" value). Can anyone give a reason why changing semantics of 'physical' and 'allocation' as mentioned above would negatively break backwards compatibility, rather than being considered a bug fix? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH] Buffer size too small when reading sysinfo on S390
by Boris Fiuczynski 17 Dec '14

17 Dec '14

On a system with 160 CPUs the /proc/cpuinfo size grows beyond the currently set limit of 10KB causing an internal error. This patch increases the buffer size for S390 to 64KB. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/util/virsysinfo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 1bb6392..613bab9 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -377,6 +377,8 @@ virSysinfoRead(void) # pragma GCC diagnostic ignored "-Wlogical-op" # endif +# define S390_CPUINFO_FILE_LEN (64*1024) /* 64KB limit for /proc/cpuinfo file */ + static char * virSysinfoParseDelimited(const char *base, const char *name, char **value, char delim1, char delim2) @@ -471,7 +473,7 @@ virSysinfoRead(void) goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, S390_CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; -- 1.9.3

3 3

[libvirt] How to use blockcopy in libvirt-java
by Star Guo 17 Dec '14

17 Dec '14

Hi, ALL, I just look for the class and method to use blockcopy in libvirt-java on this page: http://libvirt.org/sources/java/javadoc/ However, I can not find out. Libvirt-java Support blockcopy ? Thanks. Best Regards, Star Guo

2 1

[libvirt] [RFC] The Quest for Domain-IP Mapping Continues...
by Nehal J Wani 17 Dec '14

17 Dec '14

If you remember correctly, about 1.2 years ago, we had... https://www.redhat.com/archives/libvir-list/2013-September/msg00351.html In short, the patch proposed a generalized mechanism for finding out IP addresses, with flags for choosing method(s) (SNOOP|LEASE|AGENT). But since not all methods were supported (only qemu-ga worked), the API was deferred. After exploring a bit, it seems that in all, we can have: (i) Leases Method (ii) Qemu Guest Agent (iiI) DHCP Snooping (exists, but isn't publicly exposed?) (iv) ARP Snooping (we can ask the virtual network interfaces to share their arp tables with the public?) Now that we have the dhcp-leases API fully furnished, why not visit the qemu-guest-agent again? OP1. Should we have separate APIs + virsh commands for each one of these and then combine them together under virDomainInterfaceAddresses? - If each one has to be a different API and then combined later, then what should be the corresponding name for the virsh command for exposing the querying guest agent API? OP2. Implement virDomainInterfaceAddresses API with two flags, one for dhcp-leases and another for qemu-ga and keep adding others whenever they are completed? I would prefer OP1. What do you guys think? -- Nehal J Wani

3 5

[libvirt] [PATCH 0/3] Various build fixes
by Martin Kletzander 17 Dec '14

17 Dec '14

Fix some problems coverity and mingw build found out. Martin Kletzander (3): qemu: Add missing goto error in qemuRestoreCgroupState qemu: Free saved error in qemuDomainSetVcpusFlags util: Fix fallocate stubs for mingw build src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_driver.c | 1 + src/util/virfile.c | 38 +++++++++++++++++++++++++++++++------- 3 files changed, 33 insertions(+), 7 deletions(-) -- 2.2.0

2 9

[libvirt] [PATCH] conf: Fix invalid condition when parsing storage owner
by Martin Kletzander 17 Dec '14

17 Dec '14

In commit d2632d60 we agreed taht we want the parsed uid to properly overflow but only to -1, however the value was read into long and then wrapped into uid_t. That meaned it failed on 32-bit systems. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as build-breaker src/conf/storage_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index e1be064..e9aaa8a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -734,7 +734,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, int defaultmode) { char *mode; - long val; + long long val; int ret = -1; xmlNodePtr relnode; xmlNodePtr node; @@ -771,7 +771,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, if (virXPathNode("./owner", ctxt) == NULL) { perms->uid = (uid_t) -1; } else { - if (virXPathLong("number(./owner)", ctxt, &val) < 0 || + if (virXPathLongLong("number(./owner)", ctxt, &val) < 0 || ((uid_t)val != val && val != -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -785,7 +785,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, if (virXPathNode("./group", ctxt) == NULL) { perms->gid = (gid_t) -1; } else { - if (virXPathLong("number(./group)", ctxt, &val) < 0 || + if (virXPathLongLong("number(./group)", ctxt, &val) < 0 || ((gid_t) val != val && val != -1)) { virReportError(VIR_ERR_XML_ERROR, "%s", -- 2.2.0

1 0

[libvirt] [PATCH 0/2] Use correct syntax for thin/sparse pool creation
by John Ferlan 17 Dec '14

17 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1166592 More recent versions of LVM have resulted in the inability to recognize a newly created thin logical volume using libvirt. Not sure exactly which lvm release resulted in the change, but it's some time between 2.02.106 and 2.02.113 or lvm library version 1.02.85 and 1.02.92. The short story is libvirt was not really creating thin logical volumes, instead libvirt was creating thin snapshot logical volumes. More recent changes in LVM seem to now differentiate the two and the way libvirt was creating it's logical volumes "now defaulted" to the thin logical volume, which libvirt was not able to parse properly. The commit message for patch 1 has the gory details - figured it was best to keep it in the commit message rather than be lost to some cover letter. The second patch adds the ability to get the allocation and capacity for logical volumes from a volResize callback. This will be important for the thin logical volumes in order to determine the capacity which is stored in the thin logical volume pool John Ferlan (2): logical: Use correct syntax for thin/sparse pool creation logical: Introduce virStorageBackendLogicalRefreshVol src/storage/storage_backend_logical.c | 216 +++++++++++++++++++++++++++++++--- src/util/virstoragefile.h | 1 + 2 files changed, 199 insertions(+), 18 deletions(-) -- 1.9.3

4 6

[libvirt] [PATCH 0/2] Refactor safezero and virStorageFileResize
by John Ferlan 16 Dec '14

16 Dec '14

Originally included as part of a series to fix a problem with file creation and resize within NFS storage pools that ended up being an issue somewhere lower in the stack of posix_fallocate or the setting of the block size in the meta data. The following two patches extract out the refactoring of safezero and reworking virStorageFileResize to utilize safezero instead. Original series and review comments for comparison: http://www.redhat.com/archives/libvir-list/2014-August/msg00491.html I figured rather than lose any of the code and there is some value in utilizing the same code in order to handle a similar function that I'd repost as a separate series. John Ferlan (2): virfile: Refactor safezero virstoragefile: Have virStorageFileResize use safezero src/locking/lock_driver_sanlock.c | 4 +-- src/storage/storage_backend.c | 2 +- src/util/virfile.c | 63 +++++++++++++++++++++++++++++++++------ src/util/virfile.h | 2 +- src/util/virstoragefile.c | 29 ++++++------------ 5 files changed, 67 insertions(+), 33 deletions(-) -- 1.9.3

2 3

[libvirt] [PATCH v2] storage: unify permission formatting
by Martin Kletzander 16 Dec '14

16 Dec '14

Volume and pool formatting functions took different approaches to unspecified uids/gids. When unknown, it is always parsed as -1, but one of the functions formatted it as unsigned int (wrong) and one as int (better). Due to that, our two of our XML files from tests cannot be parsed on 32-bit machines. RNG schema needs to be modified as well, but because both storagepool.rng and storagevol.rng need same schema for permission element, save some space by moving it to storagecommon.rng. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - Added test case vol-gluster-dir-neg-uid that shows how 4294967295 is correctly read as '-1' even on 64bit machines docs/schemas/storagecommon.rng | 29 +++++++++++++++++++++ docs/schemas/storagepool.rng | 30 +--------------------- docs/schemas/storagevol.rng | 23 ----------------- src/conf/storage_conf.c | 9 +++---- .../vol-gluster-dir-neg-uid.xml} | 0 ...gluster-dir.xml => vol-gluster-dir-neg-uid.xml} | 4 +-- tests/storagevolxml2xmlout/vol-gluster-dir.xml | 4 +-- tests/storagevolxml2xmlout/vol-sheepdog.xml | 4 +-- tests/storagevolxml2xmltest.c | 1 + 9 files changed, 41 insertions(+), 63 deletions(-) copy tests/{storagevolxml2xmlout/vol-gluster-dir.xml => storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml} (100%) copy tests/storagevolxml2xmlout/{vol-gluster-dir.xml => vol-gluster-dir-neg-uid.xml} (83%) diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index 06b2f81..629505f 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -93,4 +93,33 @@ <notAllowed/> </define> + <define name='permissions'> + <optional> + <element name='permissions'> + <interleave> + <element name='mode'> + <ref name='octalMode'/> + </element> + <element name='owner'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <element name='group'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </interleave> + </element> + </optional> + </define> + </grammar> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 0f05c5c..db6ff49 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -3,6 +3,7 @@ <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <include href='basictypes.rng'/> + <include href='storagecommon.rng'/> <start> <ref name='pool'/> </start> @@ -224,35 +225,6 @@ </interleave> </define> - <define name='permissions'> - <optional> - <element name='permissions'> - <interleave> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <element name='group'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> - </interleave> - </element> - </optional> - </define> - <define name='target'> <element name='target'> <interleave> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 1b2d4cc..7450547 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -59,29 +59,6 @@ </interleave> </define> - <define name='permissions'> - <optional> - <element name='permissions'> - <interleave> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <ref name='unsignedInt'/> - </element> - <element name='group'> - <ref name='unsignedInt'/> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> - </interleave> - </element> - </optional> - </define> - <define name='timestamps'> <optional> <element name='timestamps'> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 3987470..e1be064 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1203,7 +1203,6 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) (int) def->target.perms.uid); virBufferAsprintf(&buf, "<group>%d</group>\n", (int) def->target.perms.gid); - virBufferEscapeString(&buf, "<label>%s</label>\n", def->target.perms.label); @@ -1527,10 +1526,10 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAsprintf(buf, "<mode>0%o</mode>\n", def->perms->mode); - virBufferAsprintf(buf, "<owner>%u</owner>\n", - (unsigned int) def->perms->uid); - virBufferAsprintf(buf, "<group>%u</group>\n", - (unsigned int) def->perms->gid); + virBufferAsprintf(buf, "<owner>%d</owner>\n", + (int) def->perms->uid); + virBufferAsprintf(buf, "<group>%d</group>\n", + (int) def->perms->gid); virBufferEscapeString(buf, "<label>%s</label>\n", diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml similarity index 100% copy from tests/storagevolxml2xmlout/vol-gluster-dir.xml copy to tests/storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml similarity index 83% copy from tests/storagevolxml2xmlout/vol-gluster-dir.xml copy to tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml index f188ceb..538b31d 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml @@ -10,8 +10,8 @@ <format type='dir'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storagevolxml2xmlout/vol-gluster-dir.xml index f188ceb..538b31d 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir.xml @@ -10,8 +10,8 @@ <format type='dir'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index e08e36c..0a1f32c 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -9,8 +9,8 @@ <format type='unknown'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 234a2f1..cf4d401 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -122,6 +122,7 @@ mymain(void) DO_TEST("pool-logical", "vol-logical-backing"); DO_TEST("pool-sheepdog", "vol-sheepdog"); DO_TEST("pool-gluster", "vol-gluster-dir"); + DO_TEST("pool-gluster", "vol-gluster-dir-neg-uid"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.2.0

2 1

[libvirt] [PATCH v4] automatic create tap device with network type ethernet
by Vasiliy Tolstov 16 Dec '14

16 Dec '14

If user not specify network type ethernet, assume that user needs simple tap device created with libvirt. This patch does not need to run external script to create tap device or add root to qemu process. Also libvirt runs script after device creating, if user provide it. Difference with v3 that script runs only if it provided. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 119 +++++++++++++++++++++++++++++++++++------------- src/qemu/qemu_hotplug.c | 10 +--- src/qemu/qemu_process.c | 4 ++ 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1831323..78614d5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -276,6 +276,40 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + + * This function executes script for new tap device created by libvirt. + * + * Returns 0 in case of success or -1 on failure + */ +static int qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + if (virCommandRun(cmd, NULL) < 0) { + ret = -1; + } else { + ret = 0; + } + + cleanup: + virCommandFree(cmd); + return ret; +} + + int qemuNetworkIfaceConnect(virDomainDefPtr def, virConnectPtr conn, @@ -313,7 +347,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } else if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) return ret; - } else { + } else if (actualType != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network type %d is not supported"), virDomainNetGetActualType(net)); @@ -335,30 +369,44 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; + if (virNetDevSetOnline(net->ifname, !!(tap_create_flags & VIR_NETDEV_TAP_CREATE_IFUP)) < 0) + goto cleanup; + } else { + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } - } - virDomainAuditNetDevice(def, net, tunpath, true); + virDomainAuditNetDevice(def, net, tunpath, true); + } if (cfg->macFilter && ebtablesAddForwardAllowIn(driver->ebtables, @@ -4534,18 +4582,23 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; + virBufferAddLit(&buf, "tap"); + type_sep = ','; + /* for one tapfd 'fd=' shall be used, + * for more than one 'fds=' is the right choice */ + if (tapfdSize == 1) { + virBufferAsprintf(&buf, "%cfd=%s", type_sep, tapfd[0]); + } else { + virBufferAsprintf(&buf, "%cfds=", type_sep); + for (i = 0; i < tapfdSize; i++) { + if (i) + virBufferAddChar(&buf, ':'); + virBufferAdd(&buf, tapfd[i], -1); + } + } + type_sep = ','; + is_tap = true; + break; case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", @@ -7366,7 +7419,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7374,7 +7428,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9467d7d..1175259 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -908,7 +908,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -939,13 +940,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set Bandwidth */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a14b6f7..0dbf7fb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5064,6 +5064,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.1.3

5 18

[libvirt] [libvirt-python][PATCH] Bump version to 1.2.12 for new dev cycle
by Michal Privoznik 16 Dec '14

16 Dec '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c69fa15..507e156 100755 --- a/setup.py +++ b/setup.py @@ -309,7 +309,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.11', + version = '1.2.12', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.0.4

2 1

[libvirt] [PATCH V2] libxl: Set path to console on domain startup.
by Anthony PERARD 16 Dec '14

16 Dec '14

The path to the pty of a Xen PV console is set only in virDomainOpenConsole. But this is done too late. A call to virDomainGetXMLDesc done before OpenConsole will not have the path to the pty, but a call after OpenConsole will. e.g. of the current issue. Starting a domain with '<console type="pty"/>' Then: virDomainGetXMLDesc(): <devices> <console type='pty'> <target type='xen' port='0'/> </console> </devices> virDomainOpenConsole() virDomainGetXMLDesc(): <devices> <console type='pty' tty='/dev/pts/30'> <source path='/dev/pts/30'/> <target type='xen' port='0'/> </console> </devices> The patch intend to have the TTY path on the first call of GetXMLDesc. This is done by setting up the path at domain start up instead of in OpenConsole. https://bugzilla.redhat.com/show_bug.cgi?id=1170743 Signed-off-by: Anthony PERARD <anthony.perard(a)citrix.com> --- Change in V2: Adding bug report link. Reword the last part of the patch description. Cleanup the code. Use VIR_FREE before VIR_STRDUP. Remove the code from OpenConsole as it is now a duplicate. --- src/libxl/libxl_domain.c | 20 ++++++++++++++++++++ src/libxl/libxl_driver.c | 15 --------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 9c62291..325de79 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1290,6 +1290,26 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, if (libxlDomainSetVcpuAffinities(driver, vm) < 0) goto cleanup_dom; + if (vm->def->nconsoles) { + virDomainChrDefPtr chr = vm->def->consoles[0]; + if (chr && chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { + libxl_console_type console_type; + char *console = NULL; + + console_type = + (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ? + LIBXL_CONSOLE_TYPE_SERIAL : LIBXL_CONSOLE_TYPE_PV); + ret = libxl_console_get_tty(priv->ctx, vm->def->id, + chr->target.port, console_type, + &console); + if (!ret) { + VIR_FREE(chr->source.data.file.path); + ignore_value(VIR_STRDUP(chr->source.data.file.path, console)); + } + VIR_FREE(console); + } + } + if (!start_paused) { libxl_domain_unpause(priv->ctx, domid); virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 53c87ce..e79afac 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3957,10 +3957,8 @@ libxlDomainOpenConsole(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; - libxl_console_type console_type; virDomainChrDefPtr chr = NULL; libxlDomainObjPrivatePtr priv; - char *console = NULL; virCheckFlags(VIR_DOMAIN_CONSOLE_FORCE, -1); @@ -4002,18 +4000,6 @@ libxlDomainOpenConsole(virDomainPtr dom, goto cleanup; } - console_type = - (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ? - LIBXL_CONSOLE_TYPE_SERIAL : LIBXL_CONSOLE_TYPE_PV); - - ret = libxl_console_get_tty(priv->ctx, vm->def->id, chr->target.port, - console_type, &console); - if (ret) - goto cleanup; - - if (VIR_STRDUP(chr->source.data.file.path, console) < 0) - goto cleanup; - /* handle mutually exclusive access to console devices */ ret = virChrdevOpen(priv->devs, &chr->source, @@ -4027,7 +4013,6 @@ libxlDomainOpenConsole(virDomainPtr dom, } cleanup: - VIR_FREE(console); if (vm) virObjectUnlock(vm); return ret; -- Anthony PERARD

3 10

[libvirt] [PATCH] qemu: fix use a nonexist address in qemuDomainAttachDeviceConfig
by Luyao Huang 16 Dec '14

16 Dec '14

We free them before, then use it. This make we always do virDomainDefAddImplicitControllers when attach a disk. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df3ba6d..a9afa5d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7223,10 +7223,10 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (virDomainDiskInsert(vmdef, disk)) return -1; /* vmdef has the pointer. Generic codes for vmdef will do all jobs */ - dev->data.disk = NULL; if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) if (virDomainDefAddImplicitControllers(vmdef) < 0) return -1; + dev->data.disk = NULL; if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) return -1; break; -- 1.8.3.1

2 4

[libvirt] [PATCH] spec: Disable -Werror in Fedora RPM builds
by Daniel P. Berrange 16 Dec '14

16 Dec '14

Since we switched to using GIT to apply patches in the RPM spec, we automagically also turned on -Werror, since the .git directory now exists. We don't want this on in Fedora, since changing header files often lead to new warnings being issued. Explicitly turn off -Werror for non-RHEL platforms, instead of relying on the defaults --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 264c06f..edf2df8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -357,6 +357,8 @@ # changes in reported warnings %if 0%{?rhel} %define enable_werror --enable-werror +else + %define enable_werror --disable-werror %endif -- 2.1.0

4 4

[libvirt] [PATCH v3 0/3] parallels: a set of fixes for nova
by Dmitry Guryanov 16 Dec '14

16 Dec '14

Hello, This 3 patches fix different things, used by nova. Dmitry Guryanov (3): parallels: support NULL virDomainVideoAccelDefPtr parallels: set format for real disk devices parallels: fix usage of disk->info.addr.drive structure src/parallels/parallels_sdk.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) -- 2.1.0

2 5

[libvirt] ANNOUNCE: libvirt-glib release 0.2.0
by Daniel P. Berrange 16 Dec '14

16 Dec '14

I am pleased to announce that a new release of the libvirt-glib package, version 0.2.0, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) Changes in this release: - Support keyboard input device config - Annotate some unused parameters - Add support for new graphics attach API libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not currently guaranteeing that libvirt-glib libraries are permanently API/ABI stable. That said we do not expect to break the API/ABI for the forseeable future and will always strive avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: Auto generate a controller when attach hostdev and chr device
by Luyao Huang 15 Dec '14

15 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1174154 When we use attach-device add a hostdev or chr device which have a iscsi address or others (just like guest agent, subsys iscsi disk...), we will find there is no basic controller for our new attached device. Somtimes this will make guest cannot start after we add them (although they can start at the second time). Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df3ba6d..62fb784 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7250,6 +7250,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (virDomainHostdevInsert(vmdef, hostdev)) return -1; dev->data.hostdev = NULL; + if (virDomainDefAddImplicitControllers(vmdef) < 0) + return -1; if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) return -1; break; @@ -7290,6 +7292,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (qemuDomainChrInsert(vmdef, dev->data.chr) < 0) return -1; dev->data.chr = NULL; + if (virDomainDefAddImplicitControllers(vmdef) < 0) + return -1; break; case VIR_DOMAIN_DEVICE_FS: -- 1.8.3.1

2 1

[libvirt] [PATCH V2 0/3] qemu: support update graphic device persistently
by Wang Rui 15 Dec '14

15 Dec '14

We can change vnc password by using virDomainUpdateDeviceFlags API with live flag. But it can't be changed with config flag. v1: https://www.redhat.com/archives/libvir-list/2014-November/msg00627.html diff to v1: according to Jan's suggestion, 1. (patch 1/3) change error number to VIR_ERR_OPERATION_UNSUPPORTED 2. (patch 3/3) add 'VIR_DOMAIN_XML_SECURE' to flags in initialization. 3. (patch 3/3) Introduce a new function qemuDomainFindGraphicsIndex. Free the old graphics def and replace it with the new one as what we did for DEVICE_NET. Wang Rui (3): qemu: report properer error number when change graphics failed qemu: fix alignment of qemuDomainFindGraphics qemu: make persistent update of graphics device supported src/conf/domain_conf.c | 2 +- src/qemu/qemu_driver.c | 18 +++++++++++++++++- src/qemu/qemu_hotplug.c | 36 ++++++++++++++++++++++++------------ src/qemu/qemu_hotplug.h | 2 ++ 4 files changed, 44 insertions(+), 14 deletions(-) -- 1.7.12.4

2 4

[libvirt] [PATCH] conf: fix virDomainLeaseIndex cannot work when both parameter have lockspaces present
by Luyao Huang 15 Dec '14

15 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1174096 When both parameter have lockspaces present, virDomainLeaseIndex will always -1 even there is a lease the same with the one we check. I think we shouldn't do 'continue' when the two lockspaces are the same. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5cf0b1a..f36affc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11667,13 +11667,14 @@ int virDomainLeaseIndex(virDomainDefPtr def, for (i = 0; i < def->nleases; i++) { vlease = def->leases[i]; - /* Either both must have lockspaces present which match.. */ - if (vlease->lockspace && lease->lockspace && - STRNEQ(vlease->lockspace, lease->lockspace)) - continue; + /* Either both must have lockspaces present which match.. */ + if (vlease->lockspace && lease->lockspace) { + if (STRNEQ(vlease->lockspace, lease->lockspace)) + continue; /* ...or neither must have a lockspace present */ - if (vlease->lockspace || lease->lockspace) + } else if (vlease->lockspace || lease->lockspace) continue; + if (STREQ(vlease->key, lease->key)) return i; } -- 1.8.3.1

2 2

[libvirt] [PATCH] xenconfig: fix boot device parsing
by Wei Liu 15 Dec '14

15 Dec '14

The original code always checked *boot which was in effect boot[0]. It should use boot[i]. Signed-off-by: Wei Liu <wei.liu2(a)citrix.com> --- src/xenconfig/xen_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 7f4ec89..48431a7 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1071,7 +1071,7 @@ xenParseOS(virConfPtr conf, virDomainDefPtr def) return -1; for (i = 0; i < VIR_DOMAIN_BOOT_LAST && boot[i]; i++) { - switch (*boot) { + switch (boot[i]) { case 'a': def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY; break; -- 1.7.10.4

3 2

[libvirt] [PATCH] conf: fix crash when match a network iscsi hostdev with a host iscsi hostdev
by Luyao Huang 15 Dec '14

15 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1174053 When we use attach-device to coldplug a network iscsi hostdev, libvirt will check if there is already a device in XML. But if the 'b' is a host iscsi hostdev and 'a' is a network iscsi hostdev , libvirtd will crash in virDomainHostdevMatchSubsysSCSIiSCSI, because 'b' doesn't have a hostname. Add a check in virDomainHostdevMatchSubsys, if the a's protocol and b's protocol is not the same. backtrace like this: 0 0x00007f850d6bc307 in virDomainHostdevMatchSubsysSCSIiSCSI at conf/domain_conf.c:10889 1 virDomainHostdevMatchSubsys at conf/domain_conf.c:10911 2 virDomainHostdevMatch at conf/domain_conf.c:10973 3 virDomainHostdevFind at conf/domain_conf.c:10998 4 0x00007f84f6a10560 in qemuDomainAttachDeviceConfig at qemu/qemu_driver.c:7223 5 qemuDomainAttachDeviceFlags at qemu/qemu_driver.c:7554 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5cf0b1a..eb63c93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11184,7 +11184,9 @@ static int virDomainHostdevMatchSubsys(virDomainHostdevDefPtr a, virDomainHostdevDefPtr b) { - if (a->source.subsys.type != b->source.subsys.type) + if (a->source.subsys.type != b->source.subsys.type || + (a->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + a->source.subsys.u.scsi.protocol != b->source.subsys.u.scsi.protocol)) return 0; switch (a->source.subsys.type) { -- 1.8.3.1

2 2

[libvirt] [PATCH 01/10] parallels: support NULL virDomainVideoAccelDefPtr
by Dmitry Guryanov 15 Dec '14

15 Dec '14

I support if virDomainVideoAccelDefPtr is NULL it means default values for video acceleration. So we don't need to report error. --- src/parallels/parallels_sdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 0b05bc1..0980f50 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2029,7 +2029,7 @@ static int prlsdkCheckVideoUnsupportedParams(virDomainDefPtr def) return -1; } - if (v->accel == NULL || v->accel->support2d || v->accel->support3d) { + if (v->accel != NULL && (v->accel->support2d || v->accel->support3d)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Parallels Cloud Server doesn't support " "setting video acceleration parameters.")); -- 2.1.0

1 11

[libvirt] [PATCH] fix typo in sanlock driver s/VIR_CONF_UONG/VIR_CONF_ULONG/
by Daniel P. Berrange 15 Dec '14

15 Dec '14

fix typo introduced in previous commit Pushed as build-breaker fix --- src/locking/lock_driver_sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index b24e910..60f305c 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -141,7 +141,7 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) } p = virConfGetValue(conf, "host_id"); - CHECK_TYPE("host_id", VIR_CONF_UONG); + CHECK_TYPE("host_id", VIR_CONF_ULONG); if (p) driver->hostID = p->l; p = virConfGetValue(conf, "require_lease_for_disks"); -- 2.1.0

1 0

[libvirt] [PATCH 0/3] Fix starting/stopping of netdevs when starting/stopping CPUs
by Laine Stump 15 Dec '14

15 Dec '14

The first two patches provide a cleaner, more complete fix to a fix that was recently pushed for https://bugzilla.redhat.com/show_bug.cgi?id=1081461 While the original patch does fix the symptoms in the report, applying these two additional patches handle some situations that weren't addressed by the original. Patch 3 fixes a similar problem with tap devices when the newly added macTableManager='libvirt' is used. It should make migration of guests with this new type of network connection work properly with no loss of network connectivity (including once post-copy migration is working). Laine Stump (3): qemu: always call qemuInterfaceStartDevices() when starting CPUs qemu: add a qemuInterfaceStopDevices(), called when guest CPUs stop qemu: add/remove bridge fdb entries as guest CPUs are started/stopped src/qemu/qemu_command.c | 10 ++---- src/qemu/qemu_hotplug.c | 8 +++++ src/qemu/qemu_interface.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 2 ++ src/qemu/qemu_process.c | 7 ++-- 5 files changed, 109 insertions(+), 10 deletions(-) -- 1.9.3

3 6

[libvirt] libseccomp and KVM
by Raymond Durand 14 Dec '14

14 Dec '14

How is libseccomp used/enabled/configured with KVM/QEMU Hypervisor? Does it need a system call profiling per VMs? Regards,

4 8

[libvirt] [PATCHv2] lxc: give RW access to /proc/sys/net/ipv[46] to containers
by Cédric Bosdonnat 14 Dec '14

14 Dec '14

Some programs want to change some values for the network interfaces configuration in /proc/sys/net/ipv[46] folders. Giving RW access on them allows wicked to work on openSUSE 13.2+. In order to mount those folders RW but keep the rest of /proc/sys RO, we add temporary mounts for these folders before bind-mounting /proc/sys. Those mounts will be skipped if the container doesn't have its own network namespace. It may happen that one of the temporary mounts in /proc/ filesystem isn't available due to a missing kernel feature. We need not to fail in that case. --- Diffs to v1: * Only mount the /proc/sys/net/ipv[46] if the container has its own netns * Don't test for the existence of files in /proc before mounting them: they may not be ready when checking. Instead try to mount them and skip them if the source doesn't exist. * Use existing lxcNeedNetworkNamespace to tell lxcContainerMountBasicFS if we have our own netns: at least we now have the proper value. src/lxc/lxc_container.c | 153 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 121 insertions(+), 32 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 3b08b86..140d54f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -800,15 +800,21 @@ typedef struct { int mflags; bool skipUserNS; bool skipUnmounted; + bool skipNoPrivNet; + bool temporary; } virLXCBasicMountInfo; static const virLXCBasicMountInfo lxcBasicMounts[] = { - { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, - { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false }, - { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, - { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, + { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false, false, false }, + { "/proc/sys/net/ipv4", "TMP1", NULL, MS_BIND, false, false, true, true }, + { "/proc/sys/net/ipv6", "TMP2", NULL, MS_BIND, false, false, true, true }, + { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false, false, false }, + { "TMP1", "/proc/sys/net/ipv4", NULL, MS_BIND, false, false, true, false }, + { "TMP2", "/proc/sys/net/ipv6", NULL, MS_BIND, false, false, true, false }, + { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false, false, false }, + { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true, false, false }, #if WITH_SELINUX - { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, + { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true, false, false }, #endif }; @@ -885,14 +891,23 @@ static int lxcContainerSetReadOnly(void) static int lxcContainerMountBasicFS(bool userns_enabled, bool netns_disabled) { - size_t i; + size_t i, j; int rc = -1; char* mnt_src = NULL; + char* mnt_dst = NULL; int mnt_mflags; + char **tmpkeys = NULL; + char **tmppaths = NULL; + size_t nmounts = ARRAY_CARDINALITY(lxcBasicMounts); VIR_DEBUG("Mounting basic filesystems"); - for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) { + if (VIR_ALLOC_N(tmpkeys, nmounts) < 0 || + VIR_ALLOC_N(tmppaths, nmounts) < 0) { + goto cleanup; + } + + for (i = 0; i < nmounts; i++) { bool bindOverReadonly; virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; @@ -906,11 +921,41 @@ static int lxcContainerMountBasicFS(bool userns_enabled, goto cleanup; mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) + bool foundKey = false; + /* Look for potential temporary folder match */ + for (j = 0; j < i; j++) { + if (STREQ_NULLABLE(mnt->src, tmpkeys[j])) { + /* We found the key without path: skip */ + foundKey = true; + if (tmppaths[j] && VIR_STRDUP(mnt_src, tmppaths[j]) < 0) + goto cleanup; + break; + } + } + if (foundKey && !mnt_src) + continue; + if (!mnt_src && VIR_STRDUP(mnt_src, mnt->src) < 0) goto cleanup; mnt_mflags = mnt->mflags; } + if (mnt->temporary) { + char tmppath[] = "/tmp/mount-XXXXXX"; + if (mkdtemp(tmppath) == NULL) { + virReportSystemError(errno, + _("Failed to create temporary folder %s"), + tmppath); + } + if (VIR_STRDUP(tmppaths[i], tmppath) < 0 || + VIR_STRDUP(tmpkeys[i], mnt->dst) < 0 || + VIR_STRDUP(mnt_dst, tmppath) < 0) { + goto cleanup; + } + } else { + if (VIR_STRDUP(mnt_dst, mnt->dst) < 0) + goto cleanup; + } + VIR_DEBUG("Processing %s -> %s", mnt_src, mnt->dst); @@ -930,6 +975,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, VIR_DEBUG("Skipping '%s' which isn't mounted in host", mnt->dst); VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); continue; } } @@ -937,13 +983,21 @@ static int lxcContainerMountBasicFS(bool userns_enabled, if (mnt->skipUserNS && userns_enabled) { VIR_DEBUG("Skipping due to user ns enablement"); VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); + continue; + } + + if (mnt->skipNoPrivNet && netns_disabled) { + VIR_DEBUG("Skipping due to absence of network namespace"); + VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); continue; } - if (virFileMakePath(mnt->dst) < 0) { + if (virFileMakePath(mnt_dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), - mnt_src); + mnt_dst); goto cleanup; } @@ -957,32 +1011,67 @@ static int lxcContainerMountBasicFS(bool userns_enabled, bindOverReadonly = !!(mnt_mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); - if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { + mnt_src, mnt_dst, mnt->type, mnt_mflags & ~MS_RDONLY); + if (mount(mnt_src, mnt_dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { + /* Don't shout if some folder doesn't exist in /proc since they + * can be depending on an unloaded kernel module. */ + if (errno == ENOENT && STRPREFIX(mnt_src, "/proc/")) { + VIR_DEBUG("Skipped: %s doesn't exist", mnt_src); + /* Cleanup the temporary path */ + if (virFileDeleteTree(tmppaths[i]) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to remove temporary folder %s"), + tmppaths[i]); + VIR_FREE(tmppaths[i]); + + VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); + continue; + } virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt_src, mnt->dst, NULLSTR(mnt->type), + mnt_src, mnt_dst, NULLSTR(mnt->type), mnt_mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt_src, mnt->dst, NULL, + mount(mnt_src, mnt_dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt_src, mnt->dst, + mnt_src, mnt_dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); } rc = 0; cleanup: + /* Cleanup temporary mounts */ + for (i = 0; i < nmounts; i++) { + virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; + if (mnt->temporary && tmppaths[i]) { + if (umount(tmppaths[i]) < 0) { + virReportSystemError(errno, + _("Failed to un-mount temporary %s"), + tmppaths[i]); + } + if (virFileDeleteTree(tmppaths[i]) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to remove temporary folder %s"), + tmppaths[i]); + } + } + + virStringFreeList(tmpkeys); + virStringFreeList(tmppaths); VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); VIR_DEBUG("rc=%d", rc); return rc; } @@ -1696,6 +1785,22 @@ static int lxcContainerUnmountForSharedRoot(const char *stateDir, return ret; } +static bool +lxcNeedNetworkNamespace(virDomainDefPtr def) +{ + size_t i; + if (def->nets != NULL) + return true; + if (def->features[VIR_DOMAIN_FEATURE_PRIVNET] == VIR_TRISTATE_SWITCH_ON) + return true; + for (i = 0; i < def->nhostdevs; i++) { + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES && + def->hostdevs[i]->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) + return true; + } + return false; +} + /* Got a FS mapped to /, we're going the pivot_root * approach to do a better-chroot-than-chroot @@ -1741,7 +1846,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap, - !vmDef->nnets) < 0) + !lxcNeedNetworkNamespace(vmDef)) < 0) goto cleanup; /* Ensure entire root filesystem (except /.oldroot) is readonly */ @@ -2240,22 +2345,6 @@ virArch lxcContainerGetAlt32bitArch(virArch arch) } -static bool -lxcNeedNetworkNamespace(virDomainDefPtr def) -{ - size_t i; - if (def->nets != NULL) - return true; - if (def->features[VIR_DOMAIN_FEATURE_PRIVNET] == VIR_TRISTATE_SWITCH_ON) - return true; - for (i = 0; i < def->nhostdevs; i++) { - if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES && - def->hostdevs[i]->source.caps.type == VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) - return true; - } - return false; -} - /** * lxcContainerStart: * @def: pointer to virtual machine structure -- 2.1.2

4 4

[libvirt] Release of libvirt-1.2.11
by Daniel Veillard 13 Dec '14

13 Dec '14

It's out ! Tagged in git and signed tarballs and rpms are available from the usual place: ftp://libvirt.org/libvirt/ I also tagged and pushed a libvirt-python release too, to be found at: ftp://libvirt.org/libvirt/python/ Overall this includes around 350 commits, 2 are security fixes, and this also includes a couple of new generic features. There is of course a number of improvement on various drivers, notably parallels, drvbhyve, linux containers, xen migration, and kvm. This also pack an impressive amount of bug fixes (nearly 100), so I would really suggest to update when possible. Features: - Implement public API for virDomainGetFSInfo (Tomoki Sekiyama) - qemu: Add define for the new throttle options (Matthias Gatto) Security: - CVE-2014-8131: Fix possible deadlock and segfault in qemuConnectGetAllDomainStats() (Martin Kletzander) - CVE-2014-7823: dumpxml: security hole with migratable flag (Eric Blake) Documentation: - virsh.pod: Fix typo (John Ferlan) - Fix typo in path for storage pool (John Ferlan) - Fix missing curly braces (Hao Liu) - Fix simple typo s/ a API/ an API/ (Martin Kletzander) - getstats: improve documentation (Eric Blake) - Use gender-neutral pronoun in hacking.html.in (Christophe Fergeau) - network: fix some trivial typos in docs/formatnetwork.html (Chen Fan) - virsh.pod: Fix the pool-define-as and pool-create-as description (John Ferlan) - Fix a couple of typos on the storage pool html (John Ferlan) - storage: fix rbd pool indentation (Cole Robinson) - Create html documentation even if XHTML1 DTD is not available to validate (Ian Campbell) - More html/docs changes from libvirt.h.in split (John Ferlan) - conf: fix a comment typo in virDomainVideoDefaultRAM (Wang Rui) - Correct invalid hyperlinks (Martin Kletzander) - Fix missing slashes in XML examples (Luyao Huang) - fix simple typo in TPM paragraph (Martin Kletzander) - tests: fix documentation for mocking methods (Martin Kletzander) - virsh: document block.n.allocation stat (Eric Blake) - storage_driver: fix a comment typo (Chen Hanxiao) - domain: Move docs for storage hosts under the <source> element (Peter Krempa) - virsh: sync domdisplay help and manual (Martin Kletzander) - fix a typo in formatdomain.html (Chen Fan) - Remove references to unused libvirt-libvirt.html (Nehal J Wani) - Document NVRAM behavior on transient domains (Michal Privoznik) - Adjust contributor guidelines about curly brackets (Martin Kletzander) - Fix API docs for header file re-organization (Daniel P. Berrange) - fix mismatched ACL attribute name (Luyao Huang) - Add documentation for compat mode. (Prerna Saxena) - examples: add systemtap script to ease lock debugging (Martin Kletzander) Portability: - Fix build on mingw (Ján Tomko) - define NTF_{SELF,MASTER} if undefined (Guido Günther) - build: fix mingw printing of pid (Eric Blake) - build: fix unused variable in mingw (Eric Blake) - libxl: Allow libxl to find pygrub binary. (Ian Campbell) - build: fix build when not using dbus (Eric Blake) - build: avoid 32-bit failure on older gcc (Eric Blake) - build: fix build with older dbus headers (Eric Blake) - maint: use portable shell (Eric Blake) - qemuxml2argvtest: Run some test only on Linux (Michal Privoznik) Bug Fixes: - Avoid getting '-1:-1' in devices cgroup list (Cédric Bosdonnat) - conf: goto error when value of max_sectors is too large (Luyao Huang) - Ignore CPU features without a model for host-passthrough (Ján Tomko) - Do not format CPU features without a model (Ján Tomko) - qemu: bulk stats: Fix logic in monitor handling (Francesco Romani) - dac: Add a new func to get DAC label of a running process (Luyao Huang) - viriscsi: Need to sendtargets on Initiator IQN (John Ferlan) - storage: Check stderr when matching parted output (Hao Liu) - security: Manage SELinux labels on shared/readonly hostdev's (John Ferlan) - tests: Fix sharable typo (John Ferlan) - conf: forbid negative number in address(like controller, bus, slot...) (Luyao Huang) - qemu: migration: Unlock vm on failed ACL check in protocol v2 APIs (Peter Krempa) - network: don't allow multiple dhcp sections (Kyle DeFrancia) - getstats: avoid memory leak on OOM (Eric Blake) - util: check for an illegal character in a XML namespace prefix (Erik Skultety) - qemu: snapshot: Forbid internal snapshot with passthrough devices (Shanzhi Yu) - networkValidate: Disallow bandwidth in portgroups too (Michal Privoznik) - qemu: process: Avoid uninitialized use two vars when reconnecting to vm (Peter Krempa) - Fix handling of whitespae in preprocessor macros for API generator (Daniel P. Berrange) - tests: Fix misplaced parenthesis in qemumonitorjsontest (Martin Kletzander) - qemu: Fix virsh freeze when blockcopy storage file is removed (Erik Skultety) - cpu: fix possible crash in getModels (Pavel Hrdina) - leaseshelper: Skip entries missing expiry time on INIT action (Peter Krempa) - storage: fix crash caused by no check return before set close (Luyao Huang) - virsh: vol-upload disallow negative offset (Shanzhi Yu) - parallels: fix compilation of parallels_storage.c (Dmitry Guryanov) - Generate a MAC when loading a config instead of package update (Ján Tomko) - Silently ignore MAC in NetworkLoadConfig (Ján Tomko) - nwfilter: fix crash when adding non-existing nwfilter (Pavel Hrdina) - Fix race condition in qemuGetProcessInfo (Eduardo Costa) - libxl: Resolve Coverity CHECKED_RETURN (John Ferlan) - domain_conf: Resolve Coverity CHECKED_RETURN (John Ferlan) - virhook: Resolve Coverity NULL_RETURNS (John Ferlan) - hotplug: Resolve Coverity FORWARD_NULL (John Ferlan) - storage: Add mixed fc_host/scsi_host duplicate adapter source checks (John Ferlan) - conf: Add device-related code for panic devices (Martin Kletzander) - conf: Add device-related code for TPM devices (Martin Kletzander) - qemu: fix block{commit,copy} abort handling (Erik Skultety) - qemu: Don't track quiesced state of FSs (Michal Privoznik) - Fix usage of virReportSystemError (Jiri Denemark) - network: Fix upgrade from libvirt older than 1.2.4 (Jiri Denemark) - Resolve build breaker (John Ferlan) - lxc: don't unmount subtree if it contains the source of the mount (Cédric Bosdonnat) - virt-aa-helper wasn't running virErrorInitialize (Cédric Bosdonnat) - storage: qemu: Fix security labelling of new image chain elements (Peter Krempa) - storage: Add thread to refresh for createVport (John Ferlan) - storage: Fix issue finding LU's when block doesn't exist (John Ferlan) - rpc: do not fail if the pid of the connecting process is not set (Giuseppe Scrivano) - util: don't log failure when older iptables lacks -w (Eric Blake) - qemu: Really fix crash in tunnelled migration (Jiri Denemark) - virsh: Fix msg: blockjob is aborted from another client (Erik Skultety) - qemu: Fix crash in tunnelled migration (Jiri Denemark) - vbox: fix a bug in _machineStateInactive (Yohan BELLEGUIC) - qemu: Resolve Coverity UNINIT (John Ferlan) - qemu: Fix get blkiodevtune for a disk that has been hot unplugged (Luyao Huang) - Re-add use of locking with iptables/ip6tables/ebtables (Daniel P. Berrange) - qemu: Don't try to parse -help for new QEMU (Jiri Denemark) - qemu: Always set migration capabilities (Jiri Denemark) - lxc: fix setmem effect on a running LXC machine (Erik Skultety) - nwfilter: fix deadlock caused updating network device and nwfilter (Pavel Hrdina) - qemuPrepareNVRAM: Save domain conf only if domain's persistent (Michal Privoznik) - storage: Introduce 'managed' for the fchost parent (John Ferlan) - storage: Ensure fc_host parent matches wwnn/wwpn (John Ferlan) - storage: Check for valid fc_host parent at startup (John Ferlan) - qemu: Resolve Coverity DEADCODE. (Matthias Gatto) - qemu: Fix copy_paste_error in qemuBuildDriveStr. (Matthias Gatto) - Do not crash on gluster snapshots with no host name (Ján Tomko) - Fix virDomainChrEquals for spicevmc (Ján Tomko) - qemu: fix domain startup failing with 'strict' mode in numatune (Wang Rui) - lxc: don't setup cpuset.mems if memory mode in numatune is not 'strict' (Wang Rui) - qemu: don't setup cpuset.mems if memory mode in numatune is not 'strict' (Wang Rui) - Fix invalid log, misused option types and a typo (Hao Liu) - phyp: Fix NULL dereference in phypConnectOpen (Martin Kletzander) - nodeinfo: report error when failure in nodeSetMemoryParameters (Jincheng Miao) - virnuma: add nodeset NULL check in virNumaSetupMemoryPolicy (Chen Fan) - Fix build-time pkg-config files in VPATH (Jiri Denemark) - qemu: Update fsfreeze status on domain state transitions (Michal Privoznik) - network: fix call virNetworkEventLifecycleNew when networkStartNetwork fail (Luyao Huang) - numa: fix assumption in virNumaNodeIsAvailable() (Martin Kletzander) - Free job statistics from the migration cookie (Ján Tomko) - virsh: Fix types for option bandwidth in block* (Hao Liu) - qemuDomainUpdateDeviceConfig: Allow startupPolicy update (Michal Privoznik) - remote: Fix memory leak in remoteConnectGetAllDomainStats (Peter Krempa) - Require at least one console for LXC domain (Ján Tomko) - Do not probe for power mgmt capabilities in lxc emulator (Ján Tomko) - util: fix releasing pidfile in cleanup (Martin Kletzander) - qemu: stop NBD server after successful migration (Weiwei Li) - qemu: avoid rare race when undefining domain (Martin Kletzander) - qemu: make sure capability probing process can start (Martin Kletzander) - vbox: don't register NULL driver (Martin Kletzander) - qemu: make advice from numad available when building commandline (Martin Kletzander) Improvements: - network: Bring netdevs online later (Matthew Rosato) - lxc: give RW access to /proc/sys/net/ipv[46] to containers (Cédric Bosdonnat) - conf: Ignore device address for guestfwd channel (Martin Kletzander) - maint: clean up the unused variable 'caps' in src/qemu/qemu_*.c (Wang Rui) - parallels: report proper error in Create/Destroy/Suspend e.t.c. (Dmitry Guryanov) - parallels: fix getJobResultHelper (Dmitry Guryanov) - parallels: return PRL_RESULT from waitJob and getJobResult (Dmitry Guryanov) - parallels: implement domainUndefine and domainUndefineFlags (Dmitry Guryanov) - parallels: add cdroms support (Dmitry Guryanov) - parallels: Add domainCreateWithFlags() function. (Alexander Burluka) - parallels: added function virDomainIsActive() (Alexander Burluka) - parallels: refactor parallelsDomainDefineXML (Dmitry Guryanov) - parallels: create VMs and containers with sdk (Dmitry Guryanov) - parallels: rewrite parallelsApplyConfig with SDK (Dmitry Guryanov) - parallels: reimplement functions, which change domain state (Dmitry Guryanov) - parallels: handle events from parallels server (Alexander Burluka) - parallels: move parallelsDomNotFoundError to parallels_utils.h (Dmitry Guryanov) - parallels: get domain info with SDK (Alexander Burluka) - parallels: move IS_CT macro to parallels_utils.h (Dmitry Guryanov) - build: Move check for XML::XPath into bootstrap (Martin Kletzander) - maint: update to latest gnulib (Eric Blake) - lxc: always use virDomainNetGetActualBridgeName to get interface's bridge (Laine Stump) - qemu: always use virDomainNetGetActualBridgeName to get interface's bridge (Laine Stump) - qemu: setup tap devices for macTableManager='libvirt' (Laine Stump) - network: setup bridge devices for macTableManager='libvirt' (Laine Stump) - network: store network macTableManager setting in NetDef actual object (Laine Stump) - network: save bridge name in ActualNetDef when actualType==network too (Laine Stump) - conf: new network bridge device attribute macTableManager (Laine Stump) - util: functions to manage bridge fdb (forwarding database) (Laine Stump) - util: new functions for setting bridge and bridge port attributes (Laine Stump) - getstats: add block.n.path stat (Eric Blake) - getstats: start giving offline block stats (Eric Blake) - rpc: Report proper close reason (Martin Kletzander) - virsh: Don't reconnect after the command when disconnected (Martin Kletzander) - storage: Fix printing/casting of uid_t/gid_t (Peter Krempa) - virsh: Add adapter options for pool-{create|define}-as (John Ferlan) - virsh: Add auth options for pool-{create|define}-as (John Ferlan) - Report original error when QMP probing fails with new QEMU (Daniel P. Berrange) - storage: backend: Log uid/gid when initializing storage file backend (Peter Krempa) - qemu: process: Refactor reconnecting to qemu processes (Peter Krempa) - drvbhyve: Automatically tear down guest domains on shutdown (Conrad Meyer) - qemu: driver: Reload snapshots and managedsaves prior to reconnecting (Peter Krempa) - leaseshelper: Fix incorrect alignment of a switch case (Peter Krempa) - network: dnsmasq: Don't format lease file path (Peter Krempa) - leaseshelper: Refactor control flow (Peter Krempa) - leaseshelper: improvements to support all events (Nehal J Wani) - cpu-driver: Fix the cross driver function call (Daniel Hansel) - qemu_migration: Precreate missing storage (Michal Privoznik) - qemu_migration: Send disk sizes to the other side (Michal Privoznik) - qemuMonitorJSONBlockStatsUpdateCapacity: Don't skip disks (Michal Privoznik) - storage: Introduce storagePoolLookupByTargetPath (Michal Privoznik) - Replace virDomainSnapshotFree with virObjectUnref (John Ferlan) - Replace virInterfaceFree with virObjectUnref (John Ferlan) - Replace virNWFilterFree with virObjectUnref (John Ferlan) - Replace virSecretFree with virObjectUnref (John Ferlan) - Replace virStreamFree with virObjectUnref (John Ferlan) - Replace virStoragePoolFree with virObjectUnref (John Ferlan) - Replace virStorageVolFree with virObjectUnref (John Ferlan) - Replace virNodeDeviceFree with virObjectUnref (John Ferlan) - Replace virNetworkFree with virObjectUnref (John Ferlan) - Replace virDomainFree with virObjectUnref (John Ferlan) - rpc: Replace virXXXFree with virObjectUnref (John Ferlan) - libvirt.c: Move virDomainGetFSInfo to libvirt-domain.c (Michal Privoznik) - conf: replace call to virNetworkFree() with virObjectUnref() (Laine Stump) - build, docs: Let make see the dependencies for html/*.html (Martin Kletzander) - storage: Move and rename getVhbaSCSIHostParent (John Ferlan) - conf: Don't redefine virDomainTPMDefPtr (Martin Kletzander) - qemu: Make pid available for security managers in qemuProcessAttach (Luyao Huang) - qemu: set jobinfo type to FAILED if job is failed in qemuMigrationRun (Wang Rui) - qemu: set jobinfo type to CANCELLED if migration is cancelled in all conditions (Wang Rui) - util: Avoid calling closedir(NULL) (Jiri Denemark) - dbus: fix arrays of bools (Eric Blake) - qemu: add the missing jobinfo type in qemuDomainGetJobInfo (Wang Rui) - lxc: be more patient while resolving symlinks (Cédric Bosdonnat) - virt-aa-helper: /etc/libvirt-sandbox/services isn't restricted (Cédric Bosdonnat) - qemu-command: introduce new vgamem attribute for QXL video device (Pavel Hrdina) - qemu-command: use vram attribute for all video devices (Pavel Hrdina) - caps: introduce new QEMU capability for vgamem_mb device property (Pavel Hrdina) - QXL: fix setting ram and vram values for QEMU QXL device (Pavel Hrdina) - video: cleanup usage of vram attribute and update documentation (Pavel Hrdina) - internal: add macro to round value to the next closest power of 2 (Pavel Hrdina) - virsh: expose virDomainGetFSInfo (Tomoki Sekiyama) - qemu: add test for qemuAgentGetFSInfo (Tomoki Sekiyama) - qemu: Implement the qemu driver for virDomainGetFSInfo (Tomoki Sekiyama) - remote: Implement the remote protocol for virDomainGetFSInfo (Tomoki Sekiyama) - qemu: Emit the guest agent lifecycle event (Peter Krempa) - examples: Add support for the guest agent lifecycle event (Peter Krempa) - event: Add guest agent lifecycle event (Peter Krempa) - spec: Automatically apply all patches with git (Jiri Denemark) - qemu: process: Refresh virtio channel guest state when connecting to mon (Peter Krempa) - qemu: chardev: Extract more information about character devices (Peter Krempa) - libxl: destroy domain in migration finish phase on failure (Jim Fehlig) - libxl: start domain paused on migration dst (Jim Fehlig) - libxl: acquire job in migration finish phase (Jim Fehlig) - libxl: Receive migration data in a thread (Jim Fehlig) - storage: rbd: Implement support for passing config file option (Peter Krempa) - storage: rbd: qemu: Add support for specifying internal RBD snapshots (Peter Krempa) - storage: Allow parsing of RBD backing strings when building backing chain (Peter Krempa) - util: storagefile: Split out parsing of NBD string into a separate func (Peter Krempa) - util: split out qemuParseRBDString into a common helper (Peter Krempa) - tests: Reflow the expected output from RBD disk test (Peter Krempa) - qemu: Refactor qemuBuildNetworkDriveURI to take a virStorageSourcePtr (Peter Krempa) - util: storage: Copy hosts of a storage file only if they exist (Peter Krempa) - util: storage: Add notice for extension of struct virStorageSource (Peter Krempa) - util: buffer: Clarify scope of the escape operation in virBufferEscape (Peter Krempa) - test: virstoragetest: Add testing of network disk details (Peter Krempa) - qemu: Add handling for VSERPORT_CHANGE event (Peter Krempa) - conf: Add channel state for virtio channels to the XML (Peter Krempa) - qemu: monitor: Rename and improve qemuMonitorGetPtyPaths (Peter Krempa) - test: xml2xml: Print full filenames if xml2xml test fails (Peter Krempa) - conf: Annotate source enums for character device struct members (Peter Krempa) - qemu: process: report useful error if alias formatting fails (Peter Krempa) - qemu: Drop OVMF whitelist (Michal Privoznik) - qemu: Support OVMF on armv7l aarch64 guests (Michal Privoznik) - maint: forbid 'int foo = true' (Eric Blake) - virdbus: don't force users to pass int for bool values (Eric Blake) - storage: wrap storage_driver.c to 80 columns (Chen Hanxiao) - network: Add network bandwidth support to ethernet interfaces (Anirban Chakraborty) - qemu: Add tests for new blkdeviotune arguments (John Ferlan) - qemu: Add checks for blkdeviotune 'size_iops_sec' and adjust error (John Ferlan) - bracket-spacing: Add syntax-check for unnecessary curly brackets (Martin Kletzander) - bracket-spacing-check: Print out more specific error message (Martin Kletzander) - bracket-spacing: Remove pointless cycles (Martin Kletzander) - bracket-spacing: Don't modify current line (Martin Kletzander) - Remove unnecessary curly brackets in tests/ (Martin Kletzander) - Remove unnecessary curly brackets in tools/ (Martin Kletzander) - Remove unnecessary curly brackets in rest of src/ (Martin Kletzander) - Remove unnecessary curly brackets in rest of src/[o-u]*/ (Martin Kletzander) - Remove unnecessary curly brackets in rest of src/[a-n]*/ (Martin Kletzander) - Remove unnecessary curly brackets in src/vbox/ (Martin Kletzander) - Remove unnecessary curly brackets in src/util/ (Martin Kletzander) - Remove unnecessary curly brackets in src/test/test_driver.c (Martin Kletzander) - Remove unnecessary curly brackets in src/storage/ (Martin Kletzander) - Remove unnecessary curly brackets in src/qemu/ (Martin Kletzander) - Remove unnecessary curly brackets in src/node_device/ (Martin Kletzander) - Remove unnecessary curly brackets in src/hyperv/ (Martin Kletzander) - Remove unnecessary curly brackets in src/conf/ (Martin Kletzander) - Remove unnecessary curly brackets in src/vmx/vmx.c (Martin Kletzander) - Remove unnecessary curly brackets in rest of src/esx/ (Martin Kletzander) - Remove unnecessary curly brackets in src/esx/esx_driver.c (Martin Kletzander) - Remove unnecessary curly brackets in daemon/ and examples/ (Martin Kletzander) - virsh: Convert EDIT_NOT_CHANGED macro to do-while block. (Martin Kletzander) - virt-aa-helper: Trick invalid syntax-check (Martin Kletzander) - virsh: Error out if VSH_OT_STRING option has VSH_OFLAG_REQ flag (Martin Kletzander) - virsh: Enforce proper ordering of options (Martin Kletzander) - virsh: Reorder some options (Martin Kletzander) - drvbhyve: Use boot-order for grub-bhyve boot device (Conrad Meyer) - drvbhyve: Clean-up some used ATTRIBUTE_UNUSEDs. (Conrad Meyer) - storage: Introduce virStoragePoolSaveConfig (John Ferlan) - storage: Don't use a stack copy of the adapter (John Ferlan) - bhyvexml2argv: Add test for grub console support (Conrad Meyer) - bhyve: Add console support for grub-bhyve bootloader (Conrad Meyer) - bhyve: Probe grub-bhyve for --cons-dev capability (Conrad Meyer) - bhyvexml2argv: Add tests for domain-configured bootloader, args (Conrad Meyer) - domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve (Conrad Meyer) - bhyvexml2argv: Add loader argv tests. (Conrad Meyer) - bhyve: Support /domain/bootloader configuration for non-FreeBSD guests. (Conrad Meyer) - Display nicer error message for unsupported chardev hotplug (Ján Tomko) - virsh: Add bps_max and friends to virsh (Matthias Gatto) - qemu: Add bps_max and friends to qemu command generation (Matthias Gatto) - qemu: Add bps_max and friends QMP suport (Matthias Gatto) - qemu: Add bps_max and friends qemu driver (Matthias Gatto) - qemu: Add Qemu capability for bps_max and friends (Matthias Gatto) - qemu: Modify the structure _virDomainBlockIoTuneInfo. (Matthias Gatto) - cpu_conf: Allow specification of 'units' for @memory on numa nodes. (Prerna Saxena) - conf: Expose virDomainParseMemory for use outside domain_conf (Prerna Saxena) - esx: Simplify VI (vSphere) API and VMware product version handling (Matthias Bolte) - domain_conf: Use virDomainParseMemory more widely (Michal Privoznik) - Transform VIR_ERROR into VIR_WARN in detect_scsi_host_caps (Cédric Bosdonnat) - vbox: Remove useless condition branches (Martin Kletzander) - Remove use of networkPrivateData from netcf driver (Daniel P. Berrange) - Remove use of networkPrivateData from network driver (Daniel P. Berrange) - Remove use of storagePrivateData from storage driver (Daniel P. Berrange) - Update Test driver to always use privateData (Daniel P. Berrange) - Update Parallels driver to always use privateData (Daniel P. Berrange) - Remove abuse of networkPrivateData in phyp driver (Daniel P. Berrange) - Move phyp internal info out of the header file (Daniel P. Berrange) - Update Hyper-V driver to always use privateData (Daniel P. Berrange) - Update ESX driver to always use privateData (Daniel P. Berrange) - Update remote driver to always use privateData (Daniel P. Berrange) - Clean up remote driver connection open code (Daniel P. Berrange) - Test: Add a testcase for PowerPC compat mode cpu specification. (Prerna Saxena) - PowerPC:Improve PVR handling to fall back to cpu generation. (Prerna Saxena) - PowerPC : Add support for launching VM in 'compat' mode. (Prerna Saxena) - Cpu: Add support for Power LE Architecture. (Prerna Saxena) - gitignore: use wildcard for configure's temporary files (Martin Kletzander) - virnetdevbandwidth: Include virutil.h (Michal Privoznik) - qemu: Allow use of iothreads for virtio ccw disk definitions (Boris Fiuczynski) - qemu: Correct disk type checking logic for iothreads (Boris Fiuczynski) - virsh: fix net-dhcp-leases no output in quiet mode (Luyao Huang) - numa: split util/ and conf/ and support non-contiguous nodesets (Martin Kletzander) - add temporary compilation files into .gitignore (Martin Kletzander) - Iface: disallow network tuning in session mode globally (Erik Skultety) - qemu: revert patch - bandwidth tuning in session mode (Erik Skultety) - private.syms: Export virDomainNumatuneSpecifiedMaxNode (Michal Privoznik) - virnuma: Add some more comments (Michal Privoznik) - Memory: Use consistent type for all memory elements. (Prerna Saxena) - virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy (Chen Fan) - numatune: add check for numatune nodeset range (Chen Fan) - bitmap: add virBitmapLastSetBit for finding the last bit position of bitmap (Chen Fan) - virsh: don't list unknown domains (Martin Kletzander) - lxc: improve error message for invalid blkiotune settings (Martin Kletzander) - qemu: improve error message for invalid blkiotune settings (Martin Kletzander) - util: Introduce virPidFileForceCleanupPath (Martin Kletzander) Cleanup: - Remove left over debug in hvsupport.pl script (Daniel P. Berrange) Thanks everybody for your contributions for this release, be it with reports, patches, dicussions, documentation fixes, etc. ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] exec-shield and KVM
by Raymond Durand 12 Dec '14

12 Dec '14

Is exec-shield protection on the KVM host relevant for VM memory protection? Regards,

2 1

[libvirt] [PATCH v3] network: Bring netdevs online later
by Matthew Rosato 12 Dec '14

12 Dec '14

Currently, MAC registration occurs during device creation, which is early enough that, during live migration, you end up with duplicate MAC addresses on still-running source and target devices, even though the target device isn't actually being used yet. This patch proposes to defer MAC registration until right before the guest can actually use the device -- In other words, right before starting guest CPUs. Signed-off-by: Matthew Rosato <mjrosato(a)linux.vnet.ibm.com> --- Associated BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1081461 Changes for v3: * Some minor formatting fixes. * in qemuNetworkIfaceConnect, set VIR_NETDEV_TAP_CREATE_IFUP unconditionally. * in qemuDomainAttachNetDevice, call qemuInterfaceStartDevice only for VIR_DOMAIN_NET_TYPE_DIRECT, _BRIDGE and _NETWORK. * in qemuProcessStartCPUs, use 'reason' to determine whether or not qemuInterfaceStartDevices needs to be called. Basically, it needs to be called for any reason that the system would be initializing (or re-initializing). src/Makefile.am | 3 +- src/conf/domain_conf.h | 2 ++ src/lxc/lxc_process.c | 4 ++- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_hotplug.c | 8 +++++ src/qemu/qemu_interface.c | 78 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 32 ++++++++++++++++++ src/qemu/qemu_process.c | 7 ++++ src/util/virnetdevmacvlan.c | 8 +++-- src/util/virnetdevmacvlan.h | 2 ++ 10 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 src/qemu/qemu_interface.c create mode 100644 src/qemu/qemu_interface.h diff --git a/src/Makefile.am b/src/Makefile.am index fa741a8..035120e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -703,7 +703,8 @@ QEMU_DRIVER_SOURCES = \ qemu/qemu_monitor_text.h \ qemu/qemu_monitor_json.c \ qemu/qemu_monitor_json.h \ - qemu/qemu_driver.c qemu/qemu_driver.h + qemu/qemu_driver.c qemu/qemu_driver.h \ + qemu/qemu_interface.c qemu/qemu_interface.h XENAPI_DRIVER_SOURCES = \ xenapi/xenapi_driver.c xenapi/xenapi_driver.h \ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0862bd7..5f328cf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -951,6 +951,8 @@ struct _virDomainNetDef { virNetDevBandwidthPtr bandwidth; virNetDevVlan vlan; int linkstate; + /* vmOp value saved if deferring interface start */ + virNetDevVPortProfileOp vmOp; }; /* Used for prefix of ifname of any network name generated dynamically diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed30c37..b2256c0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -300,6 +300,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virNetDevBandwidthPtr bw; virNetDevVPortProfilePtr prof; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); + unsigned int macvlan_create_flags = VIR_NETDEV_MACVLAN_CREATE_IFUP; /* XXX how todo bandwidth controls ? * Since the 'net-ifname' is about to be moved to a different @@ -336,7 +337,8 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, cfg->stateDir, - virDomainNetGetActualBandwidth(net), 0) < 0) + virDomainNetGetActualBandwidth(net), + macvlan_create_flags) < 0) goto cleanup; ret = res_ifname; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e5270bd..229dff4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -199,6 +199,9 @@ qemuPhysIfaceConnect(virDomainDefPtr def, net->ifname = res_ifname; } + /* Save vport profile op for later */ + net->vmOp = vmop; + virObjectUnref(cfg); return rc; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7bc19cd..530e6da 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -30,6 +30,7 @@ #include "qemu_domain.h" #include "qemu_command.h" #include "qemu_hostdev.h" +#include "qemu_interface.h" #include "domain_audit.h" #include "domain_nwfilter.h" #include "virlog.h" @@ -922,6 +923,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, priv->qemuCaps, tapfd, &tapfdSize) < 0) goto cleanup; iface_connected = true; + /* Set device online immediately */ + qemuInterfaceStartDevice(net); if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) { @@ -937,6 +940,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) < 0) goto cleanup; iface_connected = true; + /* Set device online immediately */ + qemuInterfaceStartDevice(net); if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { @@ -2070,6 +2075,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } + /* Set device online immediately */ + qemuInterfaceStartDevice(newdev); + newType = virDomainNetGetActualType(newdev); if (newType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c new file mode 100644 index 0000000..dccfcc4 --- /dev/null +++ b/src/qemu/qemu_interface.c @@ -0,0 +1,78 @@ +/* + * qemu_interface.c: QEMU interface management + * + * Copyright IBM Corp. 2014 + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Matthew J. Rosato <mjrosato(a)linux.vnet.ibm.com> + */ + +#include <config.h> + +#include "qemu_interface.h" +#include "virnetdev.h" +#include "virnetdevtap.h" +#include "virnetdevmacvlan.h" +#include "virnetdevvportprofile.h" + +/** + * qemuInterfaceStartDevice: + * @net: net device to start + * + * Based upon the type of device provided, perform the appropriate + * work to set the device online. + */ +void +qemuInterfaceStartDevice(virDomainNetDefPtr net) +{ + switch (virDomainNetGetActualType(net)) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevTapDelete(net->ifname)); + } + break; + case VIR_DOMAIN_NET_TYPE_DIRECT: + if (virNetDevSetOnline(net->ifname, true) < 0) { + ignore_value(virNetDevVPortProfileDisassociate(net->ifname, + virDomainNetGetActualVirtPortProfile(net), + &net->mac, + virDomainNetGetActualDirectDev(net), + -1, + net->vmOp)); + } + break; + } +} + +/** + * qemuInterfaceStartDevices: + * @def: domain definition + * + * Set all ifaces associated with this domain to the online state. + */ +void +qemuInterfaceStartDevices(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + qemuInterfaceStartDevice(def->nets[i]); + } + + return; +} diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h new file mode 100644 index 0000000..5810cda --- /dev/null +++ b/src/qemu/qemu_interface.h @@ -0,0 +1,32 @@ +/* + * qemu_interface.h: QEMU interface management + * + * Copyright IBM Corp. 2014 + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Matthew J. Rosato <mjrosato(a)linux.vnet.ibm.com> + */ + +#ifndef __QEMU_INTERFACE_H__ +# define __QEMU_INTERFACE_H__ + +# include "domain_conf.h" + +void qemuInterfaceStartDevice(virDomainNetDefPtr net); +void qemuInterfaceStartDevices(virDomainDefPtr def); + +#endif /* __QEMU_INTERFACE_H__ */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f391743..3fc50a0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -42,6 +42,7 @@ #include "qemu_hostdev.h" #include "qemu_hotplug.h" #include "qemu_migration.h" +#include "qemu_interface.h" #include "cpu/cpu.h" #include "datatypes.h" @@ -2947,6 +2948,12 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + /* Bring up netdevs before starting CPUs */ + if (reason != VIR_DOMAIN_RUNNING_UNPAUSED && + reason != VIR_DOMAIN_RUNNING_SAVE_CANCELED) { + qemuInterfaceStartDevices(vm->def); + } + VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, vm, priv->lockState) < 0) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c83341c..1edf3ae 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -902,9 +902,11 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, goto link_del_exit; } - if (virNetDevSetOnline(cr_ifname, true) < 0) { - rc = -1; - goto disassociate_exit; + if (flags & VIR_NETDEV_MACVLAN_CREATE_IFUP) { + if (virNetDevSetOnline(cr_ifname, true) < 0) { + rc = -1; + goto disassociate_exit; + } } if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) { diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 41aa4e2..41b4014 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -44,6 +44,8 @@ typedef enum { VIR_NETDEV_MACVLAN_CREATE_NONE = 0, /* Create with a tap device */ VIR_NETDEV_MACVLAN_CREATE_WITH_TAP = 1 << 0, + /* Bring the interface up */ + VIR_NETDEV_MACVLAN_CREATE_IFUP = 1 << 1, } virNetDevMacVLanCreateFlags; int virNetDevMacVLanCreate(const char *ifname, -- 1.7.9.5

3 6

[libvirt] [PATCH] Avoid getting '-1:-1' in devices cgroup list
by Cédric Bosdonnat 12 Dec '14

12 Dec '14

When calling virCgroupAllowAllDevices we get these invalid entries in the device cgroup config. b -1:-1 rw c -1:-1 rw Check for positive values before outputting the major and minor to avoid that. --- src/util/vircgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 166f4dc..3995477 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2767,11 +2767,11 @@ virCgroupAllowDevice(virCgroupPtr group, char type, int major, int minor, char *minorstr = NULL; if ((major < 0 && VIR_STRDUP(majorstr, "*") < 0) || - virAsprintf(&majorstr, "%i", major) < 0) + (major >= 0 && virAsprintf(&majorstr, "%i", major) < 0)) goto cleanup; if ((minor < 0 && VIR_STRDUP(minorstr, "*") < 0) || - virAsprintf(&minorstr, "%i", minor) < 0) + (minor >= 0 && virAsprintf(&minorstr, "%i", minor) < 0)) goto cleanup; if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, -- 2.1.2

2 1

[libvirt] [PATCH libvirt-python] Add c_pointer method to classes.
by Richard W.M. Jones 12 Dec '14

12 Dec '14

This returns the raw C pointer to the underlying object, eg: conn = libvirt.open(None) print "0x%x" % conn.c_pointer() # returns virConnectPtr of the connection dom = conn.lookupByName("test") print "0x%x" % dom.c_pointer() # returns virDomainPtr of the domain The reason behind this is to allow us to transparently pass Python dom objects through the libguestfs Python API. https://bugzilla.redhat.com/show_bug.cgi?id=1075164 --- generator.py | 32 ++++++++++++++++++++++++++++++++ sanitytest.py | 2 ++ 2 files changed, 34 insertions(+) diff --git a/generator.py b/generator.py index 20df54f..cf044c9 100755 --- a/generator.py +++ b/generator.py @@ -821,6 +821,27 @@ def print_function_wrapper(module, name, output, export, include): return 0 return 1 +def print_c_pointer(classname, output, export, include): + output.write("PyObject *\n") + output.write("libvirt_%s_pointer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)\n" % classname) + output.write("{\n") + output.write(" %sPtr ptr;\n" % classname) + output.write(" PyObject *pyptr;\n") + output.write(" PyObject *pylong;\n") + output.write("\n") + output.write(" if (!PyArg_ParseTuple(args, (char *) \"O\", &pyptr))\n") + output.write(" return NULL;\n") + output.write(" ptr = (%sPtr) Py%s_Get(pyptr);\n" % (classname, classname)) + output.write(" pylong = PyLong_FromVoidPtr(ptr);\n") + output.write(" return pylong;\n") + output.write("}\n") + output.write("\n") + + include.write("PyObject *libvirt_%s_pointer(PyObject *self, PyObject *args);\n" % classname) + + export.write(" { (char *)\"%s_pointer\", libvirt_%s_pointer, METH_VARARGS, NULL },\n" % + (classname, classname)) + def buildStubs(module, api_xml): global py_types global py_return_types @@ -917,6 +938,12 @@ def buildStubs(module, api_xml): del funcs[function] if ret == 1: nb_wrap = nb_wrap + 1 + + if module == "libvirt": + # Write C pointer conversion functions. + for classname in primary_classes: + print_c_pointer(classname, wrapper, export, include) + include.close() export.close() wrapper.close() @@ -1496,6 +1523,11 @@ def buildWrappers(module): classes.write(" def domain(self):\n") classes.write(" return self._dom\n\n") + classes.write(" def c_pointer(self):\n") + classes.write(" \"\"\"Get C pointer to underlying object\"\"\"\n") + classes.write(" return libvirtmod.%s_pointer(self._o)\n\n" % + classname) + flist = function_classes[classname] flist.sort(key=functionSortKey) oldfile = "" diff --git a/sanitytest.py b/sanitytest.py index f5337fc..9907f3d 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -109,6 +109,8 @@ for klassname in gottypes: for name in dir(klassobj): if name[0] == '_': continue + if name == 'c_pointer': + continue thing = getattr(klassobj, name) if callable(thing): gotfunctions[klassname].append(name) -- 2.1.0

2 1

[libvirt] Waiting for review of [PATCH v2 2/21] hyperv: implementation of virConnectGetVersion
by Yves Vinter 12 Dec '14

12 Dec '14

Hi All, As I described the 27th of October in the following thread: https://www.redhat.com/archives/libvir-list/2014-October/msg00840.html [libvirt] [PATCH v2 0/21] hyperv: hyperv: set of new functionalities new functionalities has been implemented in the libvirt hyperv driver as a set of 21 patches. PATCH 01/21: hyperv: avoid query memleaks on failure PATCH 02/21: hyperv: implementation of virConnectGetVersion PATCH 03/21: hyperv: implementation of virConnectGetCapabilities PATCH 04/21: hyperv: implementation of virDomainGetVcpus and virConnectGetMaxVcpus PATCH 05/21: hyperv: implementation of virNodeGetFreeMemory PATCH 06/21: hyperv: implementation of virDomainShutdown and virDomainShutdownFlags PATCH 07/21: hyperv: implementation of virDomainGetSchedulerType and virDomainGetSchedulerParameters PATCH 08/21: hyperv: implementation of virNetworkLookupByName PATCH 09/21: hyperv: implementation of virNetworkGetXMLDesc PATCH 10/21: hyperv: implementation of virConnectNumOfNetworks and virConnectListNetworks PATCH 11/21: hyperv: implementation of virConnectNumOfDefinedNetworks and virConnectListDefinedNetworks PATCH 12/21: hyperv: implementation of hypervInvokeMethod to handle complex parameters PATCH 13/21: hyperv: implementation of virDomainSetAutostart and virDomainGetAutostart PATCH 14/21: hyperv: implementation of virDomainSetMaxMemory PATCH 15/21: hyperv: implementation of virDomainSetMemory and virDomainSetMemoryFlags PATCH 16/21: hyperv: implementation of virDomainSetVcpus and virDomainSetVcpusFlags PATCH 17/21: hyperv: implementation of virDomainUndefine and virDomainUndefineFlags PATCH 18/21: hyperv: implementation of internal function hypervDomainAttachDisk PATCH 19/21: hyperv: implementation of internal function hypervDomainAttachNetwork PATCH 20/21: hyperv: implementation of virDomainAttachDevice and virDomainAttachDeviceFlags PATCH 21/21: hyperv: implementation of virDomainDefineXML and virDomainCreateXML A first version of this set has been submitted the 8th of October. The first 3 patches have been already reviewed by Eric and the first patch has been pushed in the main stream. Based on the remarks after this 3 reviews, I will produce a V2 for the whole set of patches. It will be more convenient for me to submit V2 versions patch after patch, only after the previous one has been approved and pushed in the main branch. The V2 of patch 02/21 has been submitted the 27th of October here: https://www.redhat.com/archives/libvir-list/2014-October/msg00824.html [libvirt] [PATCH v2 2/21] hyperv: implementation of virConnectGetVersion I've not received any feedback since, and it has not been pushed in the main stream. Is there any issue? I'm still waiting for its approval before submitting the next patch... Thanks for you answer, Yves.

2 2

[libvirt] [PATCH] capabilities: Format <domain/> properly
by Michal Privoznik 12 Dec '14

12 Dec '14

The <domain/> element under /capabilities/guest/arch/ can have no child elements. If that's the case we format: <domain type='xen'> </domain> instead of simpler: <domain type='xen'/> This commit fixes that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 9 ++++++- tests/capabilityschemadata/caps-qemu-kvm.xml | 36 ++++++++++------------------ tests/capabilityschemadata/caps-test.xml | 6 ++--- tests/capabilityschemadata/caps-test2.xml | 6 ++--- tests/xencapsdata/xen-i686-pae-hvm.xml | 6 ++--- tests/xencapsdata/xen-i686-pae.xml | 3 +-- tests/xencapsdata/xen-i686.xml | 3 +-- tests/xencapsdata/xen-ia64-be-hvm.xml | 6 ++--- tests/xencapsdata/xen-ia64-be.xml | 3 +-- tests/xencapsdata/xen-ia64-hvm.xml | 6 ++--- tests/xencapsdata/xen-ia64.xml | 3 +-- tests/xencapsdata/xen-ppc64.xml | 3 +-- tests/xencapsdata/xen-x86_64-hvm.xml | 9 +++---- tests/xencapsdata/xen-x86_64.xml | 3 +-- 14 files changed, 39 insertions(+), 63 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 37d19c1..6c11a7f 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -969,8 +969,15 @@ virCapabilitiesFormatXML(virCapsPtr caps) } for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - virBufferAsprintf(&buf, "<domain type='%s'>\n", + virBufferAsprintf(&buf, "<domain type='%s'", caps->guests[i]->arch.domains[j]->type); + if (!caps->guests[i]->arch.domains[j]->info.emulator && + !caps->guests[i]->arch.domains[j]->info.loader && + !caps->guests[i]->arch.domains[j]->info.nmachines) { + virBufferAddLit(&buf, "/>\n"); + continue; + } + virBufferAddLit(&buf, ">\n"); virBufferAdjustIndent(&buf, 2); if (caps->guests[i]->arch.domains[j]->info.emulator) virBufferAsprintf(&buf, "<emulator>%s</emulator>\n", diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 55faa16..7055c7a 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -39,8 +39,7 @@ <machine canonical='pc-0.11' maxCpus='255'>pc</machine> <machine maxCpus='255'>pc-0.10</machine> <machine maxCpus='1'>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine maxCpus='255'>pc-0.11</machine> @@ -66,8 +65,7 @@ <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine>pc-0.11</machine> @@ -108,8 +106,7 @@ <machine>realview</machine> <machine>versatilepb</machine> <machine>versatileab</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -119,8 +116,7 @@ <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-aarch64</emulator> <machine>machvirt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -131,8 +127,7 @@ <emulator>/usr/bin/qemu-system-microblaze</emulator> <machine>petalogix-s3adsp1800</machine> <machine>microblaze-fdt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -143,8 +138,7 @@ <emulator>/usr/bin/qemu-system-microblazeel</emulator> <machine>petalogix-s3adsp1800</machine> <machine>microblaze-fdt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -158,8 +152,7 @@ <machine>magnum</machine> <machine>pica61</machine> <machine>mips</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -173,8 +166,7 @@ <machine>magnum</machine> <machine>pica61</machine> <machine>mips</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -195,8 +187,7 @@ <machine>SS-1000</machine> <machine>SS-2000</machine> <machine>SS-2</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -212,8 +203,7 @@ <machine>taihu</machine> <machine>mac99</machine> <machine>prep</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -223,8 +213,7 @@ <wordsize>32</wordsize> <emulator>/usr/bin/xenner</emulator> <machine>xenner</machine> - <domain type='kvm'> - </domain> + <domain type='kvm'/> </arch> <features> <pae/> @@ -240,8 +229,7 @@ <wordsize>64</wordsize> <emulator>/usr/bin/xenner</emulator> <machine>xenner</machine> - <domain type='kvm'> - </domain> + <domain type='kvm'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/capabilityschemadata/caps-test.xml b/tests/capabilityschemadata/caps-test.xml index 64f9bb6..da19961 100644 --- a/tests/capabilityschemadata/caps-test.xml +++ b/tests/capabilityschemadata/caps-test.xml @@ -43,8 +43,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/test-hv</emulator> - <domain type='test'> - </domain> + <domain type='test'/> </arch> <features> <pae/> @@ -57,8 +56,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/test-hv</emulator> - <domain type='test'> - </domain> + <domain type='test'/> </arch> <features> <pae/> diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilityschemadata/caps-test2.xml index a99c1b8..e676395 100644 --- a/tests/capabilityschemadata/caps-test2.xml +++ b/tests/capabilityschemadata/caps-test2.xml @@ -51,8 +51,7 @@ <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/libexec/qemu-kvm</emulator> <machine>pc-1.2</machine> @@ -94,8 +93,7 @@ <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/libexec/qemu-kvm</emulator> <machine>pc-1.2</machine> diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml index 872e5f6..cf6a1de 100644 --- a/tests/xencapsdata/xen-i686-pae-hvm.xml +++ b/tests/xencapsdata/xen-i686-pae-hvm.xml @@ -22,8 +22,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> @@ -37,8 +36,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml index 3dba6eb..c917fbe 100644 --- a/tests/xencapsdata/xen-i686-pae.xml +++ b/tests/xencapsdata/xen-i686-pae.xml @@ -22,8 +22,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml index 22d7685..5771e2b 100644 --- a/tests/xencapsdata/xen-i686.xml +++ b/tests/xencapsdata/xen-i686.xml @@ -19,8 +19,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <nonpae/> diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml index 222de1d..19d23e9 100644 --- a/tests/xencapsdata/xen-ia64-be-hvm.xml +++ b/tests/xencapsdata/xen-ia64-be-hvm.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> @@ -34,8 +33,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml index 017816c..78fa77e 100644 --- a/tests/xencapsdata/xen-ia64-be.xml +++ b/tests/xencapsdata/xen-ia64-be.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml index 33c4946..6e22372 100644 --- a/tests/xencapsdata/xen-ia64-hvm.xml +++ b/tests/xencapsdata/xen-ia64-hvm.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> @@ -31,8 +30,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml index 82ce965..9e3eaf4 100644 --- a/tests/xencapsdata/xen-ia64.xml +++ b/tests/xencapsdata/xen-ia64.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml index 91401b9..0132c45 100644 --- a/tests/xencapsdata/xen-ppc64.xml +++ b/tests/xencapsdata/xen-ppc64.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml index 8de8cf4..7458f0b 100644 --- a/tests/xencapsdata/xen-x86_64-hvm.xml +++ b/tests/xencapsdata/xen-x86_64-hvm.xml @@ -22,8 +22,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> @@ -34,8 +33,7 @@ <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> @@ -52,8 +50,7 @@ <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml index 0c3279b..b686432 100644 --- a/tests/xencapsdata/xen-x86_64.xml +++ b/tests/xencapsdata/xen-x86_64.xml @@ -22,8 +22,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> -- 2.0.4

2 1

[libvirt] [PATCH 0/3] parallels: a set of fixes for nova
by Dmitry Guryanov 12 Dec '14

12 Dec '14

Hello, This 3 patches fix different things, used by nova. Dmitry Guryanov (3): parallels: support NULL virDomainVideoAccelDefPtr parallels: set format for real disk devices parallels: use disk name to set disk index src/parallels/parallels_sdk.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) -- 1.9.3

4 14

[libvirt] [PATCH v3] qemu: avoid rare race when undefining domain
by Martin Kletzander 12 Dec '14

12 Dec '14

When one domain is being undefined and at the same time started, for example, there is a possibility of a rare problem occuring. - Thread 1 does virDomainUndefine(), has the lock, checks that the domain is active and because it's not, calls virDomainObjListRemove(). - Thread 2 does virDomainCreate() and tries to lock the domain. - Thread 1 needs to lock domain list in order to remove the domain from it, but must unlock domain first (proper order is to lock domain list first and the domain itself second). - Thread 2 grabs the lock, starts the domain and releases the lock. - Thread 1 grabs the lock and removes the domain from list. With this patch: - The undefining domain gets marked as "to undefine" before it is unlocked. - If domain is found in any of the search APIs, it's returned only if it is not marked as "to undefine". The check is done while the domain is locked. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1150505 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I marked this as v3, but it is basically a resend of v1 [1] with s/undefining/removing/ change. I'm sending this even though the second version of the patch got in again because the v2 that we pushed didn't help. I got convinced [2] that doing this with a job fixes it, but it doesn't, it just serializes the Create API after the Undefine API. The only difference that the commit b629c64e [3] does is that it waits on obtaining job, but not on locking the domain. That previous commit can be reverted if anyone wants, I see almost no point in it being there now. [1] http://www.redhat.com/archives/libvir-list/2014-October/msg01055.html [2] http://www.redhat.com/archives/libvir-list/2014-October/msg01115.html [3] http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=b629c64e src/conf/domain_conf.c | 22 +++++++++++++++++++--- src/conf/domain_conf.h | 1 + 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ec45b8c..8e08407 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1062,8 +1062,13 @@ virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, virDomainObjPtr obj; virObjectLock(doms); obj = virHashSearch(doms->objs, virDomainObjListSearchID, &id); - if (obj) + if (obj) { virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + obj = NULL; + } + } virObjectUnlock(doms); return obj; } @@ -1079,8 +1084,13 @@ virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, virUUIDFormat(uuid, uuidstr); obj = virHashLookup(doms->objs, uuidstr); - if (obj) + if (obj) { virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + obj = NULL; + } + } virObjectUnlock(doms); return obj; } @@ -1105,8 +1115,13 @@ virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, virDomainObjPtr obj; virObjectLock(doms); obj = virHashSearch(doms->objs, virDomainObjListSearchName, name); - if (obj) + if (obj) { virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + obj = NULL; + } + } virObjectUnlock(doms); return obj; } @@ -2551,6 +2566,7 @@ void virDomainObjListRemove(virDomainObjListPtr doms, { char uuidstr[VIR_UUID_STRING_BUFLEN]; + dom->removing = true; virUUIDFormat(dom->def->uuid, uuidstr); virObjectRef(dom); virObjectUnlock(dom); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e10b3c5..75e3d2a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2187,6 +2187,7 @@ struct _virDomainObj { unsigned int autostart : 1; unsigned int persistent : 1; unsigned int updated : 1; + unsigned int removing : 1; virDomainDefPtr def; /* The current definition */ virDomainDefPtr newDef; /* New definition to activate at shutdown */ -- 2.2.0

2 2

[libvirt] [PATCH] qemu: Allow system pages to <memoryBacking/>
by Michal Privoznik 12 Dec '14

12 Dec '14

It occurred to me that OpenStack uses the following XML when not using regular huge pages: <memoryBacking> <hugepages> <page size='4' unit='KiB'/> </hugepages> </memoryBacking> However, since we are expecting to see huge pages only, we fail to startup the domain with following error: libvirtError: internal error: Unable to find any usable hugetlbfs mount for 4 KiB While regular system pages are not huge pages technically, our code is prepared for that and if it helps OpenStack (or other management applications) we should cope with that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 84 +++++++++++++--------- .../qemuxml2argv-hugepages-pages6.args | 4 ++ .../qemuxml2argv-hugepages-pages6.xml | 32 +++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 87 insertions(+), 34 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 48bdf4e..c44560f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6616,6 +6616,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, char *nodemask = NULL; char *mem_path = NULL; int ret = -1; + const long system_page_size = sysconf(_SC_PAGESIZE); if (virDomainNumatuneHasPerNodeBinding(def->numatune) && !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) || @@ -6626,7 +6627,8 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, goto cleanup; } - if (def->mem.nhugepages && def->mem.hugepages[0].size && + if (def->mem.nhugepages && + def->mem.hugepages[0].size != system_page_size && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("huge pages per NUMA node are not " @@ -6720,6 +6722,13 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, hugepage = master_hugepage; } + if (hugepage && hugepage->size == system_page_size) { + /* However, if user specified to use "huge" page + * of regular system page size, it's as if they + * hasn't specified any huge pages at all. */ + hugepage = NULL; + } + if (hugepage) { /* Now lets see, if the huge page we want to use is even mounted * and ready to use */ @@ -7882,44 +7891,51 @@ qemuBuildCommandLine(virConnectPtr conn, def->mem.max_balloon = VIR_DIV_UP(def->mem.max_balloon, 1024) * 1024; virCommandAddArgFormat(cmd, "%llu", def->mem.max_balloon / 1024); if (def->mem.nhugepages && (!def->cpu || !def->cpu->ncells)) { - char *mem_path; + const long system_page_size = sysconf(_SC_PAGESIZE) / 1024; + char *mem_path = NULL; - if (!cfg->nhugetlbfs) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("hugetlbfs filesystem is not mounted " - "or disabled by administrator config")); - goto error; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_PATH)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("hugepage backing not supported by '%s'"), - def->emulator); - goto error; - } - - if (def->mem.hugepages[0].size) { - for (j = 0; j < cfg->nhugetlbfs; j++) { - if (cfg->hugetlbfs[j].size == def->mem.hugepages[0].size) - break; - } - - if (j == cfg->nhugetlbfs) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find any usable hugetlbfs mount for %llu KiB"), - def->mem.hugepages[0].size); - goto error; - } - - if (!(mem_path = qemuGetHugepagePath(&cfg->hugetlbfs[j]))) - goto error; + if (def->mem.hugepages[0].size == system_page_size) { + /* There is one special case: if user specified "huge" + * pages of regular system pages size. */ } else { - if (!(mem_path = qemuGetDefaultHugepath(cfg->hugetlbfs, - cfg->nhugetlbfs))) + if (!cfg->nhugetlbfs) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("hugetlbfs filesystem is not mounted " + "or disabled by administrator config")); goto error; + } + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_PATH)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("hugepage backing not supported by '%s'"), + def->emulator); + goto error; + } + + if (def->mem.hugepages[0].size) { + for (j = 0; j < cfg->nhugetlbfs; j++) { + if (cfg->hugetlbfs[j].size == def->mem.hugepages[0].size) + break; + } + + if (j == cfg->nhugetlbfs) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find any usable hugetlbfs mount for %llu KiB"), + def->mem.hugepages[0].size); + goto error; + } + + if (!(mem_path = qemuGetHugepagePath(&cfg->hugetlbfs[j]))) + goto error; + } else { + if (!(mem_path = qemuGetDefaultHugepath(cfg->hugetlbfs, + cfg->nhugetlbfs))) + goto error; + } } - virCommandAddArgList(cmd, "-mem-prealloc", "-mem-path", - mem_path, NULL); + virCommandAddArg(cmd, "-mem-prealloc"); + if (mem_path) + virCommandAddArgList(cmd, "-mem-path", mem_path, NULL); VIR_FREE(mem_path); } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args new file mode 100644 index 0000000..4eccb86 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 1024 -mem-prealloc -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml new file mode 100644 index 0000000..4f318fd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>SomeDummyHugepagesGuest</name> + <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <memoryBacking> + <hugepages> + <page size='4' unit='KiB'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9e39068..bce88a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -713,6 +713,7 @@ mymain(void) DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH); + DO_TEST("hugepages-pages6", NONE); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, -- 2.0.4

2 1

[libvirt] [PATCH] conf: Ignore device address for model=none usb controller and memballon
by Luyao Huang 12 Dec '14

12 Dec '14

It make no sense at all to have it there. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ec45b8c..2965d8d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6683,8 +6683,12 @@ virDomainControllerDefParseXML(xmlNodePtr node, _("Malformed 'max_sectors' value %s'"), max_sectors); } - if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { + VIR_DEBUG("Ignoring device address for none model usb controller"); + } else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) { goto error; + } switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: { @@ -9989,7 +9993,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, goto error; } - if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) + if (def->model == VIR_DOMAIN_MEMBALLOON_MODEL_NONE) + VIR_DEBUG("Ignoring device address for none model Memballoon"); + else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; cleanup: -- 1.8.3.1

2 3

[libvirt] [PATCH v4 00/17] LXC IP configuration feature
by Cédric Bosdonnat 12 Dec '14

12 Dec '14

Hi all, Here is an updated version of the lxc IP configuration patch series. Diffs to v3: * Took care of Daniel's feedback * Fixed openvz driver to add support for multiple --ipadd * Report an error for drivers using IP addresses, but only the first one in case there are more provided. * Squashed Patch 11 to have virDomainNetIpsFormat right in the first place * Fixed regression introduced in qemuConnectDomainXMLToNative: IPs were not kept over memset for bridge type. * Reformatted to fit latest make syntax-check changes Cédric Bosdonnat (17): Forgot to cleanup ifname_guest* in domain network def parsing Domain conf: allow more than one IP address for net devices LXC: set IP addresses to veth devices in the container lxc conf2xml: convert IP addresses Allow network capabilities hostdev to configure IP addresses lxc conf2xml: convert ip addresses for hostdev NICs Domain network devices can now have a <gateway> element lxc conf2xml: convert lxc.network.ipv[46].gateway LXC: use the new net devices gateway definition LXC: honour network devices link state virNetDevSetIPv4Address: libnl implementation Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress virNetDevAddRoute: implementation using netlink virNetDevClearIPv4Address: netlink implementation Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress Openvz --ipadd can be provided multiple times Report error if a driver can't handle multiple IP addresses docs/formatdomain.html.in | 39 +++ docs/schemas/domaincommon.rng | 65 ++++- src/conf/domain_conf.c | 251 +++++++++++++++-- src/conf/domain_conf.h | 21 +- src/libvirt_private.syms | 6 +- src/lxc/lxc_container.c | 69 ++++- src/lxc/lxc_native.c | 165 +++++++---- src/network/bridge_driver.c | 4 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 11 +- src/qemu/qemu_driver.c | 29 +- src/qemu/qemu_hotplug.c | 5 +- src/uml/uml_conf.c | 2 +- src/util/virnetdev.c | 305 ++++++++++++++++++--- src/util/virnetdev.h | 12 +- src/util/virnetlink.c | 38 +++ src/util/virnetlink.h | 2 + src/util/virsocketaddr.h | 3 + src/vbox/vbox_common.c | 16 +- src/xenconfig/xen_common.c | 29 +- src/xenconfig/xen_sxpr.c | 26 +- .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 4 + tests/lxcxml2xmldata/lxc-hostdev.xml | 4 + tests/lxcxml2xmldata/lxc-idmap.xml | 3 + tests/openvzutilstest.c | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- 30 files changed, 963 insertions(+), 166 deletions(-) -- 2.1.2

4 25

[libvirt] [PATCH] CVE-2014-8131: Fix possible deadlock and segfault in qemuConnectGetAllDomainStats()
by Martin Kletzander 11 Dec '14

11 Dec '14

When user doesn't have read access on one of the domains he requested, the for loop could exit abruptly or continue and override pointer which pointed to locked object. This patch fixed two issues at once. One is that domflags might have had QEMU_DOMAIN_STATS_HAVE_JOB even when there was no job started (this is fixed by doing domflags |= QEMU_DOMAIN_STATS_HAVE_JOB only when the job was acquired and cleaning domflags on every start of the loop. Second one is that the domain is kept locked when virConnectGetAllDomainStatsCheckACL() fails and continues the loop when it didn't end. Adding a simple virObjectUnlock() and clearing the pointer ought to do. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Since this is very low priority and it was mistakenly disclosed in another patch there is no embargo on this CVE. Patches to maint branches will be pushed after back-porting (couple of minutes). Having said that, I am probably not the right one to write up the libvirt security notice, but I'll try drafting one, eventually. src/qemu/qemu_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be37c8f..ae6225b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18740,20 +18740,23 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, privflags |= QEMU_DOMAIN_STATS_HAVE_JOB; for (i = 0; i < ndoms; i++) { - domflags = privflags; virDomainStatsRecordPtr tmp = NULL; + domflags = 0; if (!(dom = qemuDomObjFromDomain(doms[i]))) continue; if (doms != domlist && - !virConnectGetAllDomainStatsCheckACL(conn, dom->def)) + !virConnectGetAllDomainStatsCheckACL(conn, dom->def)) { + virObjectUnlock(dom); + dom = NULL; continue; + } - if (HAVE_JOB(domflags) && + if (HAVE_JOB(privflags) && qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0) /* As it was never requested. Gather as much as possible anyway. */ - domflags &= ~QEMU_DOMAIN_STATS_HAVE_JOB; + domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0) goto endjob; @@ -18761,9 +18764,12 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, if (tmp) tmpstats[nstats++] = tmp; - if (HAVE_JOB(domflags) && !qemuDomainObjEndJob(driver, dom)) { - dom = NULL; - continue; + if (HAVE_JOB(domflags)) { + domflags = 0; + if (!qemuDomainObjEndJob(driver, dom)) { + dom = NULL; + continue; + } } virObjectUnlock(dom); -- 2.2.0

2 3

[libvirt] [PATCH] qemu: bulk stats: typo in monitor handling
by Francesco Romani 11 Dec '14

11 Dec '14

A typo in qemuConnectGetAllDomainStats makes the code mark the monitor as available when qemuDomainObjBeginJob fails, instead of when it succeeds, as the correct flow requires. This patch fixes the check and updates the code documentation accordingly. Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 830fca7..129e10c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18745,9 +18745,12 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, } if (HAVE_JOB(privflags) && - qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0) - /* As it was never requested. Gather as much as possible anyway. */ + qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) == 0) domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; + /* + * else: as it was never requested. + * Gather as much as possible anyway. + */ if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0) goto endjob; -- 1.9.3

4 3

[libvirt] [PATCH] qemu: bulk stats: Clean up code to check whether we need a domain job
by Peter Krempa 11 Dec '14

11 Dec '14

Storing the information as a flag in a unsigned int seems a bit wasteful. Store it in a bool instead. --- src/qemu/qemu_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index df3ba6d..5c60127 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18691,7 +18691,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, int nstats = 0; size_t i; int ret = -1; - unsigned int privflags = 0; + bool needjob; unsigned int domflags = 0; if (ndoms) @@ -18727,8 +18727,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, if (VIR_ALLOC_N(tmpstats, ndoms + 1) < 0) goto cleanup; - if (qemuDomainGetStatsNeedMonitor(stats)) - privflags |= QEMU_DOMAIN_STATS_HAVE_JOB; + bool needjob = qemuDomainGetStatsNeedMonitor(stats); for (i = 0; i < ndoms; i++) { virDomainStatsRecordPtr tmp = NULL; @@ -18744,7 +18743,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, continue; } - if (HAVE_JOB(privflags) && + if (needjob && qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) == 0) domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; /* else: without a job it's still possible to gather some data */ -- 2.2.0

2 1

Re: [libvirt] [virt-tools-list] [PATCH] virtinst: refresh pools status before fetch_pools
by Chun Yan Liu 11 Dec '14

11 Dec '14

>>> On 12/5/2014 at 09:54 PM, in message <5481B907.4040507(a)redhat.com>, Cole Robinson <crobinso(a)redhat.com> wrote: > On 12/05/2014 03:40 AM, Chunyan Liu wrote: > > Currently, when connecting to hypervisor, if there are pools active > > but in fact target path already deleted (or for other reasons the > > pool is not working), libvirtd not refresh status yet, fetch_pools > > will fail, that will cause "connecting to hypervisor" process > > reporting error and exit. The whole connection work failed. > > > > With the patch, always refresh pool status before fetch pools. Let > > the libvirtd pool status reflect the reality, avoid the non-synced > > status affects the hypervisor connection. > > > > Signed-off-by: Chunyan Liu <cyliu(a)suse.com> > > --- > > virtinst/pollhelpers.py | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > > > diff --git a/virtinst/pollhelpers.py b/virtinst/pollhelpers.py > > index a9b1527..e8702f0 100644 > > --- a/virtinst/pollhelpers.py > > +++ b/virtinst/pollhelpers.py > > @@ -133,6 +133,19 @@ def fetch_pools(backend, origmap, build_func): > > > > if backend.check_support( > > backend.SUPPORT_CONN_LISTALLSTORAGEPOOLS) and not > _force_old_poll: > > + > > + # Refresh pools before poll_helper. For those > > + # 'active' but target path not exist (or other reasons > > + # causing the pool not working), but libvirtd not > > + # refresh the status, this will make it refreshed > > + # and mark that pool as 'inactive'. > > + objs = backend.listAllStoragePools() > > + for obj in objs: > > + try: > > + obj.refresh(0) > > + except Exception, e: > > + pass > > + > > return _new_poll_helper(origmap, name, > > backend.listAllStoragePools, build_func) > > else: > > > > This is a very heavy hammer, refresh is a potentially long running operation > > so this could cause decent slowdown in some scenarios. > > IMO this is essentially a libvirt bug, for pools with target directories > (dir, > fs, netfs), libvirt should be periodically checking the directory ctime and > doing the pool refresh for us. And if the target has disappeared, it shuts > down the pool (like shutting down a VM if it crashes). Hi, libvirt list, I'm not sure if Cole's suggestion could be done in libvirt, so just forward the mail to libvirt mailing list. Any opinions? Chunyan > > We have so many hacks sprinkled around in virtinst/virt-manager dealing with > the fallout of this lacking libvirt feature. Really wish I had implemented > it > years ago. But I'd rather focus on that then adding yet more hacks. > > If there's a specific issue you're hitting that's manifesting itself > elsewhere > in the app, let us know and maybe there's a way to mitigate it in the > interim > > - Cole > > _______________________________________________ > virt-tools-list mailing list > virt-tools-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/virt-tools-list > >

3 2

[libvirt] [PATCHv3 0/2] Fix snapshot-revert and managedsave with host-passthrough CPU mode
by Ján Tomko 11 Dec '14

11 Dec '14

v1: https://www.redhat.com/archives/libvir-list/2014-October/msg01120.html v2: https://www.redhat.com/archives/libvir-list/2014-November/msg00218.html v3: * do not format the features at all, instead of adding a model to them Ján Tomko (2): Do not format CPU features without a model Ignore CPU features without a model for host-passthrough src/conf/cpu_conf.c | 7 ++- ...argv-cpu-host-passthrough-features-invalid.args | 22 +++++++++ ...2argv-cpu-host-passthrough-features-invalid.xml | 55 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.xml -- 2.0.4

2 4

[libvirt] [PATCH] storage: unify permission formatting
by Martin Kletzander 11 Dec '14

11 Dec '14

Volume and pool formatting functions took different approaches to unspecified uids/gids. When unknown, it is always parsed as -1, but one of the functions formatted it as unsigned int (wrong) and one as int (better). Due to that, our two of our XML files from tests cannot be parsed on 32-bit machines. RNG schema needs to be modified as well, but because both storagepool.rng and storagevol.rng need same schema for permission element, save some space by moving it to storagecommon.rng. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/storagecommon.rng | 29 +++++++++++++++++++++++++ docs/schemas/storagepool.rng | 30 +------------------------- docs/schemas/storagevol.rng | 23 -------------------- src/conf/storage_conf.c | 9 ++++---- tests/storagevolxml2xmlout/vol-gluster-dir.xml | 4 ++-- tests/storagevolxml2xmlout/vol-sheepdog.xml | 4 ++-- 6 files changed, 38 insertions(+), 61 deletions(-) diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index 06b2f81..629505f 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -93,4 +93,33 @@ <notAllowed/> </define> + <define name='permissions'> + <optional> + <element name='permissions'> + <interleave> + <element name='mode'> + <ref name='octalMode'/> + </element> + <element name='owner'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <element name='group'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </interleave> + </element> + </optional> + </define> + </grammar> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 0f05c5c..db6ff49 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -3,6 +3,7 @@ <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <include href='basictypes.rng'/> + <include href='storagecommon.rng'/> <start> <ref name='pool'/> </start> @@ -224,35 +225,6 @@ </interleave> </define> - <define name='permissions'> - <optional> - <element name='permissions'> - <interleave> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <element name='group'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> - </interleave> - </element> - </optional> - </define> - <define name='target'> <element name='target'> <interleave> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 1b2d4cc..7450547 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -59,29 +59,6 @@ </interleave> </define> - <define name='permissions'> - <optional> - <element name='permissions'> - <interleave> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <ref name='unsignedInt'/> - </element> - <element name='group'> - <ref name='unsignedInt'/> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> - </interleave> - </element> - </optional> - </define> - <define name='timestamps'> <optional> <element name='timestamps'> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 3987470..e1be064 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1203,7 +1203,6 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) (int) def->target.perms.uid); virBufferAsprintf(&buf, "<group>%d</group>\n", (int) def->target.perms.gid); - virBufferEscapeString(&buf, "<label>%s</label>\n", def->target.perms.label); @@ -1527,10 +1526,10 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAsprintf(buf, "<mode>0%o</mode>\n", def->perms->mode); - virBufferAsprintf(buf, "<owner>%u</owner>\n", - (unsigned int) def->perms->uid); - virBufferAsprintf(buf, "<group>%u</group>\n", - (unsigned int) def->perms->gid); + virBufferAsprintf(buf, "<owner>%d</owner>\n", + (int) def->perms->uid); + virBufferAsprintf(buf, "<group>%d</group>\n", + (int) def->perms->gid); virBufferEscapeString(buf, "<label>%s</label>\n", diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storagevolxml2xmlout/vol-gluster-dir.xml index f188ceb..538b31d 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir.xml @@ -10,8 +10,8 @@ <format type='dir'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index e08e36c..0a1f32c 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -9,8 +9,8 @@ <format type='unknown'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> -- 2.2.0

2 2

[libvirt] [PATCHv4 2/2] security: Add a new func use stat to get process DAC label
by Luyao Huang 11 Dec '14

11 Dec '14

When use qemuProcessAttach to attach a qemu process, cannot get a right DAC label. Add a new func to get process label via stat func. Do not remove virDomainDefGetSecurityLabelDef before try to use stat to get process DAC label, because There are some other func call virSecurityDACGetProcessLabel. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2 add support freeBSD. v3 use snprintf instead of VirAsprintf and move the error settings in virSecurityDACGetProcessLabelInternal. v4 remove errno.h include and thanks Eric advice move this version comment to this place. src/security/security_dac.c | 84 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 85253af..300b245 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -23,6 +23,11 @@ #include <sys/stat.h> #include <fcntl.h> +#ifdef __FreeBSD__ +# include <sys/sysctl.h> +# include <sys/user.h> +#endif + #include "security_dac.h" #include "virerror.h" #include "virfile.h" @@ -1236,17 +1241,90 @@ virSecurityDACReserveLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, return 0; } +#ifdef __linux__ +static int +virSecurityDACGetProcessLabelInternal(pid_t pid, + virSecurityLabelPtr seclabel) +{ + struct stat sb; + char *path = NULL; + int ret = -1; + + VIR_INFO("Getting DAC user and group on process '%d'", pid); + + if (virAsprintf(&path, "/proc/%d", (int) pid) < 0) + goto cleanup; + + if (lstat(path, &sb) < 0) { + virReportSystemError(errno, + _("unable to get PID %d uid and gid via stat"), + pid); + goto cleanup; + } + + snprintf(seclabel->label, VIR_SECURITY_LABEL_BUFLEN, + "+%u:+%u", (unsigned int) sb.st_uid, (unsigned int) sb.st_gid); + ret = 0; + +cleanup: + VIR_FREE(path); + return ret; +} +#elif defined(__FreeBSD__) +static int +virSecurityDACGetProcessLabelInternal(pid_t pid, + virSecurityLabelPtr seclabel) +{ + struct kinfo_proc p; + int mib[4]; + size_t len = 4; + + sysctlnametomib("kern.proc.pid", mib, &len); + + len = sizeof(struct kinfo_proc); + mib[3] = pid; + + if (sysctl(mib, 4, &p, &len, NULL, 0) < 0) { + virReportSystemError(errno, + _("unable to get PID %d uid and gid via sysctl"), + pid); + return -1; + } + + snprintf(seclabel->label, VIR_SECURITY_LABEL_BUFLEN, + "+%u:+%u", (unsigned int) p.ki_ruid, (unsigned int) p.ki_rgid); + + return 0; +} +#else +static int +virSecurityDACGetProcessLabelInternal(pid_t pid, + virSecurityLabelPtr seclabel) +{ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + "Cannot get proccess DAC label for pid %d on this platform", + (int) pid); + return -1; +} +#endif + static int virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr def, - pid_t pid ATTRIBUTE_UNUSED, + pid_t pid, virSecurityLabelPtr seclabel) { virSecurityLabelDefPtr secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - if (!secdef || !seclabel) - return -1; + if (secdef == NULL) { + VIR_DEBUG("missing label for DAC security " + "driver in domain %s", def->name); + + if (virSecurityDACGetProcessLabelInternal(pid, seclabel) < 0) + return -1; + return 0; + } if (secdef->label) ignore_value(virStrcpy(seclabel->label, secdef->label, -- 1.8.3.1

3 2