- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/7] properly deal with multiple netdevs on a single PF (i.e. Mellanox dual port NICS)
by Laine Stump 12 Aug '17

12 Aug '17

I had already sent 3 patches to properly support macvtap passthrough of both ports of a dual port VF, and those patches were ACKed by Michal: https://www.redhat.com/archives/libvir-list/2017-August/msg00170.html When Michal sent the ACK, I was already working on a V2 that updated Patch 2 (now Patch 3), and added on some more patches in order to properly support VFIO device assignment of VFs on these cards (but only if they've been setup in single port mode). A scorecard: Patch 1 - same as V1, already ACKed Patch 2 - NEW trivial patch to make an arg of a function const Patch 3 - update virPCIGetNetName() - improved from V1 Patch 4 - match phys_port_id, slightly modified from V1 due to change in virPCIGetNetName in new Patch 3. Patch 5 - NEW save/set/restore using correct PF netdev during vfio Patch 6 - NEW eliminate bogus error logs when trying to read saved net config Patch 7 - NEW fix checking of PF online status for dual port cards Here's the original cover letter blurb: The commit log of Patch 1 explains the majority of the reason for these patches. In short, they disambiguate the multiple netdevs per PCI device on the SRIOV PF and VFs of a Mellanox dual port NIC *when converting from a VF netdev to a PF netdev and vice versa*. This permits us to set the vlan tag and MAC address for the correct VF netdev (and detect the online status of the correct PF netdev for that VF) when using a VF in macvtap passthrough mode. (in other words, with these patches in place, it is possible to use *all* the VF netdevs on both ports of a dual port mellanox NIC for macvtap passthrough.) These patches *do not* solve the problem of saving/setting the mac address/vlan tag for *both* ports when using a dual port VF for PCI device assignment with VFIO (see my RFC email from last week). Since I learned from responses to the RFC that these "dual netdevs on a single PCI PF/VF" cards are legacy, and all new Mellanox products have only one netdev per PF/VF (like all the other SRIOV NICs on the market), I've decided that it's not worth cluttering up libvirt's XML with config for a dying breed. Since it's possible to support VFIO device assignment on those cards when the VFs are in single port mode, I think it is worthwhile to make that work, so that owners of the older cards can get maximum value from their investment. Laine Stump (7): util: new function virNetDevGetPhysPortID() util: Fix const'ness of 1st arg to virPCIGetNetName() util: make virPCIGetNetName() more versatile util: match phys_port_id when converting PF-netdev to/from VF-netdev util: save the correct VF's info when using a dual port SRIOV NIC in single port mode util: restructure virNetDevReadNetConfig() to eliminate false error logs util: check for PF online status earlier in guest startup src/libvirt_private.syms | 1 + src/util/virhostdev.c | 137 ++++++++++++++++++++++++++------------ src/util/virnetdev.c | 159 ++++++++++++++++++++++++++++++++++---------- src/util/virnetdev.h | 5 ++ src/util/virnetdevmacvlan.c | 5 +- src/util/virpci.c | 97 +++++++++++++++++++++++---- src/util/virpci.h | 9 ++- 7 files changed, 316 insertions(+), 97 deletions(-) -- 2.13.3

3 10

[libvirt] [PATCH] apparmor, libvirt-qemu: Allow QEMU to gather information about available host resources.
by intrigeri 11 Aug '17

11 Aug '17

--- examples/apparmor/libvirt-qemu | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index f462d7428c..dcfb1a5985 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -169,3 +169,9 @@ @{PROC}/device-tree/ r, @{PROC}/device-tree/** r, /sys/firmware/devicetree/** r, + + # for gathering information about available host resources + /sys/devices/system/cpu/ r, + /sys/devices/system/node/ r, + /sys/devices/system/node/node[0-9]*/meminfo r, + /sys/module/vhost/parameters/max_mem_regions r, -- 2.14.0

3 2

[libvirt] [PATCH] m4: workaround clang/glibc problem with isnan()
by Daniel P. Berrange 11 Aug '17

11 Aug '17

When building libvirt with clang we get bogus warnings about 'double' being promoted to 'long double' when calling isnan(). https://bugzilla.redhat.com/show_bug.cgi?id=1472437 Detect this broken isnan() / compiler combination and disable the -Wdouble-promotion flag. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-compile-warnings.m4 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index fa0940fc6..7b56115ce 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -134,6 +134,24 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ [lv_cv_gcc_wlogical_op_equal_expr_broken=yes]) CFLAGS="$save_CFLAGS"]) + AC_CACHE_CHECK([whether clang gives bogus warnings for -Wdouble-promotion], + [lv_cv_clang_double_promotion_broken], [ + save_CFLAGS="$CFLAGS" + CFLAGS="-O2 -Wdouble-promotion -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <math.h> + ]], [[ + float f = 0.0; + return isnan(f);]])], + [lv_cv_clang_double_promotion_broken=no], + [lv_cv_clang_double_promotion_broken=yes]) + CFLAGS="$save_CFLAGS"]) + + if test "$lv_cv_clang_double_promotion_broken" = "yes"; + then + dontwarn="$dontwarn -Wdouble-promotion" + fi + # We might fundamentally need some of these disabled forever, but # ideally we'd turn many of them on dontwarn="$dontwarn -Wfloat-equal" -- 2.13.3

2 1

[libvirt] [PATCH 0/5] Random pre-CAT cleanups
by Martin Kletzander 11 Aug '17

11 Aug '17

There are some patches that don't look related, but I found out they are messed up when working on previous versions that got discarded. Why not keep the cleanups, though, right? Martin Kletzander (5): virxml: Fix indentation tests: Fix indentation in virfilewrapper.c Move resctrl-related code from conf/capabilities to util/virresctrl util: Make virResctrlGetCacheControlType() behave like other functions util: Rename virResctrl to virResctrlInfo include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 144 +++++----------------------------- src/conf/capabilities.h | 26 +----- src/libvirt_private.syms | 7 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 187 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 63 +++++++++++++++ src/util/virxml.c | 34 ++++---- tests/virfilewrapper.c | 4 +- 10 files changed, 302 insertions(+), 166 deletions(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 2.14.0

2 6

[libvirt] [PATCH] qemuBuildMemoryBackendStr: Handle one more corner case
by Michal Privoznik 11 Aug '17

11 Aug '17

https://bugzilla.redhat.com/show_bug.cgi?id=1458638 This code is so complicated because we allow enabling the same bits at many places. Just like in this case: huge pages can be enabled by global <hugepages/> element under <memoryBacking> or on per <memory/> basis. To complicate things a bit more, users are allowed to not specify any specific page size in which case the default page size is used. And this is what is causing this bug. If no page size is specified, @pagesize is keeping value of zero throughout whole function. Therefore we need yet another boolean to hold [use, don't use] information as we can't sue @pagesize for that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 22 ++++++-- .../qemuxml2argv-hugepages-pages7.args | 35 ++++++++++++ .../qemuxml2argv-hugepages-pages7.xml | 65 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-hugepages-pages7.xml | 1 + tests/qemuxml2xmltest.c | 1 + 6 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 604650596..68fc13706 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3250,8 +3250,6 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, virBitmapPtr autoNodeset, bool force) { - virDomainHugePagePtr master_hugepage = NULL; - virDomainHugePagePtr hugepage = NULL; virDomainNumatuneMemMode mode; const long system_page_size = virGetSystemPageSizeKB(); virDomainMemoryAccess memAccess = mem->access; @@ -3264,6 +3262,13 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, mem->targetNode); unsigned long long pagesize = mem->pagesize; bool needHugepage = !!pagesize; + bool useHugepage = !!pagesize; + + /* The difference between @needHugepage and @useHugepage is that the latter + * is true whenever huge page is defined for the current memory cell. + * Either directly, or transitively via global domain huge pages. The + * former is true whenever "memory-backend-file" must be used to satisfy + * @useHugepage. */ *backendProps = NULL; *backendType = NULL; @@ -3290,6 +3295,8 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; if (pagesize == 0) { + virDomainHugePagePtr master_hugepage = NULL; + virDomainHugePagePtr hugepage = NULL; bool thisHugepage = false; /* Find the huge page size we want to use */ @@ -3327,8 +3334,10 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, hugepage = master_hugepage; } - if (hugepage) + if (hugepage) { pagesize = hugepage->size; + useHugepage = true; + } } if (pagesize == system_page_size) { @@ -3336,17 +3345,18 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, * of regular system page size, it's as if they * hasn't specified any huge pages at all. */ pagesize = 0; - hugepage = NULL; + needHugepage = false; + useHugepage = false; } if (!(props = virJSONValueNewObject())) return -1; - if (pagesize || mem->nvdimmPath || memAccess || + if (useHugepage || mem->nvdimmPath || memAccess || def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { *backendType = "memory-backend-file"; - if (pagesize) { + if (useHugepage) { if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) goto cleanup; prealloc = true; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args new file mode 100644 index 000000000..e4229dce6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name fedora \ +-S \ +-M pc-i440fx-2.3 \ +-m size=1048576k,slots=16,maxmem=1099511627776k \ +-smp 2,sockets=2,cores=1,threads=1 \ +-mem-prealloc \ +-mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \ +-numa node,nodeid=0,cpus=0-1,mem=1024 \ +-object memory-backend-file,id=memdimm0,prealloc=yes,\ +mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,\ +host-nodes=1-3,policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ +-object memory-backend-file,id=memdimm1,prealloc=yes,\ +mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,share=no,size=536870912 \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-boot c \ +-usb \ +-drive file=/var/lib/libvirt/images/fedora.qcow2,format=qcow2,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml new file mode 100644 index 000000000..d75cf5afa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml @@ -0,0 +1,65 @@ +<domain type='qemu'> + <name>fedora</name> + <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>2621439</memory> + <currentMemory unit='KiB'>2621439</currentMemory> + <memoryBacking> + <hugepages/> + </memoryBacking> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.3'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu> + <numa> + <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/fedora.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='dimm'> + <source> + <nodemask>1-3</nodemask> + <pagesize unit='KiB'>1048576</pagesize> + </source> + <target> + <size unit='KiB'>1048576</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> + <memory model='dimm' access='private'> + <target> + <size unit='KiB'>524287</size> + <node>0</node> + </target> + <address type='dimm' slot='1'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 655c89bc3..993805231 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -844,6 +844,8 @@ mymain(void) 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("hugepages-pages7", QEMU_CAPS_MEM_PATH, + QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml new file mode 120000 index 000000000..9aafa6e95 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-hugepages-pages7.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0d549adec..311b71356 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -433,6 +433,7 @@ mymain(void) DO_TEST("hugepages-pages4", NONE); DO_TEST("hugepages-pages5", NONE); DO_TEST("hugepages-pages6", NONE); + DO_TEST("hugepages-pages7", NONE); DO_TEST("hugepages-shared", NONE); DO_TEST("hugepages-memaccess", NONE); DO_TEST("hugepages-memaccess2", NONE); -- 2.13.0

2 3

[libvirt] [PATCH python] rpm: rename packages to python2-libvirt / python3-libvirt
by Daniel P. Berrange 10 Aug '17

10 Aug '17

This compiles with Fedora naming policy for python packages Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-python.spec.in | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index ed9f2bd..e4fb17a 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -25,14 +25,32 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%package -n libvirt-python3 +%package -n python2-libvirt +Summary: The libvirt virtualization API python2 binding +Url: http://libvirt.org +License: LGPLv2+ +Group: Development/Libraries +%{?python_provide:%python_provide python2-libvirt} +Provides: libvirt-python = %{version}-%{release} +Obsoletes: libvirt-python < %{version}-%{release} + +%description -n python2-libvirt +The libvirt-python2 package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the libvirt library to use the virtualization capabilities +of recent versions of Linux (and other OSes). + +%package -n python3-libvirt Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org License: LGPLv2+ Group: Development/Libraries +%{?python_provide:%python_provide python3-libvirt} +Provides: libvirt-python3 = %{version}-%{release} +Obsoletes: libvirt-python3 < %{version}-%{release} -%description -n libvirt-python3 -The libvirt-python package contains a module that permits applications +%description -n python3-libvirt +The libvirt-python3 package contains a module that permits applications written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). @@ -57,7 +75,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{__python} setup.py test %{__python3} setup.py test -%files +%files -n python2-libvirt %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{_libdir}/python2*/site-packages/libvirt.py* @@ -66,7 +84,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python2*/site-packages/libvirtmod* %{_libdir}/python2*/site-packages/*egg-info -%files -n libvirt-python3 +%files -n python3-libvirt %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{_libdir}/python3*/site-packages/libvirt.py* -- 2.13.3

3 2

[libvirt] [PATCH python] rpm: assume python3 is always available
by Daniel P. Berrange 10 Aug '17

10 Aug '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-python.spec.in | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index fc30564..ed9f2bd 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -1,9 +1,4 @@ -%define with_python3 0 -%if 0%{?fedora} > 18 -%define with_python3 1 -%endif - Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ @@ -16,11 +11,9 @@ BuildRequires: libvirt-devel >= @C_VERSION@ BuildRequires: python-devel BuildRequires: python-nose BuildRequires: python-lxml -%if %{with_python3} BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-lxml -%endif # Don't want provides for python shared objects %{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so} @@ -32,7 +25,6 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%if %{with_python3} %package -n libvirt-python3 Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -44,7 +36,6 @@ The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%endif %prep %setup -q @@ -56,21 +47,15 @@ find examples -type f -exec chmod 0644 \{\} \; %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build -%if %{with_python3} CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build -%endif %install %{__python} setup.py install --skip-build --root=%{buildroot} -%if %{with_python3} %{__python3} setup.py install --skip-build --root=%{buildroot} -%endif %check %{__python} setup.py test -%if %{with_python3} %{__python3} setup.py test -%endif %files %defattr(-,root,root) @@ -81,7 +66,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python2*/site-packages/libvirtmod* %{_libdir}/python2*/site-packages/*egg-info -%if %{with_python3} %files -n libvirt-python3 %defattr(-,root,root) %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ @@ -95,6 +79,5 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{_libdir}/python3*/site-packages/__pycache__/libvirtaio.cpython-*.py* %{_libdir}/python3*/site-packages/libvirtmod* %{_libdir}/python3*/site-packages/*egg-info -%endif %changelog -- 2.13.3

2 4

[libvirt] [PATCH python v2] Change Obsoletes to an explicit version
by Daniel P. Berrange 10 Aug '17

10 Aug '17

We only want to obsolete versions which actually had the original name, not all future versions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Fix both sub-rpms libvirt-python.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index e4fb17a..1905191 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -32,7 +32,7 @@ License: LGPLv2+ Group: Development/Libraries %{?python_provide:%python_provide python2-libvirt} Provides: libvirt-python = %{version}-%{release} -Obsoletes: libvirt-python < %{version}-%{release} +Obsoletes: libvirt-python <= 3.6.0-1%{?dist} %description -n python2-libvirt The libvirt-python2 package contains a module that permits applications @@ -47,7 +47,7 @@ License: LGPLv2+ Group: Development/Libraries %{?python_provide:%python_provide python3-libvirt} Provides: libvirt-python3 = %{version}-%{release} -Obsoletes: libvirt-python3 < %{version}-%{release} +Obsoletes: libvirt-python3 <= 3.6.0-1%{?dist} %description -n python3-libvirt The libvirt-python3 package contains a module that permits applications -- 2.13.3

1 0

[libvirt] [PATCH python] Change Obsoletes to an explicit version
by Daniel P. Berrange 10 Aug '17

10 Aug '17

We only want to obsolete versions which actually had the original name, not all future versions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-python.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index e4fb17a..fca3086 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -32,7 +32,7 @@ License: LGPLv2+ Group: Development/Libraries %{?python_provide:%python_provide python2-libvirt} Provides: libvirt-python = %{version}-%{release} -Obsoletes: libvirt-python < %{version}-%{release} +Obsoletes: libvirt-python <= 3.6.0-1%{?dist} %description -n python2-libvirt The libvirt-python2 package contains a module that permits applications -- 2.13.3

1 0

[libvirt] [PATCH python] Avoid comparing boolean and integers
by Daniel P. Berrange 10 Aug '17

10 Aug '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-utils.c b/libvirt-utils.c index 727397d..0af13dc 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -108,7 +108,7 @@ virReallocN(void *ptrptr, return -1; } tmp = realloc(*(void**)ptrptr, size * count); - if (!tmp && (size * count)) { + if (!tmp && ((size * count) != 0)) { return -1; } *(void**)ptrptr = tmp; -- 2.13.3

2 2

[libvirt] [PATCH 0/5] Another round of mem leak fixes
by Michal Privoznik 10 Aug '17

10 Aug '17

*** BLURB HERE *** Michal Privoznik (5): virDomainNetDefClear: Free @coalesce testCompareMemLock: Use correct free function for domain def securityselinuxtest: Don't leak @mgr vircgrouptest: Don't leak @cgroup virhostdevtest: Don't leak @mgr->activeSCSIHostdevs src/conf/domain_conf.c | 1 + tests/qemumemlocktest.c | 2 +- tests/securityselinuxtest.c | 1 + tests/vircgrouptest.c | 3 +++ tests/virhostdevtest.c | 3 ++- 5 files changed, 8 insertions(+), 2 deletions(-) -- 2.13.0

3 8

[libvirt] Qemu only support VHDx disk format, but libvirt force use VHD format
by Komeiji Kuroko 10 Aug '17

10 Aug '17

Hello all, I am trying to use a VHDx format disk on libvirt. According to https://en.wikibooks.org/wiki/QEMU/Images, Qemu supports VHDx but not VHD. But when I set disk format to 'vhdx' in virt-manager, it prompts "Error changing VM configuration: Expected a wrapped C Object but got <type 'NoneType'>" Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/addhardware.py", line 765, in change_config_helper define_func(devobj=devobj, do_hotplug=False, **define_args) File "/usr/share/virt-manager/virtManager/domain.py", line 847, in define_disk self._redefine_xmlobj(xmlobj) File "/usr/share/virt-manager/virtManager/libvirtobject.py", line 389, in _redefine_xmlobj self._define(newxml) File "/usr/share/virt-manager/virtManager/domain.py", line 1156, in _define self.conn.define_domain(newxml) File "/usr/share/virt-manager/virtManager/connection.py", line 678, in define_domain return self._backend.defineXML(xml) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 3622, in defineXML __tmp = virDomain(self,_obj=ret) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 453, in __init__ raise Exception("Expected a wrapped C Object but got %s" % type(_obj)) Exception: Expected a wrapped C Object but got <type 'NoneType'> Then I use `virsh edit MyDOM` to edit my domain XML, change disk format to "vhdx" then I get error: "Unable to validate doc against /usr/share/libvirt/schemas/domain.rng". So I edit /usr/share/libvirt/schemas/storagecommon.rng, change "<value>vhd</value>" to "<value>vhdx</value>" in <define name='storageFormat'>. But it still not works, and virsh tells me `error: unsupported configuration: unknown driver format value 'vhdx' `. I choice ignore , but then same error and I can't ignore: only Yes to re-edit or No to give up. Then I suppose "vhd" in libvirt means "vhdx", so I change disk format to "vhd". But then when I run domain, Qemu get error: " Unknown driver 'vhd' ". It seems libvirt pass "vhd" to Qemu, but Qemu only support "vhdx" At last, I use Qemu paramaters: ` -drive file=/Path/To/File.vhdx,format=vhdx,if=none,id=drive-sata0-0-3 `, and it works. When I use `-drive format=vhd` , Qemu gives me same error: " Unknown driver 'vhd' ". So I think it maybe a bug that libvirt forcely demand format is "vhd" and I find no way to change it, but in same time Qemu only accept format "vhdx" as paramater. I try to edit `/usr/lib/python2.7/dist-packages/libvirt.py` but I have no idea how to modify it. And it seems only changing of storagecommon.rng is not enough. My libvirt version is 3.6.0 and Qemu version is 2.8.1. Regards, Mitori

2 1

[libvirt] [RESEND] pci: add support for VMD domains
by Jon Derrick 09 Aug '17

09 Aug '17

VMD domains start at 0x10000, so expand dev->name to fit at least this many characters. Signed-off-by: Jon Derrick <jonathan.derrick(a)intel.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 2c1b758..b3afefe 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -50,7 +50,7 @@ VIR_LOG_INIT("util.pci"); #define PCI_SYSFS "/sys/bus/pci/" #define PCI_ID_LEN 10 /* "XXXX XXXX" */ -#define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ +#define PCI_ADDR_LEN 14 /* "XXXXX:XX:XX.X" */ VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST, "", "2.5", "5", "8", "16") -- 2.9.4

2 3

[libvirt] [PATCH v2] Rewrite the way mockable functions are handled.
by Daniel P. Berrange 09 Aug '17

09 Aug '17

Currently any mockable functions are marked with attributes noinline, noclone and weak. This prevents the compiler from optimizing away the impl of these functions. It has an unfortunate side effect with the libtool convenience libraries, if executables directly link to them. For example virlockd, virlogd both link to libvirt_util.la When this is done, the linker does not consider weak symbols as being undefined, so it never copies them into the final executable. In this new approach, we stop annotating the headers entirely. Instead we create a weak function alias in the source. int fooImpl(void) { ..the real code.. } int foo(void) __attribute__((noinline, noclone, weak, alias("fooImpl")) If any functions in the same file call "foo", this prevents the optimizer from inlining any part of fooImpl. When linking to the libtool convenience static library, we also get all the symbols present. Finally the test suite can just directly define a 'foo' function in its source, removing the need to use LD_PRELOAD (though removal of LD_PRELOADS is left for a future patch). Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Use macro magic to define the alias build-aux/mock-noinline.pl | 22 +++-------- src/check-symfile.pl | 2 +- src/internal.h | 36 +++++++++++++----- src/qemu/qemu_capabilities.c | 7 ++-- src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsocket.c | 43 ++++++++++++---------- src/rpc/virnetsocket.h | 6 +-- src/util/vircommand.c | 4 +- src/util/vircommand.h | 2 +- src/util/vircrypto.c | 3 +- src/util/vircrypto.h | 2 +- src/util/virfile.c | 3 +- src/util/virfile.h | 2 +- src/util/virhashcode.c | 3 +- src/util/virhashcode.h | 3 +- src/util/virhostcpu.c | 12 ++++-- src/util/virhostcpu.h | 4 +- src/util/virmacaddr.c | 5 ++- src/util/virmacaddr.h | 2 +- src/util/virnetdev.c | 25 ++++++++----- src/util/virnetdev.h | 9 ++--- src/util/virnetdevip.c | 19 +++++----- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.c | 7 ++-- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.c | 40 +++++++++++--------- src/util/virnetdevtap.h | 6 +-- src/util/virnuma.c | 81 ++++++++++++++++++++++++----------------- src/util/virnuma.h | 16 ++++---- src/util/virrandom.c | 14 ++++--- src/util/virrandom.h | 6 +-- src/util/virscsi.c | 11 +++--- src/util/virscsi.h | 2 +- src/util/virscsivhost.c | 3 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.c | 3 +- src/util/virtpm.h | 2 +- src/util/virutil.c | 24 ++++++++---- src/util/virutil.h | 10 ++--- src/util/viruuid.c | 4 +- src/util/viruuid.h | 2 +- 41 files changed, 257 insertions(+), 196 deletions(-) diff --git a/build-aux/mock-noinline.pl b/build-aux/mock-noinline.pl index eafe20d2e..cac46b767 100644 --- a/build-aux/mock-noinline.pl +++ b/build-aux/mock-noinline.pl @@ -8,12 +8,12 @@ my %mocked; $noninlined{"virEventAddTimeout"} = 1; foreach my $arg (@ARGV) { - if ($arg =~ /\.h$/) { - #print "Scan header $arg\n"; - &scan_annotations($arg); - } elsif ($arg =~ /mock\.c$/) { + if ($arg =~ /mock\.c$/) { #print "Scan mock $arg\n"; &scan_overrides($arg); + } elsif ($arg =~ /\.c$/) { + #print "Scan header $arg\n"; + &scan_annotations($arg); } } @@ -35,18 +35,8 @@ sub scan_annotations { my $func; while (<FH>) { - if (/^\s*(\w+)$/ || /^(?:\w+\*?\s+)+(?:\*\s*)?(\w+)\(/) { - my $name = $1; - if ($name !~ /ATTRIBUTE/) { - $func = $name; - } - } elsif (/^\s*$/) { - $func = undef; - } - if (/ATTRIBUTE_NOINLINE/) { - if (defined $func) { - $noninlined{$func} = 1; - } + if (/VIR_MOCKABLE\((\w+)$/) { + $noninlined{$1} = 1; } } diff --git a/src/check-symfile.pl b/src/check-symfile.pl index d59a213eb..3b062d0a4 100755 --- a/src/check-symfile.pl +++ b/src/check-symfile.pl @@ -52,7 +52,7 @@ foreach my $elflib (@elflibs) { open NM, "-|", "nm", $elflib or die "cannot run 'nm $elflib': $!"; while (<NM>) { - next unless /^\S+\s(?:[TBD])\s(\S+)\s*$/; + next unless /^\S+\s(?:[TBDW])\s(\S+)\s*$/; $gotsyms{$1} = 1; } diff --git a/src/internal.h b/src/internal.h index c29f20f02..6838f7798 100644 --- a/src/internal.h +++ b/src/internal.h @@ -113,16 +113,6 @@ # endif /** - * ATTRIBUTE_NOINLINE: - * - * Force compiler not to inline a method. Should be used if - * the method need to be overridable by test mocks. - */ -# ifndef ATTRIBUTE_NOINLINE -# define ATTRIBUTE_NOINLINE __attribute__((__noinline__)) -# endif - -/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling @@ -232,6 +222,32 @@ # define VIR_WARNINGS_NO_WLOGICALOP_STRCHR # endif +# if WIN32 +# if __GNUC_PREREQ(4, 5) +# define VIR_MOCKABLE(name) \ + typeof(name) name ## Impl; \ + typeof(name) name \ + __attribute__((noinline, noclone, __alias__(#name "Impl"))) +# else +# define VIR_MOCKABLE(name) \ + typeof(name) name ## Impl; \ + typeof(name) name \ + __attribute__((noinline, __alias__(#name "Impl"))) +# endif +# else +# if __GNUC_PREREQ(4, 5) +# define VIR_MOCKABLE(name) \ + typeof(name) name ##Impl; \ + typeof(name) name \ + __attribute__((noinline, noclone, weak, __alias__(#name "Impl"))) +# else +# define VIR_MOCKABLE(name) \ + typeof(name) name ##Impl; \ + typeof(name) name \ + __attribute__((noinline, weak, __alias__(#name "Impl"))) +# endif +# endif + /* * Use this when passing possibly-NULL strings to printf-a-likes. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e61d2f7b0..f07af3c01 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1157,10 +1157,11 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, } +VIR_MOCKABLE(virQEMUCapsProbeHostCPUForEmulator); virCPUDefPtr -virQEMUCapsProbeHostCPUForEmulator(virArch hostArch, - virQEMUCapsPtr qemuCaps, - virDomainVirtType type) +virQEMUCapsProbeHostCPUForEmulatorImpl(virArch hostArch, + virQEMUCapsPtr qemuCaps, + virDomainVirtType type) { size_t nmodels; char **models; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index d05256bd3..41763e3d4 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -81,7 +81,7 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps, virCPUDefPtr virQEMUCapsProbeHostCPUForEmulator(virArch hostArch, virQEMUCapsPtr qemuCaps, - virDomainVirtType type) ATTRIBUTE_NOINLINE; + virDomainVirtType type); void virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d228c8a8c..ee963bb60 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1425,11 +1425,12 @@ int virNetSocketGetPort(virNetSocketPtr sock) #if defined(SO_PEERCRED) -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(virNetSocketGetUNIXIdentity); +int virNetSocketGetUNIXIdentityImpl(virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { # if defined(HAVE_STRUCT_SOCKPEERCRED) struct sockpeercred cr; @@ -1482,11 +1483,12 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, # define VIR_SOL_PEERCRED 0 # endif -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(virNetSocketGetUNIXIdentity); +int virNetSocketGetUNIXIdentityImpl(virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { struct xucred cr; socklen_t cr_len = sizeof(cr); @@ -1550,11 +1552,12 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, - uid_t *uid ATTRIBUTE_UNUSED, - gid_t *gid ATTRIBUTE_UNUSED, - pid_t *pid ATTRIBUTE_UNUSED, - unsigned long long *timestamp ATTRIBUTE_UNUSED) +VIR_MOCKABLE(virNetSocketGetUNIXIdentity); +int virNetSocketGetUNIXIdentityImpl(virNetSocketPtr sock ATTRIBUTE_UNUSED, + uid_t *uid ATTRIBUTE_UNUSED, + gid_t *gid ATTRIBUTE_UNUSED, + pid_t *pid ATTRIBUTE_UNUSED, + unsigned long long *timestamp ATTRIBUTE_UNUSED) { /* XXX Many more OS support UNIX socket credentials we could port to. See dbus ....*/ virReportSystemError(ENOSYS, "%s", @@ -1564,8 +1567,9 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, #endif #ifdef WITH_SELINUX -int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) +VIR_MOCKABLE(virNetSocketGetSELinuxContext); +int virNetSocketGetSELinuxContextImpl(virNetSocketPtr sock, + char **context) { security_context_t seccon = NULL; int ret = -1; @@ -1593,8 +1597,9 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, - char **context) +VIR_MOCKABLE(virNetSocketGetSELinuxContext); +int virNetSocketGetSELinuxContextImpl(virNetSocketPtr sock ATTRIBUTE_UNUSED, + char **context) { *context = NULL; return 0; diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index de795af91..1e75ee62b 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -136,11 +136,9 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, uid_t *uid, gid_t *gid, pid_t *pid, - unsigned long long *timestamp) - ATTRIBUTE_NOINLINE; + unsigned long long *timestamp); int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) - ATTRIBUTE_NOINLINE; + char **context); int virNetSocketSetBlocking(virNetSocketPtr sock, bool blocking); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 60c1121da..5ecd7fdaa 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -985,8 +985,9 @@ virCommandNewVAList(const char *binary, va_list list) * be closed in the parent no later than Run/RunAsync/Free. The parent * should cease using the @fd when this call completes */ +VIR_MOCKABLE(virCommandPassFD); void -virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) +virCommandPassFDImpl(virCommandPtr cmd, int fd, unsigned int flags) { int ret = 0; @@ -1012,6 +1013,7 @@ virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) } } + /** * virCommandPassListenFDs: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index e7c2e513b..99dcdeb54 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -58,7 +58,7 @@ enum { void virCommandPassFD(virCommandPtr cmd, int fd, - unsigned int flags) ATTRIBUTE_NOINLINE; + unsigned int flags); void virCommandPassListenFDs(virCommandPtr cmd); diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 48b04fc8c..de9f637dd 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -300,8 +300,9 @@ virCryptoEncryptData(virCryptoCipher algorithm, * * Returns pointer memory containing byte stream on success, NULL on failure */ +VIR_MOCKABLE(virCryptoGenerateRandom); uint8_t * -virCryptoGenerateRandom(size_t nbytes) +virCryptoGenerateRandomImpl(size_t nbytes) { uint8_t *buf; int ret; diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h index 068602f5d..52ba3b3ad 100644 --- a/src/util/vircrypto.h +++ b/src/util/vircrypto.h @@ -55,6 +55,6 @@ int virCryptoEncryptData(virCryptoCipher algorithm, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK; -uint8_t *virCryptoGenerateRandom(size_t nbytes) ATTRIBUTE_NOINLINE; +uint8_t *virCryptoGenerateRandom(size_t nbytes); #endif /* __VIR_CRYPTO_H__ */ diff --git a/src/util/virfile.c b/src/util/virfile.c index 2f28e83f4..5bdd336dc 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1824,8 +1824,9 @@ virFileIsDir(const char *path) * Returns true if the file exists, false if it doesn't, setting errno * appropriately. */ +VIR_MOCKABLE(virFileExists); bool -virFileExists(const char *path) +virFileExistsImpl(const char *path) { return access(path, F_OK) == 0; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 57ceb8072..40034f08f 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -188,7 +188,7 @@ void virFileActivateDirOverride(const char *argv0) off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); -bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NOINLINE; +bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); enum { diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 310ec891c..3adca6740 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -56,7 +56,8 @@ static inline uint32_t fmix(uint32_t h) } -uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) +VIR_MOCKABLE(virHashCodeGen); +uint32_t virHashCodeGenImpl(const void *key, size_t len, uint32_t seed) { const uint8_t *blocks; const uint8_t *tail; diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index f8171df26..7732f816c 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -30,7 +30,6 @@ # include "internal.h" -uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) - ATTRIBUTE_NOINLINE; +uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); #endif /* __VIR_HASH_CODE_H__ */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c485a9721..31a513e93 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1112,8 +1112,9 @@ virHostCPUGetMap(unsigned char **cpumap, * * Returns the number of threads per subcore if subcores are in use, zero * if subcores are not in use, and a negative value on error */ +VIR_MOCKABLE(virHostCPUGetThreadsPerSubcore); int -virHostCPUGetThreadsPerSubcore(virArch arch) +virHostCPUGetThreadsPerSubcoreImpl(virArch arch) { int threads_per_subcore = 0; int kvmfd; @@ -1158,8 +1159,9 @@ virHostCPUGetThreadsPerSubcore(virArch arch) /* Fallback for nodeGetThreadsPerSubcore() used when KVM headers * are not available on the system */ +VIR_MOCKABLE(virHostCPUGetThreadsPerSubcore); int -virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED) +virHostCPUGetThreadsPerSubcoreImpl(virArch arch ATTRIBUTE_UNUSED) { return 0; } @@ -1167,8 +1169,9 @@ virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED) #endif /* HAVE_LINUX_KVM_H && defined(KVM_CAP_PPC_SMT) */ #if HAVE_LINUX_KVM_H +VIR_MOCKABLE(virHostCPUGetKVMMaxVCPUs); int -virHostCPUGetKVMMaxVCPUs(void) +virHostCPUGetKVMMaxVCPUsImpl(void) { int fd; int ret; @@ -1198,8 +1201,9 @@ virHostCPUGetKVMMaxVCPUs(void) return ret; } #else +VIR_MOCKABLE(virHostCPUGetKVMMaxVCPUs); int -virHostCPUGetKVMMaxVCPUs(void) +virHostCPUGetKVMMaxVCPUsImpl(void) { virReportSystemError(ENOSYS, "%s", _("KVM is not supported on this platform")); diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 67033de84..e9c22eecc 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -38,7 +38,7 @@ bool virHostCPUHasBitmap(void); virBitmapPtr virHostCPUGetPresentBitmap(void); virBitmapPtr virHostCPUGetOnlineBitmap(void); int virHostCPUGetCount(void); -int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_NOINLINE; +int virHostCPUGetThreadsPerSubcore(virArch arch); int virHostCPUGetMap(unsigned char **cpumap, unsigned int *online, @@ -51,7 +51,7 @@ int virHostCPUGetInfo(virArch hostarch, unsigned int *cores, unsigned int *threads); -int virHostCPUGetKVMMaxVCPUs(void) ATTRIBUTE_NOINLINE; +int virHostCPUGetKVMMaxVCPUs(void); int virHostCPUStatsAssign(virNodeCPUStatsPtr param, const char *name, diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 7afe032b9..c198b4a86 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -223,8 +223,9 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr) return 0; } -void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) +VIR_MOCKABLE(virMacAddrGenerate); +void virMacAddrGenerateImpl(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], + virMacAddrPtr addr) { addr->addr[0] = prefix[0]; addr->addr[1] = prefix[1]; diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index f4f5e2ce1..ae26867d4 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -48,7 +48,7 @@ void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]); const char *virMacAddrFormat(const virMacAddr *addr, char *str); void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) ATTRIBUTE_NOINLINE; + virMacAddrPtr addr); int virMacAddrParse(const char* str, virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK; int virMacAddrParseHex(const char* str, diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 90b7bee34..374291d76 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -346,9 +346,10 @@ virNetDevSetMACInternal(const char *ifname, #endif +VIR_MOCKABLE(virNetDevSetMAC); int -virNetDevSetMAC(const char *ifname, - const virMacAddr *macaddr) +virNetDevSetMACImpl(const char *ifname, + const virMacAddr *macaddr) { return virNetDevSetMACInternal(ifname, macaddr, false); } @@ -686,9 +687,10 @@ virNetDevSetIFFlag(const char *ifname, * * Returns 0 in case of success or -1 on error. */ +VIR_MOCKABLE(virNetDevSetOnline); int -virNetDevSetOnline(const char *ifname, - bool online) +virNetDevSetOnlineImpl(const char *ifname, + bool online) { return virNetDevSetIFFlag(ifname, VIR_IFF_UP, online); @@ -1122,9 +1124,10 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, #ifdef __linux__ +VIR_MOCKABLE(virNetDevSysfsFile); int -virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, - const char *file) +virNetDevSysfsFileImpl(char **pf_sysfs_device_link, const char *ifname, + const char *file) { if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file) < 0) @@ -1491,10 +1494,11 @@ virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED, return -1; } +VIR_MOCKABLE(virNetDevSysfsFile); int -virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - const char *file ATTRIBUTE_UNUSED) +virNetDevSysfsFileImpl(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, + const char *ifname ATTRIBUTE_UNUSED, + const char *file ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get sysfs info on this platform")); @@ -3268,8 +3272,9 @@ int virNetDevSetCoalesce(const char *ifname, * This function executes script for new tap device created by libvirt. * Returns 0 in case of success or -1 on failure */ +VIR_MOCKABLE(virNetDevRunEthernetScript); int -virNetDevRunEthernetScript(const char *ifname, const char *script) +virNetDevRunEthernetScriptImpl(const char *ifname, const char *script) { virCommandPtr cmd; int ret; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 51fcae544..c2c09af63 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -156,7 +156,7 @@ int virNetDevExists(const char *brname) int virNetDevSetOnline(const char *ifname, bool online) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetOnline(const char *ifname, bool *online) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -164,7 +164,7 @@ int virNetDevGetOnline(const char *ifname, int virNetDevSetMAC(const char *ifname, const virMacAddr *macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevGetMAC(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -303,8 +303,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_RETURN_CHECK; -int virNetDevRunEthernetScript(const char *ifname, const char *script) - ATTRIBUTE_NOINLINE; +int virNetDevRunEthernetScript(const char *ifname, const char *script); #endif /* __VIR_NETDEV_H__ */ diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bf98ed8a5..b0c225001 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -163,11 +163,12 @@ virNetDevCreateNetlinkAddressMessage(int messageType, * * Returns 0 in case of success or -1 in case of error. */ +VIR_MOCKABLE(virNetDevIPAddrAdd); int -virNetDevIPAddrAdd(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) +virNetDevIPAddrAddImpl(const char *ifname, + virSocketAddr *addr, + virSocketAddr *peer, + unsigned int prefix) { virSocketAddr *broadcast = NULL; int ret = -1; @@ -680,12 +681,12 @@ virNetDevIPCheckIPv6Forwarding(void) #else /* defined(__linux__) && defined(HAVE_LIBNL) */ - +VIR_MOCKABLE(virNetDevIPAddrAdd); int -virNetDevIPAddrAdd(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) +virNetDevIPAddrAddImpl(const char *ifname, + virSocketAddr *addr, + virSocketAddr *peer, + unsigned int prefix) { virCommandPtr cmd = NULL; char *addrstr = NULL, *bcaststr = NULL, *peerstr = NULL; diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 6b509ea44..cc466ca25 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -67,7 +67,7 @@ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, virSocketAddr *peer, unsigned int prefix) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr addr, unsigned int prefix, diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 06ce9d8ee..bf1d71bbf 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -405,7 +405,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, } /** - * virNetDevOpenvswitchVhostuserGetIfname: + * virNetDevOpenvswitchGetVhostuserIfname: * @path: the path of the unix socket * @ifname: the retrieved name of the interface * @@ -415,9 +415,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, * 0 if it is not, but no other error occurred, * -1 otherwise. */ +VIR_MOCKABLE(virNetDevOpenvswitchGetVhostuserIfname); int -virNetDevOpenvswitchGetVhostuserIfname(const char *path, - char **ifname) +virNetDevOpenvswitchGetVhostuserIfnameImpl(const char *path, + char **ifname) { virCommandPtr cmd = NULL; char *tmpIfname = NULL; diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 6f6e620c2..7965dee5b 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -59,7 +59,7 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, int virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevOpenvswitchUpdateVlan(const char *ifname, virNetDevVlanPtr virtVlan) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 175dc2bfa..9971f6675 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -98,8 +98,9 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED) * Returns the proper interface name or NULL if no corresponding interface * found. */ +VIR_MOCKABLE(virNetDevTapGetRealDeviceName); char* -virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) +virNetDevTapGetRealDeviceNameImpl(char *ifname ATTRIBUTE_UNUSED) { #ifdef TAPGIFNAME char *ret = NULL; @@ -238,11 +239,12 @@ virNetDevProbeVnetHdr(int tapfd) * * Returns 0 in case of success or -1 on failure. */ -int virNetDevTapCreate(char **ifname, - const char *tunpath, - int *tapfd, - size_t tapfdSize, - unsigned int flags) +VIR_MOCKABLE(virNetDevTapCreate); +int virNetDevTapCreateImpl(char **ifname, + const char *tunpath, + int *tapfd, + size_t tapfdSize, + unsigned int flags) { size_t i; struct ifreq ifr; @@ -373,11 +375,12 @@ int virNetDevTapDelete(const char *ifname, return ret; } #elif defined(SIOCIFCREATE2) && defined(SIOCIFDESTROY) && defined(IF_MAXUNIT) -int virNetDevTapCreate(char **ifname, - const char *tunpath ATTRIBUTE_UNUSED, - int *tapfd, - size_t tapfdSize, - unsigned int flags ATTRIBUTE_UNUSED) +VIR_MOCKABLE(virNetDevTapCreate); +int virNetDevTapCreateImpl(char **ifname, + const char *tunpath ATTRIBUTE_UNUSED, + int *tapfd, + size_t tapfdSize, + unsigned int flags ATTRIBUTE_UNUSED) { int s; struct ifreq ifr; @@ -484,11 +487,12 @@ int virNetDevTapDelete(const char *ifname, } #else -int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED, - const char *tunpath ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) +VIR_MOCKABLE(virNetDevTapCreate); +int virNetDevTapCreateImpl(char **ifname ATTRIBUTE_UNUSED, + const char *tunpath ATTRIBUTE_UNUSED, + int *tapfd ATTRIBUTE_UNUSED, + size_t tapfdSize ATTRIBUTE_UNUSED, + unsigned int flags ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to create TAP devices on this platform")); @@ -608,7 +612,9 @@ virNetDevTapAttachBridge(const char *tapname, * * Returns 0 in case of success or -1 on failure */ -int virNetDevTapCreateInBridgePort(const char *brname, +VIR_MOCKABLE(virNetDevTapCreateInBridgePort); +int +virNetDevTapCreateInBridgePortImpl(const char *brname, char **ifname, const virMacAddr *macaddr, const unsigned char *vmuuid, diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index 0b17feb8d..bd5ec14d4 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -39,7 +39,7 @@ int virNetDevTapCreate(char **ifname, int *tapfd, size_t tapfdSize, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevTapDelete(const char *ifname, const char *tunpath) @@ -49,7 +49,7 @@ int virNetDevTapGetName(int tapfd, char **ifname) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; char* virNetDevTapGetRealDeviceName(char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; typedef enum { VIR_NETDEV_TAP_CREATE_NONE = 0, @@ -89,7 +89,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int *actualMTU, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_RETURN_CHECK; int virNetDevTapInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index bebe301f8..77a954d2f 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -160,8 +160,9 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, return ret; } +VIR_MOCKABLE(virNumaIsAvailable); bool -virNumaIsAvailable(void) +virNumaIsAvailableImpl(void) { return numa_available() != -1; } @@ -174,8 +175,9 @@ virNumaIsAvailable(void) * * Returns the highest NUMA node id on success, -1 on error. */ +VIR_MOCKABLE(virNumaGetMaxNode); int -virNumaGetMaxNode(void) +virNumaGetMaxNodeImpl(void) { int ret; @@ -207,10 +209,11 @@ virNumaGetMaxNode(void) * * Returns 0 on success, -1 on error. Does not report errors. */ +VIR_MOCKABLE(virNumaGetNodeMemory); int -virNumaGetNodeMemory(int node, - unsigned long long *memsize, - unsigned long long *memfree) +virNumaGetNodeMemoryImpl(int node, + unsigned long long *memsize, + unsigned long long *memfree) { long long node_size; long long node_free; @@ -248,9 +251,10 @@ virNumaGetNodeMemory(int node, # define n_bits(var) (8 * sizeof(var)) # define MASK_CPU_ISSET(mask, cpu) \ (((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1) +VIR_MOCKABLE(virNumaGetNodeCPUs); int -virNumaGetNodeCPUs(int node, - virBitmapPtr *cpus) +virNumaGetNodeCPUsImpl(int node, + virBitmapPtr *cpus) { unsigned long *mask = NULL; unsigned long *allonesmask = NULL; @@ -321,15 +325,17 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode ATTRIBUTE_UNUSED, return 0; } +VIR_MOCKABLE(virNumaIsAvailable); bool -virNumaIsAvailable(void) +virNumaIsAvailableImpl(void) { return false; } +VIR_MOCKABLE(virNumaGetMaxNode); int -virNumaGetMaxNode(void) +virNumaGetMaxNodeImpl(void) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA isn't available on this host")); @@ -337,10 +343,11 @@ virNumaGetMaxNode(void) } +VIR_MOCKABLE(virNumaGetNodeMemory); int -virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, - unsigned long long *memsize, - unsigned long long *memfree) +virNumaGetNodeMemoryImpl(int node ATTRIBUTE_UNUSED, + unsigned long long *memsize, + unsigned long long *memfree) { if (memsize) *memsize = 0; @@ -353,9 +360,10 @@ virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, } +VIR_MOCKABLE(virNumaGetNodeCPUs); int -virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, - virBitmapPtr *cpus) +virNumaGetNodeCPUsImpl(int node ATTRIBUTE_UNUSED, + virBitmapPtr *cpus) { *cpus = NULL; @@ -390,8 +398,9 @@ virNumaGetMaxCPUs(void) * Returns: true if @node is available, * false if @node doesn't exist */ +VIR_MOCKABLE(virNumaNodeIsAvailable); bool -virNumaNodeIsAvailable(int node) +virNumaNodeIsAvailableImpl(int node) { return numa_bitmask_isbitset(numa_nodes_ptr, node); } @@ -416,10 +425,11 @@ virNumaNodeIsAvailable(int node) * * Returns 0 on success, -1 otherwise. */ +VIR_MOCKABLE(virNumaGetDistances); int -virNumaGetDistances(int node, - int **distances, - int *ndistances) +virNumaGetDistancesImpl(int node, + int **distances, + int *ndistances) { int ret = -1; int max_node; @@ -454,8 +464,9 @@ virNumaGetDistances(int node, #else /* !(WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET) */ +VIR_MOCKABLE(virNumaNodeIsAvailable); bool -virNumaNodeIsAvailable(int node) +virNumaNodeIsAvailableImpl(int node) { int max_node = virNumaGetMaxNode(); @@ -467,10 +478,11 @@ virNumaNodeIsAvailable(int node) } +VIR_MOCKABLE(virNumaGetDistances); int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, - int **distances, - int *ndistances) +virNumaGetDistancesImpl(int node ATTRIBUTE_UNUSED, + int **distances, + int *ndistances) { *distances = NULL; *ndistances = 0; @@ -706,12 +718,13 @@ virNumaGetPageInfo(int node, * * Returns 0 on success, -1 otherwise. */ +VIR_MOCKABLE(virNumaGetPages); int -virNumaGetPages(int node, - unsigned int **pages_size, - unsigned int **pages_avail, - unsigned int **pages_free, - size_t *npages) +virNumaGetPagesImpl(int node, + unsigned int **pages_size, + unsigned int **pages_avail, + unsigned int **pages_free, + size_t *npages) { int ret = -1; char *path = NULL; @@ -943,12 +956,13 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, } +VIR_MOCKABLE(virNumaGetPages); int -virNumaGetPages(int node ATTRIBUTE_UNUSED, - unsigned int **pages_size ATTRIBUTE_UNUSED, - unsigned int **pages_avail ATTRIBUTE_UNUSED, - unsigned int **pages_free ATTRIBUTE_UNUSED, - size_t *npages ATTRIBUTE_UNUSED) +virNumaGetPagesImpl(int node ATTRIBUTE_UNUSED, + unsigned int **pages_size ATTRIBUTE_UNUSED, + unsigned int **pages_avail ATTRIBUTE_UNUSED, + unsigned int **pages_free ATTRIBUTE_UNUSED, + size_t *npages ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page info is not supported on this platform")); @@ -968,8 +982,9 @@ virNumaSetPagePoolSize(int node ATTRIBUTE_UNUSED, } #endif /* #ifdef __linux__ */ +VIR_MOCKABLE(virNumaNodesetIsAvailable); bool -virNumaNodesetIsAvailable(virBitmapPtr nodeset) +virNumaNodesetIsAvailableImpl(virBitmapPtr nodeset) { ssize_t bit = -1; diff --git a/src/util/virnuma.h b/src/util/virnuma.h index e4e1fd0b9..f3eef324a 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -34,20 +34,20 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, virBitmapPtr nodeset); virBitmapPtr virNumaGetHostMemoryNodeset(void); -bool virNumaNodesetIsAvailable(virBitmapPtr nodeset) ATTRIBUTE_NOINLINE; -bool virNumaIsAvailable(void) ATTRIBUTE_NOINLINE; -int virNumaGetMaxNode(void) ATTRIBUTE_NOINLINE; -bool virNumaNodeIsAvailable(int node) ATTRIBUTE_NOINLINE; +bool virNumaNodesetIsAvailable(virBitmapPtr nodeset); +bool virNumaIsAvailable(void); +int virNumaGetMaxNode(void); +bool virNumaNodeIsAvailable(int node); int virNumaGetDistances(int node, int **distances, - int *ndistances) ATTRIBUTE_NOINLINE; + int *ndistances); int virNumaGetNodeMemory(int node, unsigned long long *memsize, - unsigned long long *memfree) ATTRIBUTE_NOINLINE; + unsigned long long *memfree); unsigned int virNumaGetMaxCPUs(void); -int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus) ATTRIBUTE_NOINLINE; +int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus); int virNumaGetPageInfo(int node, unsigned int page_size, @@ -59,7 +59,7 @@ int virNumaGetPages(int node, unsigned int **pages_avail, unsigned int **pages_free, size_t *npages) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(5); int virNumaSetPagePoolSize(int node, unsigned int page_size, unsigned long long page_count, diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 41daa404b..2accf9532 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -99,7 +99,8 @@ VIR_ONCE_GLOBAL_INIT(virRandom) * * Return: a random number with @nbits entropy */ -uint64_t virRandomBits(int nbits) +VIR_MOCKABLE(virRandomBits); +uint64_t virRandomBitsImpl(int nbits) { uint64_t ret = 0; int32_t bits; @@ -170,9 +171,10 @@ uint32_t virRandomInt(uint32_t max) * * Returns 0 on success or an errno on failure */ +VIR_MOCKABLE(virRandomBytes); int -virRandomBytes(unsigned char *buf, - size_t buflen) +virRandomBytesImpl(unsigned char *buf, + size_t buflen) { int fd; @@ -204,10 +206,10 @@ virRandomBytes(unsigned char *buf, #define MICROSOFT_OUI "0050f2" #define XEN_OUI "00163e" - +VIR_MOCKABLE(virRandomGenerateWWN); int -virRandomGenerateWWN(char **wwn, - const char *virt_type) +virRandomGenerateWWNImpl(char **wwn, + const char *virt_type) { const char *oui = NULL; diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 7a984ee7b..f457d2de6 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -24,11 +24,11 @@ # include "internal.h" -uint64_t virRandomBits(int nbits) ATTRIBUTE_NOINLINE; +uint64_t virRandomBits(int nbits); double virRandom(void); uint32_t virRandomInt(uint32_t max); int virRandomBytes(unsigned char *buf, size_t buflen) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; -int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virRandomGenerateWWN(char **wwn, const char *virt_type); #endif /* __VIR_RANDOM_H__ */ diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 22f2677a3..8433a244d 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -109,12 +109,13 @@ virSCSIDeviceGetAdapterId(const char *adapter, return -1; } +VIR_MOCKABLE(virSCSIDeviceGetSgName); char * -virSCSIDeviceGetSgName(const char *sysfs_prefix, - const char *adapter, - unsigned int bus, - unsigned int target, - unsigned long long unit) +virSCSIDeviceGetSgNameImpl(const char *sysfs_prefix, + const char *adapter, + unsigned int bus, + unsigned int target, + unsigned long long unit) { DIR *dir = NULL; struct dirent *entry; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index 9f8b3ecf1..7d88d4e70 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -37,7 +37,7 @@ char *virSCSIDeviceGetSgName(const char *sysfs_prefix, const char *adapter, unsigned int bus, unsigned int target, - unsigned long long unit) ATTRIBUTE_NOINLINE; + unsigned long long unit); char *virSCSIDeviceGetDevName(const char *sysfs_prefix, const char *adapter, unsigned int bus, diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index dc7df757a..bd581dc1f 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -83,8 +83,9 @@ virSCSIVHostOnceInit(void) VIR_ONCE_GLOBAL_INIT(virSCSIVHost) +VIR_MOCKABLE(virSCSIVHostOpenVhostSCSI); int -virSCSIVHostOpenVhostSCSI(int *vhostfd) +virSCSIVHostOpenVhostSCSIImpl(int *vhostfd) { if (!virFileExists(VHOST_SCSI_DEVICE)) goto error; diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index 21887ddbd..6018b835e 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -61,6 +61,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevicePtr dev, const char **drv_name, const char **dom_name); void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev); -int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE; +int virSCSIVHostOpenVhostSCSI(int *vhostfd); #endif /* __VIR_SCSIHOST_H__ */ diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 6d9b0657a..b4b3581ed 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -38,8 +38,9 @@ * * Create the cancel path given the path to the TPM device */ +VIR_MOCKABLE(virTPMCreateCancelPath); char * -virTPMCreateCancelPath(const char *devpath) +virTPMCreateCancelPathImpl(const char *devpath) { char *path = NULL; const char *dev; diff --git a/src/util/virtpm.h b/src/util/virtpm.h index b21fc0532..fe71307a1 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -22,6 +22,6 @@ #ifndef __VIR_TPM_H__ # define __VIR_TPM_H__ -char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_NOINLINE; +char *virTPMCreateCancelPath(const char *devpath); #endif /* __VIR_TPM_H__ */ diff --git a/src/util/virutil.c b/src/util/virutil.c index e08f9fa4a..76c6a5340 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -884,14 +884,16 @@ char *virGetUserRuntimeDirectory(void) } } -char *virGetUserName(uid_t uid) +VIR_MOCKABLE(virGetUserName); +char *virGetUserNameImpl(uid_t uid) { char *ret; virGetUserEnt(uid, &ret, NULL, NULL, NULL, false); return ret; } -char *virGetGroupName(gid_t gid) +VIR_MOCKABLE(virGetGroupName); +char *virGetGroupNameImpl(gid_t gid) { return virGetGroupEnt(gid); } @@ -1340,8 +1342,9 @@ virGetUserRuntimeDirectory(void) } # endif /* ! HAVE_GETPWUID_R && ! WIN32 */ +VIR_MOCKABLE(virGetUserName); char * -virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +virGetUserNameImpl(uid_t uid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserName is not available")); @@ -1379,8 +1382,9 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, return -1; } +VIR_MOCKABLE(virGetGroupName); char * -virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +virGetGroupNameImpl(gid_t gid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetGroupName is not available")); @@ -1908,19 +1912,22 @@ virGetListenFDs(void) #endif /* WIN32 */ #ifndef WIN32 -long virGetSystemPageSize(void) +VIR_MOCKABLE(virGetSystemPageSize); +long virGetSystemPageSizeImpl(void) { return sysconf(_SC_PAGESIZE); } #else /* WIN32 */ -long virGetSystemPageSize(void) +VIR_MOCKABLE(virGetSystemPageSize); +long virGetSystemPageSizeImpl(void) { errno = ENOSYS; return -1; } #endif /* WIN32 */ -long virGetSystemPageSizeKB(void) +VIR_MOCKABLE(virGetSystemPageSizeKB); +long virGetSystemPageSizeKBImpl(void) { long val = virGetSystemPageSize(); if (val < 0) @@ -1963,8 +1970,9 @@ virMemoryLimitIsSet(unsigned long long value) * * Returns the maximum possible memory value in bytes. */ +VIR_MOCKABLE(virMemoryMaxValue); unsigned long long -virMemoryMaxValue(bool capped) +virMemoryMaxValueImpl(bool capped) { /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ diff --git a/src/util/virutil.h b/src/util/virutil.h index 49382557f..3bbe29eed 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -139,8 +139,8 @@ char *virGetUserConfigDirectory(void); char *virGetUserCacheDirectory(void); char *virGetUserRuntimeDirectory(void); char *virGetUserShell(uid_t uid); -char *virGetUserName(uid_t uid) ATTRIBUTE_NOINLINE; -char *virGetGroupName(gid_t gid) ATTRIBUTE_NOINLINE; +char *virGetUserName(uid_t uid); +char *virGetGroupName(gid_t gid); int virGetGroupList(uid_t uid, gid_t group, gid_t **groups) ATTRIBUTE_NONNULL(3); int virGetUserID(const char *name, @@ -201,12 +201,12 @@ verify((int)VIR_TRISTATE_BOOL_ABSENT == (int)VIR_TRISTATE_SWITCH_ABSENT); unsigned int virGetListenFDs(void); -long virGetSystemPageSize(void) ATTRIBUTE_NOINLINE; -long virGetSystemPageSizeKB(void) ATTRIBUTE_NOINLINE; +long virGetSystemPageSize(void); +long virGetSystemPageSizeKB(void); unsigned long long virMemoryLimitTruncate(unsigned long long value); bool virMemoryLimitIsSet(unsigned long long value); -unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_NOINLINE; +unsigned long long virMemoryMaxValue(bool ulong); /** * VIR_ASSIGN_IS_OVERFLOW: diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 3cbaae0b8..f99c58b73 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -68,8 +68,9 @@ virUUIDGeneratePseudoRandomBytes(unsigned char *buf, * * Returns 0 in case of success and -1 in case of failure */ +VIR_MOCKABLE(virUUIDGenerate); int -virUUIDGenerate(unsigned char *uuid) +virUUIDGenerateImpl(unsigned char *uuid) { int err; @@ -106,6 +107,7 @@ virUUIDGenerate(unsigned char *uuid) return err; } + /** * virUUIDParse: * @uuidstr: zero terminated string representation of the UUID diff --git a/src/util/viruuid.h b/src/util/viruuid.h index 1d67e9ee5..5790a1736 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -49,7 +49,7 @@ int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); int virUUIDIsValid(unsigned char *uuid); -int virUUIDGenerate(unsigned char *uuid) ATTRIBUTE_NOINLINE; +int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, unsigned char *uuid) -- 2.13.3

1 1

[libvirt] [PATCH v2 0/2] qemuDomainUndefineFlags: Two fixes
by Michal Privoznik 09 Aug '17

09 Aug '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-August/msg00221.html diff to v1: - instead of removing the file, abort the whole operation Michal Privoznik (2): qemuDomainUndefineFlags: Grab QEMU_JOB_MODIFY qemuDomainUndefineFlags: Forbid undefine of active domain with NVRAM src/qemu/qemu_driver.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) -- 2.13.0

3 7

[libvirt] [PATCH] Update to latest keycodemapdb content
by Daniel P. Berrange 09 Aug '17

09 Aug '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 2 +- src/keycodemapdb | 2 +- src/util/virkeycode.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b8e875482..45b58c0ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -252,7 +252,7 @@ util/virkey%.7: util/virkey%.pod rm -f $@-t1 && \ mv $@-t2 $@ -KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb +KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb KEYNAMES = linux osx win32 KEYTABLES = \ diff --git a/src/keycodemapdb b/src/keycodemapdb index 7bf5710b2..cb0a08d47 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0 +Subproject commit cb0a08d4726d93922a25e1285d34179ac278ebf8 diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index e09aaadaa..eda263218 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -30,7 +30,6 @@ #include "virkeycodetable_rfb.h" #include "virkeycodetable_usb.h" #include "virkeycodetable_win32.h" -#include "virkeycodetable_xt.h" #include "virkeycodetable_xtkbd.h" #include "virkeynametable_linux.h" #include "virkeynametable_osx.h" @@ -44,7 +43,8 @@ static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = { static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux, - [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt, + /* XT is same as AT Set1 - it was included by mistake */ + [VIR_KEYCODE_SET_XT] = virKeyCodeTable_atset1, [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1, [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2, [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3, @@ -57,7 +57,6 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) -verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xt)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset1)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3)); -- 2.13.3

2 2

[libvirt] ANNOUNCE: Oz 0.16.0 release
by Chris Lalancette 09 Aug '17

09 Aug '17

All, I'm pleased to announce release 0.16.0 of Oz. Oz is a program for doing automated installation of guest operating systems with limited input from the user. Release 0.16.0 is a bugfix and feature release for Oz. Some of the highlights between Oz 0.15.0 and 0.16.0 are: * Windows 10 and 2016 support * All timeouts are now configurable * Ubuntu 16.04, 16.10, 17.04 support * Mageia 2, 3, 4, 5 support * Properly find UEFI firmware, which should fix aarch64 installs * Fedora 24, 25, 26 support * FreeBSD 11 support * Replace internal use of pycurl with requests * OpenSUSE Leap support * Timeouts are now based on time, not the number of iterations of the loop * Modern Fedora and RHEL guests will print out a lot more anaconda debugging information to the terminal that oz-install was launched from A tarball and zipfile of this release is available on the Github releases page: https://github.com/clalancette/oz/releases . Packages for Fedora rawhide and 26 have been built in Koji and will eventually make their way to stable. Instructions on how to get and use Oz are available at http://github.com/clalancette/oz/wiki . If you have questions or comments about Oz, please feel free to contact me at clalancette at gmail.com, or open up an issue on the github page: http://github.com/clalancette/oz/issues . Thanks to everyone who contributed to this release through bug reports, patches, and suggestions for improvement. Chris Lalancette

1 0

[libvirt] [PATCH] docs: Add "PCI topology and hotplug" guidelines
by Andrea Bolognani 08 Aug '17

08 Aug '17

For all machine types except i440fx, making a guest hotplug capable requires some sort of planning. Add some information to help users make educated choices when defining the PCI topology of guests. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.html.in | 4 +- docs/pci-hotplug.html.in | 164 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 docs/pci-hotplug.html.in diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bceddd2..7c4450c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3505,7 +3505,9 @@ appear more than once, with a group of virtual devices tied to a virtual controller. Normally, libvirt can automatically infer such controllers without requiring explicit XML markup, but sometimes - it is necessary to provide an explicit controller element. + it is necessary to provide an explicit controller element, notably + when planning the <a href="pci-hotplug.html">PCI topology</a> + for guests where device hotplug is expected. </p> <pre> diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in new file mode 100644 index 0000000..f3d1610 --- /dev/null +++ b/docs/pci-hotplug.html.in @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>PCI topology and hotplug</h1> + + <ul id="toc"></ul> + + <p> + Perhaps surprisingly, most libvirt guests support only limited PCI + device hotplug out of the box, or even none at all. + </p> + <p> + The reason for this apparent limitation is the fact that each + hotplugged PCI device might require additional PCI controllers to + be added to the guest, and libvirt has no way of knowing in advance + how many devices will be hotplugged during the guest's lifetime, + thus making it impossible to automatically provide the right amount + of PCI controllers: any arbitrary number would end up being too big + for some users, and too small for others. + </p> + <p> + Ultimately, the user is the only one who knows how much the guest + will need to grow dynamically, so the responsability of planning + a suitabile PCI topology in advance falls on them. + </p> + <p> + This document aims at providing all the information needed to + successfully plan the PCI topology of a guest. Note that the + details can vary a lot between architectures and even machine + types, hence the way it's organized. + </p> + + <h2><a name="x86_64">x86_64 architecture</a></h2> + + <h3><a name="x86_64-q35">q35 machine type</a></h3> + + <p> + This is a PCI Express native machine type. The default PCI topology + looks like + </p> + +<pre> +<controller type='pci' index='0' model='pcie-root'/> +<controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x10'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> +</controller></pre> + + <p> + and supports hotplugging a single PCI Express device, either + emulated or assigned from the host. + </p> + <p> + Slots on the <code>pcie-root</code> controller do not support + hotplug, so the device will be hotplugged into the + <code>pcie-root-port</code> controller. If you plan to hotplug + more than a single PCI Express device, you should add a suitable + number of <code>pcie-root-port</code> controllers when defining + the guest: for example, add + </p> + +<pre> +<controller type='pci' model='pcie-root-port'/> +<controller type='pci' model='pcie-root-port'/> +<controller type='pci' model='pcie-root-port'/></pre> + + <p> + if you expect to hotplug up to three PCI Express devices, + either emulated or assigned from the host. That's all the + information you need to provide: libvirt will fill in the + remaining details automatically. + </p> + <p> + If you expect to hotplug legacy PCI devices, then you will need + specialized controllers, since all those mentioned above are + intended for PCI Express devices only: add + </p> + +<pre> +<controller type='pci' model='dmi-to-pci-bridge'/> +<controller type='pci' model='pci-bridge'/></pre> + + <p> + and you'll be able to hotplug up to 31 legacy PCI devices, + either emulated or assigned from the host. + </p> + + <h3><a name="x86_64-i440fx">i440fx (pc) machine type</a></h3> + + <p> + This is a legacy PCI native machine type. The default PCI + topology looks like + </p> + +<pre> +<controller type='pci' index='0' model='pci-root'/></pre> + + <p> + where each of the 31 slots on the <code>pci-root</code> + controller is hotplug capable and can accept a legacy PCI + device, either emulated or assigned from the guest. + </p> + + <h2><a name="ppc64">ppc64 architecture</a></h2> + + <h3><a name="ppc64-pseries">pseries machine type</a></h3> + + <p> + The default PCI topology for the <code>pseries</code> machine + type looks like + </p> + +<pre> +<controller type='pci' index='0' model='pcie-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> +</controller></pre> + + <p> + The 31 slots on a <code>pci-root</code> controller are all + hotplug capable and, despite the name suggesting otherwise, + starting with QEMU 2.9 all of them can accept PCI Express + devices in addition to legacy PCI devices; however, + libvirt will only place emulated devices on the default + <code>pci-root</code> controller. + </p> + <p> + In order to take advantage of improved error reporting and + recovering capabilities, PCI devices assigned from the + host need to be isolated by placing each on a separate + <code>pci-root</code> controller, which has to be prepared + in advance for hotplug to work: for example, add + </p> + +<pre> +<controller type='pci' model='pci-root'/> +<controller type='pci' model='pci-root'/> +<controller type='pci' model='pci-root'/></pre> + + <p> + if you expect to hotplug up to three PCI devices assigned + from the host. + </p> + + <h2><a name="aarch64">aarch64 architecture</a></h2> + + <h3><a name="aarch64-virt">mach-virt (virt) machine type</a></h3> + + <p> + This machine type mostly behaves the same as the + <a href="#x86_64-q35">q35 machine type</a>, so you can just + refer to that section for information. + </p> + <p> + The only difference worth mentioning is that using legacy + PCI for <code>mach-virt</code> guests is extremely uncommon, + so you'll probably never need to add controllers other than + <code>pcie-root-port</code>. + </p> + + </body> +</html> -- 2.7.5

3 5

Re: [libvirt] [RFC]Add new mdev interface for QoS
by Alex Williamson 08 Aug '17

08 Aug '17

[cc +libvir-list] On Wed, 26 Jul 2017 21:16:59 +0800 "Gao, Ping A" <ping.a.gao(a)intel.com> wrote: > The vfio-mdev provide the capability to let different guest share the > same physical device through mediate sharing, as result it bring a > requirement about how to control the device sharing, we need a QoS > related interface for mdev to management virtual device resource. > > E.g. In practical use, vGPUs assigned to different quests almost has > different performance requirements, some guests may need higher priority > for real time usage, some other may need more portion of the GPU > resource to get higher 3D performance, corresponding we can define some > interfaces like weight/cap for overall budget control, priority for > single submission control. > > So I suggest to add some common attributes which are vendor agnostic in > mdev core sysfs for QoS purpose. I think what you're asking for is just some standardization of a QoS attribute_group which a vendor can optionally include within the existing mdev_parent_ops.mdev_attr_groups. The mdev core will transparently enable this, but it really only provides the standard, all of the support code is left for the vendor. I'm fine with that, but of course the trouble with and sort of standardization is arriving at an agreed upon standard. Are there QoS knobs that are generic across any mdev device type? Are there others that are more specific to vGPU? Are there existing examples of this that we can steal their specification? Also, mdev devices are not necessarily the exclusive users of the hardware, we can have a native user such as a local X client. They're not an mdev user, so we can't support them via the mdev_attr_group. Does there need to be a per mdev parent QoS attribute_group standard for somehow defining the QoS of all the child mdev devices, or perhaps representing the remaining host QoS attributes? Ultimately libvirt and upper level management tools would be the consumer of these control knobs, so let's immediately get libvirt involved in the discussion. Thanks, Alex

5 16

[libvirt] [PATCH] docs: force content in <script> element
by Daniel P. Berrange 08 Aug '17

08 Aug '17

If there's no content in <script></script>, the XSTL generator will turn it into <script/> which is not permitted in XHTML. Adding a single whitespace is enough to guarantee an explicit closing tag. Without this, the scripts never get loaded by the browser. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as trivial fix docs/index.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.html.in b/docs/index.html.in index 8333cf6bb..c0c55cb14 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -2,9 +2,9 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <script type="text/javascript" src="js/jquery-3.1.1.min.js"></script> - <script type="text/javascript" src="js/moment.min.js"></script> - <script type="text/javascript" src="js/jquery.rss.min.js"></script> + <script type="text/javascript" src="js/jquery-3.1.1.min.js"> </script> + <script type="text/javascript" src="js/moment.min.js"> </script> + <script type="text/javascript" src="js/jquery.rss.min.js"> </script> <script type="text/javascript"> <!-- -- 2.13.3

1 0

[libvirt] [PATCH] conf: check rombar against VIR_DOMAIN_TRISTATE_SWITCH_ABSENT
by Ján Tomko 08 Aug '17

08 Aug '17

Make the comparison explicit. --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3cdb5e348..b5ce2ecd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5359,10 +5359,10 @@ virDomainDeviceInfoFormat(virBufferPtr buf, } if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM) && - (info->rombar || info->romfile)) { + (info->rombar != VIR_TRISTATE_SWITCH_ABSENT || info->romfile)) { virBufferAddLit(buf, "<rom"); - if (info->rombar) { + if (info->rombar != VIR_TRISTATE_SWITCH_ABSENT) { const char *rombar = virTristateSwitchTypeToString(info->rombar); if (rombar) -- 2.13.0

3 6

[libvirt] RFC: support for configuring all ports of a multiport SRIOV VF when assigning to guest
by Laine Stump 08 Aug '17

08 Aug '17

("No matter how far you've gone down the wrong road, turn back." - paraphrase of a Turkish proverb that is apropos to this discussion) Several years ago, when I was apparently naive and narrow in my thinking and someone wanted us support setting the MAC address and vlan tag for SRIOV VFs when assigning them to a guest with PCI device assignment (this was before VFIO existed), I had the idea to do this by creating a new type of <interface> device: <interface type='hostdev'> .... My thinking was that <interface> already had elements for mac address, 802.11Qb[gh] virtualport config, and vlan tag (or maybe it was that we were *going to add* support for vlan tag), so by just adding a <source> that was a PCI address, we would have everything we needed. Basically, there is some amount of config that needs to be applied to the device before it's assigned to the guest, and since the device ends up being a netdev in the guest, all that config is already present in an <interface>. As a bonus, because it was an <interface> we could easily re-use the recently added "pool of devices" network type (with some minor adjustment) to avoid needing to hardcode the host-side PCI address of the VF. At the time Dan Berrange countered (I think - correct me if I'm wrong!) that we should instead do this with modifications to <hostdev>, but somehow I managed to either convince him, or maybe he just finally tired of my stubbornness and decided it was easier to deal with the after effects of giving in rather than continuing to debate with me :-) So right now if you want to assign an SRIOV VF network device to a guest with VFIO, you need something like this (ignoring network device pools for the moment): <interface type='hostdev'> <source> <address type='pci' slot='0x08' function='0x4'/> </source> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> </interface> (or in place of <vlan>, you could have a <virtualport> element for 802.11Qb[gh]). The SRIOV cards that we had around when we were doing this work had multiple physical ports on them (either 2 or 4), but each physical port was associated with its own PCI Physical Function (PF), and each of the PCI Virtual Functions associated with a PF was tied to a single netdev, i.e. in all cases there was always a 1:1 correspondence between a netdev and a PCI device. All of libvirt's code dealing with SRIOV VFs and PFs assumes this 1:1 relationship. And then came Mellanox "dual port" SRIOV cards.... A Mellanox SRIOV NIC doesn't necessarily do that. Instead, it can operate in "dual port" mode, where it has a single PCI PF device for both physical ports; the single PF PCI device has 2 separate netdevs associated with it (so when you look in the "net" subdirectory for the PCI device, you'll see two netdevs listed, and when you look in the "device" subdirectory of those two netdevs in sysfs, they both point back to the same PCI device). VFs associated with that PF will also each have two netdevs associated with them. This means that when you assign a VF to a guest, the guest is getting a single PCI device, but it's getting two netdevs. (I've been told that the advantage of doing both ports with a single PCI device is that each Mellanox PCI device uses a huge amount of MMIO space, two ports on each device cuts the MMIO usage in half). In order for this to be useful, libvirt needs to set the mac address and vlan tag of *both* netdevs prior to starting the guest. But we have no way to represent that in our configuration. In the past it's been suggested that we just do something like this: <interface type='hostdev'> <mac address='blah'/> <mac2 address='blah'/> ... </interface> but I have two problems with that: 1) <interface> is supposed to represent a single network device, but this is trying to make it represent 2 network devices (and what if someone else comes up with a card that puts *4* netdevs on the same PCI device?) 2) We would need to do the same thing for <vlan> tag. It starts to get ugly. Alternately we could add a new <port number='2'> subelement, like this: <interface type='hostdev'> <source> <address type='pci' slot='0x08' function='0x4'/> </source> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> <port number='2'> <mac address='52:54:00:01:01:01'/> <vlan> <tag id='42'/> </vlan> </port> </interface> (or some variation of that) just so that all the stuff for the 2nd port is grouped together. But I don't like that the config for port 1 is at a different level in the hierarchy than the config for port 2, and we still have the problem that we're trying to describe *2* netdevs with a single <interface> element, which just feels wrong. - OR - what if we admit that <interface type='hostdev'> was a bad idea, and try doing it all with <hostdev>, something like this: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x06' slot='0x02' function='0x0'/> </source> <netdev port='1'> <mac address='52:54:00:01:02:03'/> <vlan> <tag id='42'/> </vlan> </netdev> <netdev port='2'> <mac address='52:54:00:01:02:03'/> <vlan> <tag id='43'/> </vlan> </netdev> </hostdev> The downsides are: 1) It's providing a 2nd way of describing single port VFs, which could confuse people (my recommendation would be to deprecate usage of <interface type='hostdev'> in the documentation, while still allowing it; i.e. we'd still have to maintain that code while discouraging its use). 2) This wouldn't be able to take advantage of the pools of devices maintained by libvirt networks. (This isn't a problem for Openstack, since they don't use that anyway, but ovirt does use it). 3) It's an explicit admission that I made a bad decision in 2011 :-P The upsides? 1) it models the hardware more correctly. (it really is a PCI device that has two subordinate netdevs, *not* a netdev that is part of a PCI device, "oh and that PCI device also has another netdev") 2) it could be more logically and easily expanded if there were more ports, or if there were other types of PCI devices that had different kinds of device-type-specific config that needed to be setup. 3) we could eliminate "downside (2)" by enhancing the nodedevice driver to provide and manage more generalized pools of devices (if desired by anyone - Openstack's opinion seems to be that libvirt shouldn't be doing this anyway). So does anyone have an opinion about this? An alternate proposal? (e.g. Should we instead just tell everyone to run their Mellanox cards in single port mode and ignore/avoid all this complexity?)

2 5

[libvirt] A bug that libvirt lxc can't destroy all container process.
by 曹远志 08 Aug '17

08 Aug '17

Hello all, This is my first mail to this list, so let me introduce myself. My name is yuanzhi cao, and I work in the oVirt team. Currently We are using libvirt lxc in large-scale and found that libvirt can't destroy container process normally . Environments: System: zesty libvirt version: 2.5.0-3ubuntu5 vm rootfs release: ubuntu:16.04 Reproduce: 1. Run command "virsh -c lxc:// start vm" and the release of vm is xenial 2. Run command "pa aux|grep init" ,you would find the pid of init launch by vm. 3. Run command "virsh -c lxc:// destroy vm". 4. Run command "virsh -c lxc:// list --all" and "ps aux|grep init" ,you could find that vm is shutoff, but the init process launch by vm is still running. Infact I have found the case of this bug, there is a patch after 1.3.1 that import this bug. ------------------------------------------------------------- Commit: dc576025c360a1d2c89da410d0f3f0da55d0143f [dc57602] Parents: 511e7c5bba Author: Daniel P. Berrange <berrange(a)redhat.com> Date: 2016年1月23日 GMT+8 上午12:07:18 Commit Date: 2016年1月27日 GMT+8 上午12:11:32 lxc: don't try to hide parent cgroups inside container ------------------------------------------------------------- Cgroups inside container does't hide parent, so the process of container can change it own cgroup to another cgroup. lxc destroy process by read cgroup tasks file,if process change it own cgroup,it can't destroy container process normally.

1 0

[libvirt] [PATCH] hyperv: Reduce usage of libxml API functions
by Sri Ramanujam 07 Aug '17

07 Aug '17

Slight refactor of the WMI serialization code to minimize mixing openwsman and libxml2 APIs. The only usage of libxml2 APIs now is in creating CDATA blocks, because the openwsman API does not provide that functionality. --- src/hyperv/hyperv_wmi.c | 65 ++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 49 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..99efa1c 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -489,17 +489,14 @@ hypervSerializeSimpleParam(hypervParamPtr p, const char *resourceUri, static int hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, - const char *resourceUri, WsXmlDocH doc, WsXmlNodeH *methodNode) + const char *resourceUri, WsXmlNodeH *methodNode) { int result = -1; WsXmlNodeH xmlNodeParam = NULL, xmlNodeTemp = NULL, xmlNodeAddr = NULL, xmlNodeRef = NULL; - xmlNodePtr xmlNodeAddrPtr = NULL, - xmlNodeRefPtr = NULL; WsXmlDocH xmlDocResponse = NULL; - xmlDocPtr docPtr = (xmlDocPtr) doc->parserDoc; WsXmlNsH ns = NULL; client_opt_t *options = NULL; filter_t *filter = NULL; @@ -573,11 +570,6 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeAddrPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeAddr, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not copy EPR address")); - goto cleanup; - } - if (!(xmlNodeRef = ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSING, WSA_REFERENCE_PARAMETERS))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -585,17 +577,11 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (!(xmlNodeRefPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeRef, docPtr, 1))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not copy EPR item reference parameters")); - goto cleanup; - } - /* now build a new xml doc with the EPR node children */ if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->epr.name, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child node to xmlNodeParam")); + _("Could not add child node to methodNode")); goto cleanup; } @@ -613,23 +599,8 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, goto cleanup; } - if (xmlAddChild((xmlNodePtr) *methodNode, (xmlNodePtr) xmlNodeParam) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeAddrPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } - - if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeRefPtr) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to xml parent node")); - goto cleanup; - } + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeAddr); + ws_xml_duplicate_tree(xmlNodeParam, xmlNodeRef); /* we did it! */ result = 0; @@ -656,8 +627,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, xmlNodeArray = NULL; WsXmlDocH xmlDocTemp = NULL, xmlDocCdata = NULL; - xmlBufferPtr xmlBufferNode = NULL; - const xmlChar *xmlCharCdataContent = NULL; + char *xmlCharCdataContent = NULL; xmlNodePtr xmlNodeCdata = NULL; hypervWmiClassInfoPtr classInfo = p->embedded.info; virHashKeyValuePairPtr items = NULL; @@ -761,25 +731,22 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, } /* create CDATA node */ - xmlBufferNode = xmlBufferCreate(); - if (xmlNodeDump(xmlBufferNode, (xmlDocPtr) xmlDocTemp->parserDoc, - (xmlNodePtr) xmlNodeInstance, 0, 0) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not get root of temp XML doc")); - goto cleanup; - } + ws_xml_dump_memory_node_tree(xmlNodeInstance, &xmlCharCdataContent, &len); - len = xmlBufferLength(xmlBufferNode); - xmlCharCdataContent = xmlBufferContent(xmlBufferNode); if (!(xmlNodeCdata = xmlNewCDataBlock((xmlDocPtr) xmlDocCdata, - xmlCharCdataContent, len))) { + (xmlChar *)xmlCharCdataContent, len))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create CDATA element")); goto cleanup; } - /* Add CDATA node to the doc root */ - if (!(xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeCdata))) { + /* + * Add CDATA node to the doc root + * + * FIXME: there is no openwsman wrapper for xmlNewCDataBlock, so instead + * silence clang by casting to a void pointer first + */ + if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not add CDATA to doc root")); goto cleanup; @@ -792,7 +759,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, VIR_FREE(items); ws_xml_destroy_doc(xmlDocCdata); ws_xml_destroy_doc(xmlDocTemp); - xmlBufferFree(xmlBufferNode); + ws_xml_free_memory(xmlCharCdataContent); return result; } @@ -854,7 +821,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params, break; case HYPERV_EPR_PARAM: if (hypervSerializeEprParam(p, priv, params->resourceUri, - paramsDocRoot, &methodNode) < 0) + &methodNode) < 0) goto cleanup; break; case HYPERV_EMBEDDED_PARAM: -- 2.9.4

2 1

[libvirt] [PATCH] hyperv: Correct number of milliseconds in five minutes
by Sri Ramanujam 07 Aug '17

07 Aug '17

--- src/hyperv/hyperv_wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 57125ae..33ad964 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -42,7 +42,7 @@ #define VIR_FROM_THIS VIR_FROM_HYPERV -#define HYPERV_JOB_TIMEOUT_MS 5000 +#define HYPERV_JOB_TIMEOUT_MS 300000 VIR_LOG_INIT("hyperv.hyperv_wmi"); -- 2.9.4

2 1