- Devel - libvirt List Archives

[libvirt] [PATCH] nwfilter: fix crash when adding non-existing nwfilter
by Pavel Hrdina 02 Dec '14

02 Dec '14

Adding non-existing nwfilter to a network interface device without any nwfilter specified will crash libvirt daemon with segfault. The reason is that the nwfilter is not found an libvirt will try to restore old nwfilter configuration but there is no nwfilter specified. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/nwfilter_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 074d745..317792e 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2778,7 +2778,7 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) for (i = 0; i < nwfilters->count; i++) { virNWFilterObjLock(nwfilters->objs[i]); - if (STREQ(nwfilters->objs[i]->def->name, name)) + if (STREQ_NULLABLE(nwfilters->objs[i]->def->name, name)) return nwfilters->objs[i]; virNWFilterObjUnlock(nwfilters->objs[i]); } -- 2.0.4

2 2

[libvirt] [PATCH] qemu: add tun devices to cgroup ACL
by rongqing.li＠windriver.com 02 Dec '14

02 Dec '14

From: Roy Li <rongqing.li(a)windriver.com> When systemd is used as init, CGroup will be enabled by default, and lead to virsh unable to start VM(which is using the tun/tap), since virsh can not access /dev/net/tun device Signed-off-by: Roy Li <rongqing.li(a)windriver.com> --- src/qemu/qemu.conf | 3 ++- src/qemu/qemu_cgroup.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..225cd0f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -272,7 +272,8 @@ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", # "/dev/ptmx", "/dev/kvm", "/dev/kqemu", -# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio" +# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", +# "/dev/net/tun" #] # # RDMA migration requires the following extra files to be added to the list: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 0e94cae..7c15c07 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -45,7 +45,7 @@ static const char *const defaultDeviceACL[] = { "/dev/random", "/dev/urandom", "/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio", - NULL, + "/dev/net/tun", NULL, }; #define DEVICE_PTY_MAJOR 136 #define DEVICE_SND_MAJOR 116 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 30fd27e..2ab7a8d 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -48,6 +48,7 @@ module Test_libvirtd_qemu = { "9" = "/dev/rtc" } { "10" = "/dev/hpet" } { "11" = "/dev/vfio/vfio" } + { "12" = "/dev/net/tun" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } -- 2.1.0

2 1

[libvirt] [PATCH] conf: fix a comment typo in virDomainVideoDefaultRAM
by Wang Rui 02 Dec '14

02 Dec '14

Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe9b986..2d81c37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10221,7 +10221,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, return 4 * 1024; case VIR_DOMAIN_VIDEO_TYPE_QXL: - /* QEMU use 64M as the minimal video video memory for qxl device */ + /* QEMU use 64M as the minimal video memory for qxl device */ return 64 * 1024; default: -- 1.7.12.4

2 1

[libvirt] [PATCH] libvirt.c: Move virDomainGetFSInfo to libvirt-domain.c
by Michal Privoznik 02 Dec '14

02 Dec '14

Since our big split of libvirt.c there are only a few functions living there. The majority was moved to corresponding subfile, e.g. domain functions were moved to libvirt-domain.c. However, the patches for virDomainGetFSInfo() and virDomainFSInfoFree() introduction were posted prior the big split and merged after. This resulted in two domain functions landing in wrong file. Move them to the correct one. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt.c | 67 ---------------------------------------------------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2b0defc..01bd9e4 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11111,3 +11111,70 @@ virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats) VIR_FREE(stats); } + + +/** + * virDomainGetFSInfo: + * @dom: a domain object + * @info: a pointer to a variable to store an array of mount points information + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Get a list of mapping information for each mounted file systems within the + * specified guest and the disks. + * + * Returns the number of returned mount points, or -1 in case of error. + * On success, the array of the information is stored into @info. The caller is + * responsible for calling virDomainFSInfoFree() on each array element, then + * calling free() on @info. On error, @info is set to NULL. + */ +int +virDomainGetFSInfo(virDomainPtr dom, + virDomainFSInfoPtr **info, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(dom, "info=%p, flags=%x", info, flags); + + virResetLastError(); + + virCheckDomainReturn(dom, -1); + virCheckReadOnlyGoto(dom->conn->flags, error); + virCheckNonNullArgGoto(info, error); + *info = NULL; + + if (dom->conn->driver->domainGetFSInfo) { + int ret = dom->conn->driver->domainGetFSInfo(dom, info, flags); + if (ret < 0) + goto error; + return ret; + } + + virReportUnsupportedError(); + + error: + virDispatchError(dom->conn); + return -1; +} + + +/** + * virDomainFSInfoFree: + * @info: pointer to a FSInfo object + * + * Frees all the memory occupied by @info. + */ +void +virDomainFSInfoFree(virDomainFSInfoPtr info) +{ + size_t i; + + if (!info) + return; + + VIR_FREE(info->mountpoint); + VIR_FREE(info->name); + VIR_FREE(info->fstype); + + for (i = 0; i < info->ndevAlias; i++) + VIR_FREE(info->devAlias[i]); + VIR_FREE(info->devAlias); +} diff --git a/src/libvirt.c b/src/libvirt.c index 86b0daa..d51c014 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1400,73 +1400,6 @@ virConnectOpenAuth(const char *name, } -/** - * virDomainGetFSInfo: - * @dom: a domain object - * @info: a pointer to a variable to store an array of mount points information - * @flags: extra flags; not used yet, so callers should always pass 0 - * - * Get a list of mapping information for each mounted file systems within the - * specified guest and the disks. - * - * Returns the number of returned mount points, or -1 in case of error. - * On success, the array of the information is stored into @info. The caller is - * responsible for calling virDomainFSInfoFree() on each array element, then - * calling free() on @info. On error, @info is set to NULL. - */ -int -virDomainGetFSInfo(virDomainPtr dom, - virDomainFSInfoPtr **info, - unsigned int flags) -{ - VIR_DOMAIN_DEBUG(dom, "info=%p, flags=%x", info, flags); - - virResetLastError(); - - virCheckDomainReturn(dom, -1); - virCheckReadOnlyGoto(dom->conn->flags, error); - virCheckNonNullArgGoto(info, error); - *info = NULL; - - if (dom->conn->driver->domainGetFSInfo) { - int ret = dom->conn->driver->domainGetFSInfo(dom, info, flags); - if (ret < 0) - goto error; - return ret; - } - - virReportUnsupportedError(); - - error: - virDispatchError(dom->conn); - return -1; -} - - -/** - * virDomainFSInfoFree: - * @info: pointer to a FSInfo object - * - * Frees all the memory occupied by @info. - */ -void -virDomainFSInfoFree(virDomainFSInfoPtr info) -{ - size_t i; - - if (!info) - return; - - VIR_FREE(info->mountpoint); - VIR_FREE(info->name); - VIR_FREE(info->fstype); - - for (i = 0; i < info->ndevAlias; i++) - VIR_FREE(info->devAlias[i]); - VIR_FREE(info->devAlias); -} - - /** * virConnectClose: -- 2.0.4

2 1

[libvirt] [libvirt-python PATCH] override: iterate virDomainFSInfo.devAliases using ndevAliases
by Tomoki Sekiyama 02 Dec '14

02 Dec '14

Currently devAliases in virDomainFSInfo struct are iterated as a NULL-terminated list, but that is not guaranteed. It should use ndevAliases which stores the number of the items in devAliases. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> --- libvirt-override.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 7ef66b7..e51c44d 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8334,8 +8334,8 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *pyobj_domain; unsigned int flags; virDomainFSInfoPtr *fsinfo = NULL; - char **dev; int c_retval, i; + size_t j; PyObject *py_retval = NULL; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainFSInfo", @@ -8373,8 +8373,9 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(fs->fstype)); PyTuple_SetItem(info, 3, alias); - for (dev = fs->devAlias; dev && *dev; dev++) - if (PyList_Append(alias, libvirt_constcharPtrWrap(*dev)) < 0) + for (j = 0; j < fs->ndevAlias; j++) + if (PyList_Append(alias, + libvirt_constcharPtrWrap(fs->devAlias[j])) < 0) goto cleanup; }

2 1

[libvirt] [PATCH] Fix race condition in qemuGetProcessInfo
by Eduardo Costa 01 Dec '14

01 Dec '14

There is a race condition between the fopen and fscanf calls in qemuGetProcessInfo. If fopen succeeds, there is a small possibility that the file no longer exists before reading from it. Now, if either fopen or fscanf calls fail, the function will behave just as only fopen had failed. --- src/qemu/qemu_driver.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ad5f70a..9ab1a81 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1310,9 +1310,9 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, { char *proc; FILE *pidinfo; - unsigned long long usertime, systime; - long rss; - int cpu; + unsigned long long usertime = 0, systime = 0; + long rss = 0; + int cpu = 0; int ret; /* In general, we cannot assume pid_t fits in int; but /proc parsing @@ -1324,33 +1324,24 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, if (ret < 0) return -1; - if (!(pidinfo = fopen(proc, "r"))) { - /* VM probably shut down, so fake 0 */ - if (cpuTime) - *cpuTime = 0; - if (lastCpu) - *lastCpu = 0; - if (vm_rss) - *vm_rss = 0; - VIR_FREE(proc); - return 0; - } + pidinfo = fopen(proc, "r"); VIR_FREE(proc); /* See 'man proc' for information about what all these fields are. We're * only interested in a very few of them */ - if (fscanf(pidinfo, - /* pid -> stime */ - "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" - /* cutime -> endcode */ - "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" - /* startstack -> processor */ - "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", - &usertime, &systime, &rss, &cpu) != 4) { + if (pidinfo) { + if (fscanf(pidinfo, + /* pid -> stime */ + "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" + /* cutime -> endcode */ + "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" + /* startstack -> processor */ + "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", + &usertime, &systime, &rss, &cpu) != 4) { + VIR_WARN("cannot parse process status data"); + usertime = systime = 0; rss = 0; cpu = 0; + } VIR_FORCE_FCLOSE(pidinfo); - VIR_WARN("cannot parse process status data"); - errno = -EINVAL; - return -1; } /* We got jiffies @@ -1374,8 +1365,6 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", (int) pid, tid, usertime, systime, cpu, rss); - VIR_FORCE_FCLOSE(pidinfo); - return 0; } -- 1.7.9.5

2 1

[libvirt] [PATCH] qemu: Use AAVMF as UEFI default on ARMs
by Michal Privoznik 01 Dec '14

01 Dec '14

One of the things I've spotted while playing with OVMF is, that on different architectures the OVMF firmware has different names. Like arm and aarch64: it's AAVMF_{CODE,VARS}.fd. We should reflect that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu.conf | 5 ++++- src/qemu/qemu_conf.c | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..36cacf9 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -507,5 +507,8 @@ # a list of strings when a single item is in form of: # ${PATH_TO_UEFI_FW}:${PATH_TO_UEFI_VARS}. # Later, when libvirt creates per domain variable store, this -# list is searched for the master image. +# list is searched for the master image. The UEFI firmware can be +# called differently on different architectures. For instance, +# it's OVMF on x86_64 and i686, but it's AAVMF on aarch64. The +# libvirt default follows this scheme. #nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ] diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4764bef..6c038c3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -107,8 +107,13 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) VIR_FREE(def); } -#define VIR_QEMU_LOADER_FILE_PATH "/usr/share/OVMF/OVMF_CODE.fd" -#define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#if defined(__arm__) || defined(__aarch64__) +# define VIR_QEMU_LOADER_FILE_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" +# define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" +#else +# define VIR_QEMU_LOADER_FILE_PATH "/usr/share/OVMF/OVMF_CODE.fd" +# define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#endif virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { -- 2.0.4

3 2

[libvirt] [PATCH 0/4] Resolve some Coverity issues
by John Ferlan 01 Dec '14

01 Dec '14

The issues found in the first 3 patches aren't "usually" seen, but I've had them sitting around awhile and figured they should be posted anyway since the last issue was seen from a recent change... John Ferlan (4): hotplug: Resolve Coverity FORWARD_NULL virhook: Resolve Coverity NULL_RETURNS domain_conf: Resolve Coverity CHECKED_RETURN libxl: Resolve Coverity CHECKED_RETURN src/conf/domain_conf.c | 2 +- src/libxl/libxl_migration.c | 3 +-- src/qemu/qemu_hotplug.c | 12 ++++++------ src/util/virhook.c | 3 ++- 4 files changed, 10 insertions(+), 10 deletions(-) -- 1.9.3

2 5

[libvirt] [libvirt-python PATCH] fix examples
by Pavel Hrdina 01 Dec '14

01 Dec '14

The dhcpleases example had an old usage of print function. The formating of leases record was also wrong. The event-test example had an old usage of exceptions. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- examples/dhcpleases.py | 30 ++++++++++++++++++++---------- examples/event-test.py | 4 ++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py index c172dc2..da51f52 100755 --- a/examples/dhcpleases.py +++ b/examples/dhcpleases.py @@ -6,8 +6,8 @@ import sys import time def usage(): - print "Usage: %s [URI] NETWORK" % sys.argv[0] - print " Print leases info for a given virtual network" + print("Usage: %s [URI] NETWORK" % sys.argv[0]) + print(" Print leases info for a given virtual network") uri = None network = None @@ -24,18 +24,18 @@ else: conn = libvirt.open(uri) if conn == None: - print "Unable to open connection to libvirt" + print("Unable to open connection to libvirt") sys.exit(1) try: net = conn.networkLookupByName(network) except libvirt.libvirtError: - print "Network %s not found" % network + print("Network %s not found" % network) sys.exit(0) leases = net.DHCPLeases(); if (leases == None): - print "Failed to get leases for %s" % net.name() + print("Failed to get leases for %s" % net.name()) sys.exit(0) def toIPAddrType(addrType): @@ -44,10 +44,20 @@ def toIPAddrType(addrType): elif addrType == libvirt.VIR_IP_ADDR_TYPE_IPV6: return "ipv6" -print " {0:20} {1:18} {2:9} {3:25} {4:15} {5}".format("Expiry Time", "MAC address", "Protocol", "IP address", "Hostname", "Client ID or DUID") -print "-"*115 +print(" {0:20} {1:18} {2:9} {3:25} {4:15} {5}".format("Expiry Time", + "MAC address", + "Protocol", + "IP address", + "Hostname", + "Client ID or DUID")) +print("-"*115) for lease in leases: - print " {0:20}".format(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(lease['expirytime']))), - print "{0:18} {1:9}".format(lease['mac'], toIPAddrType(lease['type'])), - print "{0:<25} {1:15} {2}".format("{}/{}".format(lease['ipaddr'], lease['prefix']), lease['hostname'], lease['clientid']) + print(" {0:20} {1:18} {2:9} {3:25} {4:15} {5}".format( + time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(lease['expirytime'])), + lease['mac'], + toIPAddrType(lease['type']), + "{}/{}".format(lease['ipaddr'], lease['prefix']), + lease['hostname'], + lease['clientid'] + )) diff --git a/examples/event-test.py b/examples/event-test.py index 6cc33ce..452f659 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -220,7 +220,7 @@ class virEventLoopPure: t.set_last_fired(now) t.dispatch() - except (os.error, select.error), e: + except (os.error, select.error) as e: if e.args[0] != errno.EINTR: raise finally: @@ -576,7 +576,7 @@ def usage(): def main(): try: opts, args = getopt.getopt(sys.argv[1:], "hdl", ["help", "debug", "loop"]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: # print help information and exit: print(str(err)) # will print something like "option -a not recognized" usage() -- 2.0.4

3 4

[libvirt] [PATCH 0/2] Add more duplicate scsi_host/fc_host adapter checks
by John Ferlan 01 Dec '14

01 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1159180 Currently libvirt only detects duplicate fc_host & scsi_host adapter sources when the incoming source type definition is the same as the pool type. This misses the even more oddball cases where a scsi_host/fc_host definition is using a scsi_hostN where the type of the definition isn't the same as the type of the pool. It's a fairly twisted and perhaps edge kind of case. A 'fc_host' has two scsi_hostN values that need to be compared against existing 'scsi_host' pools - first the fc_host "parent" scsi_hostN (if it exists or was provided) and second the vHBA scsi_hostN as determined from the wwnn/wwpn. If a 'fc_host' has a 'parent' attribute of a scsi_hostN that's already in use by some 'scsi_host' pool or if it's vHBA (as created via nodedev-create) was (for some unknown reason) used by someone for a 'scsi_host' pool, then we have a duplicate. A 'scsi_host' conversely needs to check against using either the fc_host 'parent' or vHBA. If a 'scsi_host' is using a scsi_hostN of some existing fc_host 'parent' attribute or vHBA, then we have a duplicate. To make matters more complex, the 'fc_host' 'parent' attribute doesn't have to be provided in the fc_host XML. If not provided, then it can be determined if the vHBA already exists (either via nodedev-create or a running fc_host pool). This means moving the code that was created for fc_host startup to find the vHBA parent into the storage_backend_scsi code in order for it to be used there instead. I did try moving into virutil with no success since that code wasn't very happy to be calling the virNodeDevice* API's. The only oddball case that cannot be tested for in this scenario is if the incoming fc_host definition isn't using a nodedev-create'd vHBA and it doesn't provide a 'parent' attribute, then it is possible that the vportCreate startup code will find "an available" scsi_hostN that was (again for some strange reason) already being used by some 'scsi_host' pool. Added some more verbiage to the documentation to dissuade usage of a 'scsi_host' for an FC capable scsi_hostN as well as to encourage usage of the 'parent' attribute in a mixed environment John Ferlan (2): storage: Move and rename getVhbaSCSIHostParent storage: Add mixed fc_host/scsi_host duplicate adapter source checks docs/formatstorage.html.in | 26 +++++- src/conf/storage_conf.c | 178 ++++++++++++++++++++++++++++++++++++- src/conf/storage_conf.h | 8 +- src/libvirt_private.syms | 1 + src/parallels/parallels_storage.c | 2 +- src/storage/storage_backend_scsi.c | 66 +------------- src/storage/storage_driver.c | 4 +- 7 files changed, 215 insertions(+), 70 deletions(-) -- 1.9.3

2 6

[libvirt] [PATCH v3 0/6] improve setting video memory
by Pavel Hrdina 01 Dec '14

01 Dec '14

As it was pointed out that QEMU needs that the video memory size should be rounded to power of two this patch series introduces new macro to round number to power of two. There are two special cases (more description in the commit message). This patch series also fixes few issues that I've found with using vram attribute and possible some bugs (for example if you set vram for QXL to 0, we pass the 0 to QEMU which is wrong and we shouldn't pass anything). There were also wrong usage of primary 'qxl-vga' video device and secondary 'qxl' video device. We've been setting wrong primary/secondary parameters. The main propose is to start using the vram attribute for other QEMU video devices next to QXL and also introduce vgamem attribute to set the VGA framebuffer for QXL video device. v2: https://www.redhat.com/archives/libvir-list/2014-November/msg00525.html v1: https://www.redhat.com/archives/libvir-list/2014-November/msg00024.html Pavel Hrdina (6): internal: add macro to round value to the next closest power of 2 video: cleanup usage of vram attribute and update documentation QXL: fix setting ram and vram values for QEMU QXL device caps: introduce new QEMU capability for vgamem_mb device property qemu-command: use vram attribute for all video devices qemu-command: introduce new vgamem attribute for QXL video device bootstrap.conf | 1 + docs/formatdomain.html.in | 68 ++++--- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 41 +++- src/conf/domain_conf.h | 4 +- src/internal.h | 7 + src/qemu/qemu_capabilities.c | 33 ++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 74 ++++++- src/qemu/qemu_domain.c | 18 ++ src/xen/xen_driver.c | 2 +- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 206 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 218 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 218 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 218 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 218 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 4 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 218 ++++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 4 + tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 218 ++++++++++++++++++++- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- .../qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-sasl.args | 4 +- .../qemuxml2argv-graphics-spice-sasl.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.args | 4 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-policy.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argv-graphics-vnc-websocket.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- .../qemuxml2argv-pci-autoadd-addr.xml | 2 +- .../qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- .../qemuxml2argv-pcihole64-q35.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 6 + .../qemuxml2argv-video-qxl-device-vgamem.xml | 29 +++ .../qemuxml2argv-video-qxl-device.args | 6 + .../qemuxml2argv-video-qxl-device.xml | 29 +++ .../qemuxml2argv-video-qxl-nodevice.args | 5 + .../qemuxml2argv-video-qxl-nodevice.xml | 29 +++ .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 8 + .../qemuxml2argv-video-qxl-sec-device-vgamem.xml | 32 +++ .../qemuxml2argv-video-qxl-sec-device.args | 7 + .../qemuxml2argv-video-qxl-sec-device.xml | 32 +++ .../qemuxml2argv-video-qxl-sec-nodevice.xml | 32 +++ .../qemuxml2argv-video-vga-device-vgamem.args | 6 + .../qemuxml2argv-video-vga-device-vgamem.xml | 29 +++ .../qemuxml2argv-video-vga-device.args | 6 + .../qemuxml2argv-video-vga-device.xml | 29 +++ .../qemuxml2argv-video-vga-nodevice.args | 5 + .../qemuxml2argv-video-vga-nodevice.xml | 29 +++ tests/qemuxml2argvtest.c | 18 ++ .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/utiltest.c | 39 ++++ tests/virt-aa-helper-test | 2 +- 83 files changed, 2129 insertions(+), 134 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.xml -- 2.0.4

3 25

[libvirt] [PATCH v2 0/5] Allow time sync on domain resume
by Michal Privoznik 01 Dec '14

01 Dec '14

Diff to v1: -Fixed issues raised by Peter Michal Privoznik (5): Introduce virDomainResumeFlags API Implement virDomainResumeFlags in all drivers qemu: Split qemuDomainSetTime into two functions qemuDomainResumeFlags: Introduce VIR_DOMAIN_RESUME_SYNC_TIME virsh: Implement virDomainResumeFlags include/libvirt/libvirt-domain.h | 9 +++ src/driver-hypervisor.h | 5 ++ src/esx/esx_driver.c | 14 ++++- src/hyperv/hyperv_driver.c | 14 ++++- src/libvirt-domain.c | 50 ++++++++++++++++ src/libvirt_public.syms | 5 ++ src/libxl/libxl_driver.c | 14 ++++- src/lxc/lxc_driver.c | 15 ++++- src/openvz/openvz_driver.c | 13 ++++- src/parallels/parallels_driver.c | 11 +++- src/phyp/phyp_driver.c | 12 +++- src/qemu/qemu_driver.c | 119 ++++++++++++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++- src/remote_protocol-structs | 5 ++ src/test/test_driver.c | 13 ++++- src/vbox/vbox_common.c | 11 +++- src/vmware/vmware_driver.c | 12 +++- src/xen/xen_driver.c | 14 ++++- src/xenapi/xenapi_driver.c | 21 ++++++- tools/virsh-domain.c | 13 ++++- tools/virsh.pod | 11 ++-- 22 files changed, 339 insertions(+), 56 deletions(-) -- 2.0.4

3 13

[libvirt] [PATCH] qemu: Drop OVMF whitelist
by Michal Privoznik 01 Dec '14

01 Dec '14

As discussed on the upstream list, it's better not to make this kind of predictions in libvirt. It may happen that qemu learns how to enable OVMF on other architectures too and we shouldn't try to chase that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 9 +++------ src/qemu/qemu_command.c | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4bd8a4d..56bd2d5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps) static int virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps, virDomainCapsLoaderPtr capsLoader, - virArch arch, char **loader, size_t nloader) { @@ -3656,8 +3655,7 @@ virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type, VIR_DOMAIN_LOADER_TYPE_ROM); - if (arch == VIR_ARCH_X86_64 && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE) && + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type, VIR_DOMAIN_LOADER_TYPE_PFLASH); @@ -3674,14 +3672,13 @@ virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps, static int virQEMUCapsFillDomainOSCaps(virQEMUCapsPtr qemuCaps, virDomainCapsOSPtr os, - virArch arch, char **loader, size_t nloader) { virDomainCapsLoaderPtr capsLoader = &os->loader; os->device.supported = true; - if (virQEMUCapsFillDomainLoaderCaps(qemuCaps, capsLoader, arch, + if (virQEMUCapsFillDomainLoaderCaps(qemuCaps, capsLoader, loader, nloader) < 0) return -1; return 0; @@ -3777,7 +3774,7 @@ virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps, domCaps->maxvcpus = maxvcpus; - if (virQEMUCapsFillDomainOSCaps(qemuCaps, os, domCaps->arch, + if (virQEMUCapsFillDomainOSCaps(qemuCaps, os, loader, nloader) < 0 || virQEMUCapsFillDomainDeviceDiskCaps(qemuCaps, disk) < 0 || virQEMUCapsFillDomainDeviceHostdevCaps(qemuCaps, hostdev) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3d62d11..8ed7934 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7748,16 +7748,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_LOADER_TYPE_PFLASH: - /* UEFI is supported only for x86_64 currently */ - if (def->os.arch != VIR_ARCH_X86_64 && - def->os.arch != VIR_ARCH_ARMV7L && - def->os.arch != VIR_ARCH_AARCH64) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("pflash is not supported for %s guest architecture"), - virArchToString(def->os.arch)); - goto cleanup; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary doesn't support -drive")); -- 2.0.4

3 2

[libvirt] [PATCH] conf: Don't redefine virDomainTPMDefPtr
by Martin Kletzander 01 Dec '14

01 Dec '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker. src/conf/domain_conf.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ef2300..439f3c0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1185,8 +1185,6 @@ typedef enum { # define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0" -typedef struct _virDomainTPMDef virDomainTPMDef; -typedef virDomainTPMDef *virDomainTPMDefPtr; struct _virDomainTPMDef { virDomainTPMBackendType type; virDomainDeviceInfo info; -- 2.1.3

1 0

[libvirt] [PATCH 0/2] Add device-related code for TPM and panic devices
by Martin Kletzander 01 Dec '14

01 Dec '14

TPM and panic devices were added without the foundation code for things like hot/cold-(un)plugging, ABI stability checking, etc. This series adds that device-related code in order to properly handle those devices, even though in some cases it just means outputting a better error message. Martin Kletzander (2): conf: Add device-related code for TPM devices conf: Add device-related code for panic devices src/conf/domain_conf.c | 126 ++++++++++++++++++++++++++++++++++++++++-------- src/conf/domain_conf.h | 7 +++ src/qemu/qemu_driver.c | 12 +++++ src/qemu/qemu_hotplug.c | 2 + 4 files changed, 128 insertions(+), 19 deletions(-) -- 2.1.3

2 5

[libvirt] [PATCH v1 0/5] Precreate storage on migration
by Michal Privoznik 01 Dec '14

01 Dec '14

Yet another attempt. One thing that I'm not sure about is, whether this functionality should be on by default or tunable via say flag to migrate APIs. Thing is, in my approach I require disks to be in a storage pool (see the last patch for reasoning). On the other hand, if users still precreate storage themselves, they won't see any failure if disks doesn't belong to any pool. So I'm undecided yet, thoughts? Michal Privoznik (5): qemu: Expose qemuOpenFile and qemuOpenFileAs qemu: Split qemuDomainGetBlockInfo storage: Introduce storagePoolLookupByPath qemu_migration: Send disk sizes to the other side qemu_migration: Precreate missing storage src/qemu/qemu_domain.c | 319 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 16 ++ src/qemu/qemu_driver.c | 316 +------------------------------------- src/qemu/qemu_migration.c | 354 ++++++++++++++++++++++++++++++++++++++++--- src/storage/storage_driver.c | 36 +++++ src/storage/storage_driver.h | 4 + 6 files changed, 711 insertions(+), 334 deletions(-) -- 2.0.4

2 6

[libvirt] [PATCH 0/2] qemu: update jobinfo type if the job is not completed in qemuMigrationRun
by Wang Rui 01 Dec '14

01 Dec '14

In qemuMigrationRun the jobinfo type won't be updated until qemuMigrationWaitForCompletion. If migration is failed or cancelled before that(such as in qemuMigrationDriveMirror), we can't get the right jobinfo type. The following patches fix it. diff to v1: Reword commit message to clarify why we can't use qemuMigrationUpdateJobStatus. Wang Rui (2): qemu: set jobinfo type to CANCELLED if migration is cancelled in all conditions qemu: set jobinfo type to FAILED if job is failed in qemuMigrationRun src/qemu/qemu_migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 1.7.12.4

2 3

[libvirt] [PATCH 0/2] qemu: update jobinfo type if the job is not completed in qemuMigrationRun
by Wang Rui 01 Dec '14

01 Dec '14

In qemuMigrationRun the jobinfo type won't be updated until qemuMigrationWaitForCompletion. If migration is failed or cancelled before that(such as in qemuMigrationDriveMirror), we can't get the right jobinfo type. The following patches fix it. Wang Rui (2): qemu: set jobinfo type to CANCELLED if migration is cancelled in all conditions qemu: set jobinfo type to FAILED if job is failed in qemuMigrationRun src/qemu/qemu_migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 1.7.12.4

2 7

[libvirt] python migrateSetMaxSpeed not taking effect
by Krutskikh Ivan 01 Dec '14

01 Dec '14

Hi, I am writing a simple python script for migrating vm's based on zfs zvol's. Either I am doing something wrong or python migrateSetMaxSpeed not taking effect: no mater what value I specify (except for 0), I end up with 10 Mib/s migration speed. The code is: def virt_migrate(domain): conn = libvirt.open('qemu:///system') domain_obj = conn.lookupByName(domain) dst='qemu+ssh://root@%s/system' % args.remote domain_obj.migrateSetMaxSpeed(40,0) new_dom = domain_obj.migrateToURI(dst,libvirt.VIR_MIGRATE_LIVE | libvirt.VIR_MIGRATE_PEER2PEER | libvirt.VIR_MIGRATE_NON_SHARED_INC | libvirt.VIR_MIGRATE_PERSIST_DEST | libvirt.VIR_MIGRATE_UNDEFINE_SOURCE, None, 0) conn.close() Also tried to specify bandwidth at migrateToUri- I still get 10 mib/s at any value... Thanks in advance!

2 1

[libvirt] systemd-cgroups-agent not working in containers
by Richard Weinberger 30 Nov '14

30 Nov '14

Hi! I run a Linux container setup with openSUSE 13.1/2 as guest distro. After some time containers slow down. An investigation showed that the containers slow down because a lot of stale user sessions slow down almost all systemd tools, mostly systemctl. loginctl reports many thousand sessions. All in state "closing". The vast majority of these sessions are from crond an ssh logins. It turned out that sessions are never closed and stay around. The control group of a said session contains zero tasks. So I started to explore why systemd keeps it. After another few hours of debugging I realized that systemd never issues the release signal from cgroups. Also calling the release agent by hand did not help. i.e. /usr/lib/systemd/systemd-cgroups-agent /user.slice/user-0.slice/session-c324.scope Therefore systemd never recognizes that a server/session has no more tasks and will close it. First I thought it is an issue in libvirt combined with user namespaces. But I can trigger this also without user namespaces and also with systemd-nspawn. Tested with systemd 208 and 210 from openSUSE, their packages have all known bugfixes. Any idea where to look further? How do you run the most current systemd on your distro? Thanks, //richard

5 7

[libvirt] [PATCH] conf: replace call to virNetworkFree() with virOjectUnref()
by Laine Stump 30 Nov '14

30 Nov '14

The function virNetworkObjListExport() in network_conf.c had a call to the public API virNetworkFree() which was causing a link error: CCLD libvirt_driver_vbox_network_impl.la ./.libs/libvirt_conf.a(libvirt_conf_la-network_conf.o): In function `virNetworkObjListExport': /home/laine/devel/libvirt/src/conf/network_conf.c:4496: undefined reference to `virNetworkFree' This would happen when I added #include "network_conf.h" into domain_conf.c, then attempted to call a new function from that file (and enum converter, similar to virNetworkForwardTypeToString()) In the end, virNetworkFree() ends up just calling virObjectUnref(obj) anyway (after clearing all pending errors, which we probably *don't* want to do in the cleanup of a utility function), so this is likely more correct than the original code as well. --- A quick look showed that there may be other places where we are calling public APIs such as virNetworkFree and virDomainFree when we really don't want to be clearning out the pending error - this would result in the good old "an error was encountered but the cause is unknown" type of log messages. It may warrant an audit... src/conf/network_conf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 067334e..a249e32 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -4463,10 +4463,8 @@ virNetworkObjListExport(virConnectPtr conn, cleanup: if (tmp_nets) { - for (i = 0; i < nnets; i++) { - if (tmp_nets[i]) - virNetworkFree(tmp_nets[i]); - } + for (i = 0; i < nnets; i++) + virObjectUnref(tmp_nets[i]); } VIR_FREE(tmp_nets); -- 1.9.3

3 2

[libvirt] [PATCH] Doc: some small issue in the document
by Luyao Huang 30 Nov '14

30 Nov '14

When i pasted some xml from libvirt.org, i found some small mistake. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- docs/formatdomain.html.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9c1d0f4..c08b244 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3871,7 +3871,7 @@ <source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </source> - <mac address='52:54:00:6d:90:02'> + <mac address='52:54:00:6d:90:02'/> <virtualport type='802.1Qbh'> <parameters profileid='finance'/> </virtualport> @@ -3898,7 +3898,7 @@ ... <devices> <interface type='mcast'> - <mac address='52:54:00:6d:90:01'> + <mac address='52:54:00:6d:90:01'/> <source address='230.0.0.1' port='5558'/> </interface> </devices> @@ -4772,11 +4772,11 @@ qemu-kvm -net nic,model=? /dev/null <source path='/dev/pts/3'/> <target port='0'/> </serial> - <serial type='file> + <serial type='file'> <source path='/tmp/file'> <seclabel model='dac' relabel='no'/> </source> - <target port='0'> + <target port='0'/> </serial> <console type='pty'> <source path='/dev/pts/4'/> -- 1.8.3.1

2 1

Re: [libvirt] [GIT PULL] namespace updates for v3.17-rc1
by Richard Weinberger 29 Nov '14

29 Nov '14

On Wed, Aug 6, 2014 at 2:57 AM, Eric W. Biederman <ebiederm(a)xmission.com> wrote: > > Linus, > > Please pull the for-linus branch from the git tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git for-linus > > HEAD: 344470cac42e887e68cfb5bdfa6171baf27f1eb5 proc: Point /proc/mounts at /proc/thread-self/mounts instead of /proc/self/mounts > > This is a bunch of small changes built against 3.16-rc6. The most > significant change for users is the first patch which makes setns > drmatically faster by removing unneded rcu handling. > > The next chunk of changes are so that "mount -o remount,.." will not > allow the user namespace root to drop flags on a mount set by the system > wide root. Aks this forces read-only mounts to stay read-only, no-dev > mounts to stay no-dev, no-suid mounts to stay no-suid, no-exec mounts to > stay no exec and it prevents unprivileged users from messing with a > mounts atime settings. I have included my test case as the last patch > in this series so people performing backports can verify this change > works correctly. > > The next change fixes a bug in NFS that was discovered while auditing > nsproxy users for the first optimization. Today you can oops the kernel > by reading /proc/fs/nfsfs/{servers,volumes} if you are clever with pid > namespaces. I rebased and fixed the build of the !CONFIG_NFS_FS case > yesterday when a build bot caught my typo. Given that no one to my > knowledge bases anything on my tree fixing the typo in place seems more > responsible that requiring a typo-fix to be backported as well. > > The last change is a small semantic cleanup introducing > /proc/thread-self and pointing /proc/mounts and /proc/net at it. This > prevents several kinds of problemantic corner cases. It is a > user-visible change so it has a minute chance of causing regressions so > the change to /proc/mounts and /proc/net are individual one line commits > that can be trivially reverted. Unfortunately I lost and could not find > the email of the original reporter so he is not credited. From at least > one perspective this change to /proc/net is a refgression fix to allow > pthread /proc/net uses that were broken by the introduction of the network > namespace. > > Eric > > Eric W. Biederman (11): > namespaces: Use task_lock and not rcu to protect nsproxy > mnt: Only change user settable mount flags in remount > mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remount > mnt: Correct permission checks in do_remount This commit breaks libvirt-lxc. libvirt does in lxcContainerMountBasicFS(): /* * We can't immediately set the MS_RDONLY flag when mounting filesystems * because (in at least some kernel versions) this will propagate back * to the original mount in the host OS, turning it readonly too. Thus * we mount the filesystem in read-write mode initially, and then do a * separate read-only bind mount on top of that. */ 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) { ^^^^ Here it fails for sysfs because with user namespaces we bind the existing /sys into the container and would have to read out all existing mount flags from the current /sys mount. Otherwise mount() fails with EPERM. On my test system /sys is mounted with "rw,nosuid,nodev,noexec,relatime" and libvirt misses the realtime... virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), mnt_src, mnt->dst, NULLSTR(mnt->type), mnt_mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { ^^^ Here it fails because now we'd have to specify all flags as used for the first mount. For the procfs case MS_NOSUID|MS_NOEXEC|MS_NODEV. See lxcBasicMounts[]. In this case the fix is easy, add mnt_mflags to the mount flags. virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), mnt_src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } -- Thanks, //richard

5 12

[libvirt] [PATCH] docs: fix simple typo in TPM paragraph
by Martin Kletzander 28 Nov '14

28 Nov '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the 'super-trivial' rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9c1d0f4..46b5b19 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5596,7 +5596,7 @@ qemu-kvm -net nic,model=? /dev/null The TPM passthrough device type provides access to the host's TPM - for one QEMU guest. No other software may be is using the TPM device, + for one QEMU guest. No other software may be using the TPM device, typically /dev/tpm0, at the time the QEMU guest is started. 'passthrough' since 1.0.5 -- 2.1.3

2 1

[libvirt] [PATCH v3 00/12] parallels: rewrite driver with parallels SDK
by Dmitry Guryanov 28 Nov '14

28 Nov '14

This patch series replaces all code, which used prlctl command to interact with parallels cloud server with calls to parallels sdk functions. The model of this driver remain almost the same - in creates a list of virDomainObj objects on connect and then functions, which returns different information get info from this list. Changes in v2: * Rebase to latest libvirt sources * Use only "parallels" prefix for functions in parallelsDriver, so that make check will pass * Update privconn->domains in case we change something from current connection. Changes in v3: * in parallels: get domain info with SDK: replace + case VIR_ARCH_X86_64: with + case PCM_CPU_MODE_64: * in parallels: handle events from parallels server fix make syntax-check error in: + if (PRL_FAILED(ret)) { + logPrlError(ret); + } * in rewrite parallelsApplyConfig with SDK: in prlsdkApplyConfig function, don't commit changes if there is an error in parallelsDoApplyConfig * in parallels: create VMs and containers with sdk Handle error from parallelsDoApplyConfig in prlsdkCreateVm. Alexander Burluka (4): parallels: get domain info with SDK parallels: handle events from parallels server parallels: added function virDomainIsActive() parallels: Add domainCreateWithFlags() function. Dmitry Guryanov (8): parallels: move IS_CT macro to parallels_utils.h parallels: move parallelsDomNotFoundError to parallels_utils.h parallels: reimplement functions, which change domain state parallels: rewrite parallelsApplyConfig with SDK parallels: create VMs and containers with sdk parallels: refactor parallelsDomainDefineXML parallels: add cdroms support parallels: implement domainUndefine and domainUndefineFlags src/parallels/parallels_driver.c | 2456 ++++++++------------------------------ src/parallels/parallels_sdk.c | 2454 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 25 + src/parallels/parallels_utils.h | 11 + 4 files changed, 2960 insertions(+), 1986 deletions(-) -- 1.9.3

3 28