- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Don't leak hostCPUModelInfo in virQEMUCaps
by Jiri Denemark 17 Jan '17

17 Jan '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2512e4838..89e9dd471 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2215,6 +2215,7 @@ void virQEMUCapsDispose(void *obj) VIR_FREE(qemuCaps->gicCapabilities); + qemuMonitorCPUModelInfoFree(qemuCaps->hostCPUModelInfo); virCPUDefFree(qemuCaps->hostCPUModel); } -- 2.11.0

2 2

[libvirt] [PATCH] qemu: Actually unshare() iff running as root
by Michal Privoznik 17 Jan '17

17 Jan '17

While all the code that deals with qemu namespaces correctly detects whether we are running as root (and turn into NO-OP for qemu:///session) the actual unshare() call is not guarded with such check. Therefore any attempt to start a domain under qemu:///session shall fail as unshare() is reserved for root. The fix consists of moving unshare() call (for which we have a wrapper called virProcessSetupPrivateMountNS) into qemuDomainBuildNamespace() where the proper check is performed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 +++ src/qemu/qemu_process.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35baffb51..c67604222 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7400,6 +7400,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, goto cleanup; } + if (virProcessSetupPrivateMountNS() < 0) + goto cleanup; + if (qemuDomainSetupDev(driver, vm, devPath) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a980f5a9e..184440dc1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2663,9 +2663,6 @@ static int qemuProcessHook(void *data) if (virSecurityManagerClearSocketLabel(h->driver->securityManager, h->vm->def) < 0) goto cleanup; - if (virProcessSetupPrivateMountNS() < 0) - goto cleanup; - if (qemuDomainBuildNamespace(h->driver, h->vm) < 0) goto cleanup; -- 2.11.0

2 1

[libvirt] How to generate better API documentation?
by Michal Privoznik 17 Jan '17

17 Jan '17

Dear list, now that we more or less agreed to use some new features (i.e. automatic free() when a variable goes out of the scope [1]), and with our NEWS efforts, do you think it is finally the right time to fix generation of our API docs too? What I mean? Look here: [2] People use '@variable' notation hoping that the generator will put a link there. Or that our generator would allow us to: typedef enum { A = X, B = Y, C = Z, # ifdef VIR_ENUM_SENTINELS VIR_ENUM_LAST # endif } virEnum; where X, Y, Z come from another enum. Long story short, our documentation generator has a lot of bugs. What if instead of putting our effort in fixing it we would switch to something that is already available on the market? gtk-doc, doxygen, etc. Personally, I don't have any preference. Just want to know what your opinion is. Again, if I get a green light I can put it onto the list of GSoC projects [3]. Michal 1: https://www.redhat.com/archives/libvir-list/2017-January/msg00323.html 2: http://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventBl… 3: http://wiki.libvirt.org/page/Google_Summer_of_Code_2017

4 4

[libvirt] [PATCH v5 0/3] gluster: cache glfs connection object per volume
by Prasanna Kumar Kalever 17 Jan '17

17 Jan '17

v5: Address review comments from Peter on v4 Dropping Patch 3 from v3 Patch 1: fix transport type in all drivers, possible switch case converts Patch 2: use virObject with src->drv to avoid 'initFlag' for remembering 'virStorageFileInit' status Patch 3: * change virStorageBackendGlusterCacheQuery to *Lookup * change virStorageBackendGlusterCacheRefresh to *Release * Avoid the global Flags * Thread safe measure by using virCond* Thanks Peter! v4: Address review comments from Peter on v3 Patch 1: changes to fix test failures (qemuargv2xmltest, qemuxml2argvtest, qemuxml2xmltest and virstoragetest) Patch 2: fix hung in qemuxml2argvtest Patch 3 v3: Split this Patch to 2 parts as below Patch 3 v4: don't free metadata used for storage driver access Patch 4: * update variable naming as per standards * virStorageBackendGlusterPreopened* -> virStorageBackendGlusterCache* Thanks Peter! v3: Address comments by Daniel and Peter on v2 * Split the patch to 3 parts Patch 1: change the virStorageNetHostDef type Patch 2: optimize calls to virStorageFileInit and friends Patch 3: add the caching for glfs * Thanks to Daniel, this version make all the methods as thread safe * Thanks to Peter for pointing use of virObjectLockable, this had simplified rest of the parts a lot. v2: Address review comments from Peter on v1 * Rebased on latest master * Changes to commit msg * Introduce storage API's for Register and Unregister of volume * During qemu process Start/Stop and snapshot create * Check Transport and Port type * Atomic element add/del to list and ref counting Pending: Treating IP and FQDN belong to same host v1: Initial patch Prasanna Kumar Kalever (3): util: change the virStorageNetHostDef type storage: optimize calls to virStorageFileInit and friends gluster: cache glfs connection object per volume src/conf/domain_conf.c | 60 +++-- src/libxl/libxl_conf.c | 10 +- src/qemu/qemu_command.c | 97 ++++--- src/qemu/qemu_domain.c | 25 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 26 +- src/qemu/qemu_parse_command.c | 50 ++-- src/qemu/qemu_process.c | 49 ++++ src/qemu/qemu_process.h | 4 + src/storage/storage_backend.h | 1 + src/storage/storage_backend_fs.c | 5 + src/storage/storage_backend_gluster.c | 329 ++++++++++++++++++++--- src/storage/storage_driver.c | 40 ++- src/storage/storage_driver.h | 2 + src/util/virstoragefile.c | 93 ++++--- src/util/virstoragefile.h | 21 +- src/xenconfig/xen_xl.c | 10 +- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 2 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 2 +- tests/virstoragetest.c | 2 +- 20 files changed, 614 insertions(+), 222 deletions(-) -- 2.7.4

3 5

[libvirt] [PATCH v2 0/4] target-i386: Implement query-cpu-model-expansion
by Eduardo Habkost 16 Jan '17

16 Jan '17

This series implements query-cpu-model-expansion on target-i386. Changes v1 -> v2: ----------------- This version is highly simplified compared to v1. It contains only an implementation that will return a limited set of properties. I have a follow-up series that will expend type=full expansion to return every single QOM property, but this version will return the same data for type=static and type=full expansion for simplicity (except that type=static expansion will use the "base" CPU model as base). This means this version also won't include "pmu" and "host-cache-info" in full expansion, and won't require special code for those properties. The unit test code was also removed in this version, to keep the series simple and easier to review. Most of the patches on the previous series were changes just to make the test case work. I will send the test-case-related changes as a follow-up series. --- Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Eduardo Habkost (4): target-i386: Reorganize and document CPUID initialization steps qapi-schema: Comment about full expansion of non-migration-safe models target-i386: Define static "base" CPU model target-i386: Implement query-cpu-model-expansion QMP command qapi-schema.json | 9 ++ target/i386/cpu-qom.h | 2 + monitor.c | 4 +- target/i386/cpu.c | 317 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 298 insertions(+), 34 deletions(-) -- 2.11.0.259.g40922b1

1 1

[libvirt] Performance about x-data-plane
by Weiwei Jia 16 Jan '17

16 Jan '17

Hi, With QEMU x-data-plane, I find the performance has not been improved very much. Please see following two settings. Setting 1: I/O thread in host OS (VMM) reads 4KB each time from disk (8GB in total). Pin the I/O thread to pCPU 5 which will serve I/O thread dedicatedly. I find the performance is around 250 MB/s. Setting 2: I/O thread in guest OS (VMM) reads 4KB each time from virtual disk (8GB in total). Pin the I/O thread to vCPU 5 and pin vCPU 5 thread to pCPU5 so that vCPU 5 handles this I/O thread dedicatedly and pCPU5 serve vCPU5 dedicatedly. In order to keep vCPU5 not to be idle, I also pin one cpu intensive thread (while (1) {i++}) on vCPU 5 so that the I/O thread on it can be served without delay. For this setting, I find the performance for this I/O thread is around 190 MB/s. NOTE: For setting 2, I also pin the QEMU dedicated IOthread (x-data-plane) in host OS to pCPU to handle I/O requests from guest OS dedicatedly. I think for setting 2, the performance of I/O thread should be almost the same as setting 1. I cannot understand why it is 60 MB/s lower than setting 1. I am wondering whether there are something wrong with my x-data-plane setting or virtio setting for VM. Would you please give me some hints? Thank you. Libvirt version: 2.4.0 QEMU version: 2.3.0 The libvirt xml configuration file is like following (I only start one VM with following xml config). <domain type='kvm' id='1' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>vm</name> <uuid>3290a8d0-9d9f-b2c4-dd46-5d0d8a730cd6</uuid> <memory unit='KiB'>8290304</memory> <currentMemory unit='KiB'>8290304</currentMemory> <vcpu placement='static'>15</vcpu> <cputune> <vcpupin vcpu='0' cpuset='0'/> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='2' cpuset='2'/> <vcpupin vcpu='3' cpuset='3'/> <vcpupin vcpu='4' cpuset='4'/> <vcpupin vcpu='5' cpuset='5'/> <vcpupin vcpu='6' cpuset='6'/> <vcpupin vcpu='7' cpuset='7'/> <vcpupin vcpu='8' cpuset='8'/> <vcpupin vcpu='9' cpuset='9'/> <vcpupin vcpu='10' cpuset='10'/> <vcpupin vcpu='11' cpuset='11'/> <vcpupin vcpu='12' cpuset='12'/> <vcpupin vcpu='13' cpuset='13'/> <vcpupin vcpu='14' cpuset='14'/> </cputune> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64' machine='pc-i440fx-2.2'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm-spice</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source file='/var/lib/libvirt/images/vm.img'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <alias name='ide0-1-0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <alias name='usb0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'> <alias name='pci.0'/> </controller> <controller type='ide' index='0'> <alias name='ide0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='scsi' index='0'> <alias name='scsi0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> <interface type='network'> <mac address='52:54:00:8e:3d:06'/> <source network='default'/> <target dev='vnet0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <source path='/dev/pts/8'/> <target port='0'/> <alias name='serial0'/> </serial> <console type='pty' tty='/dev/pts/8'> <source path='/dev/pts/8'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <alias name='video0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> <seclabel type='none'/> <qemu:commandline> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.scsi=off'/> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.config-wce=off'/> <qemu:arg value='-set'/> <qemu:arg value='device.virtio-disk0.x-data-plane=on'/> </qemu:commandline> </domain> Thank you, Weiwei Jia

4 8

[libvirt] [PATCH for 3.0.0] Revert "perf: Add cache_l1d perf event support"
by Daniel P. Berrange 16 Jan '17

16 Jan '17

This reverts commit ae16c95f1bb5591c27676c5de8d383e5612c3568. The data was calculated incorrectly and the event name needs to be changed. --- docs/formatdomain.html.in | 7 ------- docs/schemas/domaincommon.rng | 1 - include/libvirt/libvirt-domain.h | 11 ----------- src/libvirt-domain.c | 2 -- src/qemu/qemu_driver.c | 1 - src/util/virperf.c | 6 +----- src/util/virperf.h | 1 - tests/genericxml2xmlindata/generic-perf.xml | 1 - tools/virsh.pod | 5 +---- 9 files changed, 2 insertions(+), 33 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 30cb196..3f7f875 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1937,7 +1937,6 @@ <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> - <event name='cache_l1d' enabled='no'/> </perf> ... </pre> @@ -2016,12 +2015,6 @@ by applications running on the platform</td> <td><code>perf.ref_cpu_cycles</code></td> </tr> - <tr> - <td><code>cache_l1d</code></td> - <td>the count of total level 1 data cache by applications running on - the platform</td> - <td><code>perf.cache_l1d</code></td> - </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be0a609..4d76315 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -433,7 +433,6 @@ <value>stalled_cycles_frontend</value> <value>stalled_cycles_backend</value> <value>ref_cpu_cycles</value> - <value>cache_l1d</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 1e0e74c..e303140 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,17 +2188,6 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" -/** - * VIR_PERF_PARAM_CACHE_L1D: - * - * Macro for typed parameter name that represents cache_l1d - * perf event which can be used to measure the count of total - * level 1 data cache by applications running on the platform. - * It corresponds to the "perf.cache_l1d" field in the - * *Stats APIs. - */ -# define VIR_PERF_PARAM_CACHE_L1D "cache_l1d" - int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3023f30..5b3e842 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11250,8 +11250,6 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * CPU frequency scaling by applications running * as unsigned long long. It is produced by the * ref_cpu_cycles perf event. - * "perf.cache_l1d" - The count of total level 1 data cache as unsigned - * long long. It is produced by cache_l1d perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42f9889..d4422f3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9877,7 +9877,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_L1D, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 8554723..f64692b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,8 +43,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend", "ref_cpu_cycles", - "cache_l1d"); + "stalled_cycles_backend", "ref_cpu_cycles"); struct virPerfEvent { int type; @@ -113,9 +112,6 @@ static struct virPerfEventAttr attrs[] = { .attrConfig = 0, # endif }, - {.type = VIR_PERF_EVENT_CACHE_L1D, - .attrType = PERF_TYPE_HW_CACHE, - .attrConfig = PERF_COUNT_HW_CACHE_L1D}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 4c562af..1f43c92 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -47,7 +47,6 @@ typedef enum { the backend of the instruction processor pipeline */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ - VIR_PERF_EVENT_CACHE_L1D, /* Count of level 1 data cache*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index d1418d0..437cd65 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -26,7 +26,6 @@ <event name='stalled_cycles_frontend' enabled='yes'/> <event name='stalled_cycles_backend' enabled='yes'/> <event name='ref_cpu_cycles' enabled='yes'/> - <event name='cache_l1d' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index cfa7a24..0e434c0 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -945,8 +945,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, "perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles, -"perf.cache_l1d" - the count of level 1 data cache +"perf.ref_cpu_cycles" - the count of ref cpu cycles See the B<perf> command for more details about each event. @@ -2311,8 +2310,6 @@ B<Valid perf event names> ref_cpu_cycles - Provides the count of total cpu cycles not affected by CPU frequency scaling by applications running on the platform. - cache_l1d - Provides the count of total level 1 data cache - by applications running on the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag. -- 2.9.3

2 2

[libvirt] [RFE] Enable/allow MAC spoofing for SR-IOV virtual functions.
by Leon Goldberg 16 Jan '17

16 Jan '17

Hey, We've recently encountered difficulties using a virtual function as a slave in a bond where the virtual function's MAC address differs from the bond's. I've opened an RFE[1] suggesting MAC spoofing to be enabled/allowed in virtual functions. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1413596 Thanks, Leon

1 0

[libvirt] [PATCH] qemu: Copy SELinux labels for namespace too
by Michal Privoznik 16 Jan '17

16 Jan '17

When creating new /dev/* for qemu, we do chown() and copy ACLs to create the exact copy from the original /dev. I though that copying SELinux labels is not necessary as SELinux will chose the sane defaults. Surprisingly, it does not leaving namespace with the following labels: crw-rw-rw-. root root system_u:object_r:tmpfs_t:s0 random crw-------. root root system_u:object_r:tmpfs_t:s0 rtc0 drwxrwxrwt. root root system_u:object_r:tmpfs_t:s0 shm crw-rw-rw-. root root system_u:object_r:tmpfs_t:s0 urandom As a result, domain is unable to start: error: internal error: process exited while connecting to monitor: Error in GnuTLS initialization: Failed to acquire random data. qemu-kvm: cannot initialize crypto: Unable to initialize GNUTLS library: Failed to acquire random data. The solution is to copy the SELinux labels as well. Reported-by: Andrea Bolognani <abologna(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1399dee0d..a29866673 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -63,6 +63,9 @@ #if defined(HAVE_SYS_MOUNT_H) # include <sys/mount.h> #endif +#ifdef WITH_SELINUX +# include <selinux/selinux.h> +#endif #include <libxml/xpathInternals.h> @@ -6958,6 +6961,9 @@ qemuDomainCreateDevice(const char *device, char *canonDevicePath = NULL; struct stat sb; int ret = -1; +#ifdef WITH_SELINUX + char *tcon = NULL; +#endif if (virFileResolveAllLinks(device, &canonDevicePath) < 0) { if (errno == ENOENT && allow_noent) { @@ -7023,10 +7029,34 @@ qemuDomainCreateDevice(const char *device, goto cleanup; } +#ifdef WITH_SELINUX + if (getfilecon_raw(canonDevicePath, &tcon) < 0 && + (errno != ENOTSUP && errno != ENODATA)) { + virReportSystemError(errno, + _("Unable to get SELinux label on %s"), canonDevicePath); + goto cleanup; + } + + if (tcon && + setfilecon_raw(devicePath, (VIR_SELINUX_CTX_CONST char *) tcon) < 0) { + VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR + if (errno != EOPNOTSUPP && errno != ENOTSUP) { + VIR_WARNINGS_RESET + virReportSystemError(errno, + _("Unable to set SELinux label on %s"), + devicePath); + goto cleanup; + } + } +#endif + ret = 0; cleanup: VIR_FREE(canonDevicePath); VIR_FREE(devicePath); +#ifdef WITH_SELINUX + freecon(tcon); +#endif return ret; } @@ -7472,6 +7502,9 @@ struct qemuDomainAttachDeviceMknodData { const char *file; struct stat sb; void *acl; +#ifdef WITH_SELINUX + char *tcon; +#endif }; @@ -7515,6 +7548,19 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, goto cleanup; } +#ifdef WITH_SELINUX + if (setfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *) data->tcon) < 0) { + VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR + if (errno != EOPNOTSUPP && errno != ENOTSUP) { + VIR_WARNINGS_RESET + virReportSystemError(errno, + _("Unable to set SELinux label on %s"), + data->file); + goto cleanup; + } + } +#endif + switch ((virDomainDeviceType) data->devDef->type) { case VIR_DOMAIN_DEVICE_DISK: { virDomainDiskDefPtr def = data->devDef->data.disk; @@ -7571,6 +7617,9 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, cleanup: if (ret < 0 && delDevice) unlink(data->file); +#ifdef WITH_SELINUX + freecon(data->tcon); +#endif virFileFreeACLs(&data->acl); return ret; } @@ -7605,6 +7654,15 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, return ret; } +#ifdef WITH_SELINUX + if (getfilecon_raw(file, &data.tcon) < 0 && + (errno != ENOTSUP && errno != ENODATA)) { + virReportSystemError(errno, + _("Unable to get SELinux label on %s"), file); + goto cleanup; + } +#endif + if (virSecurityManagerPreFork(driver->securityManager) < 0) goto cleanup; @@ -7619,6 +7677,9 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, ret = 0; cleanup: +#ifdef WITH_SELINUX + freecon(data.tcon); +#endif virFileFreeACLs(&data.acl); return 0; } -- 2.11.0

3 5

[libvirt] [PATCH 0/2] Add perf event support for Level 1 Data Cache
by Nitesh Konkar 16 Jan '17

16 Jan '17

Compute the config value for cache_l1d (renamed to cache_l1dra) correctly and add another perf event support for cache_l1drm. Nitesh Konkar (2): perf: Compute cache_l1d config value correctly perf: add cache_l1drm perf event support docs/formatdomain.html.in | 19 +++++++++++++------ docs/news.xml | 5 +++-- docs/schemas/domaincommon.rng | 3 ++- include/libvirt/libvirt-domain.h | 23 +++++++++++++++++------ src/libvirt-domain.c | 8 ++++++-- src/qemu/qemu_driver.c | 3 ++- src/util/virperf.c | 13 ++++++++++--- src/util/virperf.h | 3 ++- tests/genericxml2xmlindata/generic-perf.xml | 3 ++- tools/virsh.pod | 9 ++++++--- 10 files changed, 63 insertions(+), 26 deletions(-) -- 1.9.3

2 4