October 2017 - Devel - libvirt List Archives

[libvirt] gnulib tests in libvirt broken by newer glibc 2.26
by Christian Ehrhardt 09 Oct '17

09 Oct '17

Hi, there seems to be an incompatibility to the last glibc due to [1]. Eventually this breaks gnulib unittests (and maybe more). Debugging went from an assert, to bidngin different symbols, to changed function names to different header resolution. Because it expects it to behave "posixly" but arguments are changed differently. FAIL: test-getopt-posix ======================= ../../../../gnulib/tests/test-getopt.h:754: assertion 'strcmp (argv[1], "donald") == 0' failed # get and build latest libvirt to get the local gnulib $ wget http://libvirt.org/sources/libvirt-3.7.0.tar.xz $ tar xf libvirt-3.7.0.tar.xz $ cd libvirt $ apt build-dep libvirt $ ./autogen.sh $ make -j4 You can run the following simplified test derived from the unit test (it is much shorter, so easier to debug e.g. in -E). $ cat << EOF >> test1.c #include <config.h> #include <unistd.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> int main (void) { return 0; } EOF $ gcc -I ./gnulib/lib -I . test1.c -H You can see in -H output already the difference in the paths of the headers that it uses: Glibc <2.26 . ./config.h .. ./config-post.h . /usr/include/unistd.h [...] .. /usr/include/getopt.h Glibc >=2.26 . ./config.h .. ./config-post.h . ./gnulib/lib/unistd.h [...] ... /usr/include/x86_64-linux-gnu/bits/getopt_posix.h .... /usr/include/x86_64-linux-gnu/bits/getopt_core. If you build with -E you'll also see that it now uses getopt from glibc instead of the prefixed rpl_getopt from gnulib. It behaves as if it would not find gnulib and instead fall back to glibc. But it finds gnulib, instead due to glibc's changes its implementation is fetched before and due to that pulling in glibc's behavior while the unit test is verifying against the one it expects from gnulib. Sorry, but I don't see the right fix here yet - I could easily silence the test but that is no fix. Especially if there might be implications due to handling the args (slightly) differently. I really wanted to come up with the same test against gnulib alone, but I was lost in the build system for too long and could not get the example to fail without libvirt (OTOH I'm sure it would). Therefore I'm reaching out to you for your help and experience on the build system what could be done. [1]: https://sourceware.org/ml/libc-alpha/2017-04/msg00115.html -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

5 14

[libvirt] [PATCH v2] qemu: argv: parse qemu commandline memory arguments
by Kothapally Madhu Pavan 09 Oct '17

09 Oct '17

Existing qemuParseCommandLineMem() will parse "-m 4G" format string. This patch allows it to parse "-m size=8126464k,slots=32,maxmem=33554432k" format along with existing format. And adds a testcase to validate the changes. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_parse_command.c | 89 +++++++++++++++++++--- .../qemuargv2xml-mem-scale-maxmemory.args | 22 ++++++ .../qemuargv2xml-mem-scale-maxmemory.xml | 38 +++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 138 insertions(+), 12 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 37e1149..f8b6f8b 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1629,26 +1629,91 @@ static int qemuParseCommandLineMem(virDomainDefPtr dom, const char *val) { - unsigned long long mem; + unsigned long long mem = 0; + unsigned long long size = 0; + unsigned long long maxmem = 0; + unsigned int slots = 0; char *end; + size_t i; + int nkws; + char **kws; + char **vals; + int n; + int ret = -1; - if (virStrToLong_ull(val, &end, 10, &mem) < 0) { + if (qemuParseKeywords(val, &kws, &vals, &nkws, 1) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse memory level '%s'"), val); - return -1; + _("cannot parse memory '%s'"), val); + goto cleanup; } - if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot scale memory: %s"), - virGetLastErrorMessage()); - return -1; + for (i = 0; i < nkws; i++) { + if (vals[i] == NULL) { + if (i > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory '%s'"), val); + goto cleanup; + } + if (virStrToLong_ull(kws[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), kws[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + size = mem; + + } else { + if (STREQ(kws[i], "size") || STREQ(kws[i], "maxmem")) { + if (virStrToLong_ull(vals[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), vals[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + STREQ(kws[i], "size") ? (size = mem) : (maxmem = mem); + + } + if (STREQ(kws[i], "slots")) { + if (virStrToLong_i(vals[i], &end, 10, &n) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse slots value '%s'"), vals[i]); + goto cleanup; + } + + slots = n; + + } + } } - virDomainDefSetMemoryTotal(dom, mem / 1024); - dom->mem.cur_balloon = mem / 1024; + virDomainDefSetMemoryTotal(dom, size / 1024); + dom->mem.cur_balloon = size / 1024; + dom->mem.memory_slots = slots; + dom->mem.max_memory = maxmem; - return 0; + ret = 0; + + cleanup: + for (i = 0; i < nkws; i++) { + VIR_FREE(kws[i]); + VIR_FREE(vals[i]); + } + VIR_FREE(kws); + VIR_FREE(vals); + + return ret; } diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args new file mode 100644 index 0000000..7bce841 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 8G,slots=16,maxmem=16G \ +-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml new file mode 100644 index 0000000..328c4ed --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>17179869184</maxMemory> + <memory unit='KiB'>8388608</memory> + <currentMemory unit='KiB'>8388608</currentMemory> + <vcpu placement='static' current='1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 1adbcfe..e35726e 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -265,6 +265,7 @@ mymain(void) DO_TEST("hostdev-pci-address"); DO_TEST("mem-scale"); + DO_TEST("mem-scale-maxmemory"); DO_TEST("smp"); DO_TEST("hyperv"); -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu: Changes in parsing qemu commandline memory section
by Kothapally Madhu Pavan 09 Oct '17

09 Oct '17

Existing qemuParseCommandLineMem() will parse "-m 4G" format string. This patch allows it to parse "-m size=8126464k,slots=32,maxmem=33554432k" format along with existing format. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_parse_command.c | 89 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 37e1149..c30e8ed 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1629,26 +1629,91 @@ static int qemuParseCommandLineMem(virDomainDefPtr dom, const char *val) { - unsigned long long mem; + unsigned long long mem = 0; + unsigned long long size = 0; + unsigned long long maxmem = 0; + unsigned int slots = 0; char *end; + size_t i; + int nkws; + char **kws; + char **vals; + int n; + int ret = -1; - if (virStrToLong_ull(val, &end, 10, &mem) < 0) { + if (qemuParseKeywords(val, &kws, &vals, &nkws, 1) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse memory level '%s'"), val); - return -1; + _("cannot parse memory '%s'"), val); + goto cleanup; } - if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot scale memory: %s"), - virGetLastErrorMessage()); - return -1; + for (i = 0; i < nkws; i++) { + if (vals[i] == NULL) { + if (i > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory '%s'"), val); + goto cleanup; + } + if (virStrToLong_ull(kws[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), kws[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + size = mem; + + } else { + if (STREQ(kws[i], "size") || STREQ(kws[i], "maxmem")) { + if (virStrToLong_ull(vals[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), vals[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + STREQ(kws[i], "size") ? (size = mem) : (maxmem = mem); + + } + if (STREQ(kws[i], "slots")) { + if (virStrToLong_i(vals[i], &end, 10, &n) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse slots value '%s'"), vals[i]); + goto cleanup; + } + + slots = n; + + } + } } - virDomainDefSetMemoryTotal(dom, mem / 1024); - dom->mem.cur_balloon = mem / 1024; + virDomainDefSetMemoryTotal(dom, size / 1024); + dom->mem.cur_balloon = size / 1024; + dom->mem.memory_slots = slots; + dom->mem.max_memory = maxmem; - return 0; + ret = 0; + + cleanup: + for (i = 0; i < nkws; i++) { + VIR_FREE(kws[i]); + VIR_FREE(vals[i]); + } + VIR_FREE(kws); + VIR_FREE(vals); + + return ret; } -- 1.8.3.1

3 2

[libvirt] [PATCH] apparmor: add dnsmasq ptrace rule to libvirtd profile
by Jim Fehlig 07 Oct '17

07 Oct '17

Commit b482925c added ptrace rule for the apparmor profiles, but one was missed in the libvirtd profile for dnsmasq. It was overlooked since the test machine did not have an active libvirt network requiring dnsmasq that was also set to autostart. With one active and set to autostart, the following denial is observed in audit.log when restarting libvirtd type=AVC msg=audit(1507320136.306:298): apparmor="DENIED" \ operation="ptrace" profile="/usr/sbin/libvirtd" pid=5472 \ comm="libvirtd" requested_mask="trace" denied_mask="trace" \ peer="/usr/sbin/dnsmasq" With an active network, I suspect a libvirtd restart causes access to /proc/<dnsmasq-pid>/*, hence the resulting denial. As a nasty side affect of the denial, libvirtd thinks it needs to spawn a dnsmasq process even though one is already running for the network. E.g. after two libvirtd restarts dnsmasq 1683 0.0 0.0 51188 2612 ? S 12:03 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper root 1684 0.0 0.0 51160 576 ? S 12:03 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper dnsmasq 4706 0.0 0.0 51188 2572 ? S 13:54 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper root 4707 0.0 0.0 51160 572 ? S 13:54 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper dnsmasq 4791 0.0 0.0 51188 2580 ? S 13:56 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper root 4792 0.0 0.0 51160 572 ? S 13:56 0:00 \ /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf \ --leasefile-ro --dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper A simple fix is to add a ptrace rule for dnsmasq. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- examples/apparmor/usr.sbin.libvirtd | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index fa4ebb355..819068ffc 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -39,6 +39,7 @@ ptrace (trace) peer=unconfined, ptrace (trace) peer=/usr/sbin/libvirtd, + ptrace (trace) peer=/usr/sbin/dnsmasq, ptrace (trace) peer=libvirt-*, # Very lenient profile for libvirtd since we want to first focus on confining -- 2.14.1

2 2

[libvirt] [PATCH] build: exclude more files from all the syntax checks
by Pino Toscano 07 Oct '17

07 Oct '17

4 7

[libvirt] [PATCH v1] build: isolate core libvirt libs deps from xen runtime
by Wim Ten Have 07 Oct '17

07 Oct '17

From: Wim ten Have <wim.ten.have(a)oracle.com> Generating libvirt packages per make rpm, "with-libxl=1" and "with-xen=1", adds strict runtime dependencies per libxenlight for xen-libs package from core libvirt-libs package. This is not necessary and unfortunate since those dependencies set demand to "xen-libs" package even when there's no need for libvirt xen or libxl driver components. This patch is to have two separate xenconfig lib tool libraries: one for core libvirt (without XL), and a another that contains xl for libxl driver (libvirt_driver_libxl_impl.la) which when loading the driver, loads the remaining symbols (xen{Format,Parse}XL. For the user/sysadmin, this means the xen dependencies are moved into libxl driver, instead of core libvirt. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> Signed-off-by: Wim ten Have <wim.ten.have(a)oracle.com> --- src/Makefile.am | 23 +++++++++++++---------- src/libvirt_xenxlconfig.syms | 12 ------------ 2 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 src/libvirt_xenxlconfig.syms diff --git a/src/Makefile.am b/src/Makefile.am index 173fba1e6..b74856ba7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1197,7 +1197,8 @@ XENCONFIG_SOURCES = \ xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ xenconfig/xen_xm.c xenconfig/xen_xm.h if WITH_LIBXL -XENCONFIG_SOURCES += \ +XENCONFIG_LIBXL_SOURCES = \ + $(XENCONFIG_SOURCES) \ xenconfig/xen_xl.c xenconfig/xen_xl.h endif WITH_LIBXL @@ -1258,10 +1259,17 @@ endif WITH_VMX if WITH_XENCONFIG noinst_LTLIBRARIES += libvirt_xenconfig.la libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la -libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS) libvirt_xenconfig_la_CFLAGS = \ - -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) + -I$(srcdir)/conf $(AM_CFLAGS) libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES) + +if WITH_LIBXL +noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la +libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS) +libvirt_xenconfig_libxl_la_CFLAGS = \ + -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) +libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES) +endif WITH_LIBXL endif WITH_XENCONFIG @@ -1417,7 +1425,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ $(AM_CFLAGS) libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) \ - libvirt_xenconfig.la \ + libvirt_xenconfig_libxl.la \ libvirt_secret.la libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) @@ -2045,6 +2053,7 @@ EXTRA_DIST += \ $(VBOX_DRIVER_EXTRA_DIST) \ $(VMWARE_DRIVER_SOURCES) \ $(XENCONFIG_SOURCES) \ + $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) check-local: check-augeas @@ -2228,12 +2237,6 @@ else ! WITH_XENCONFIG SYM_FILES += $(srcdir)/libvirt_xenconfig.syms endif ! WITH_XENCONFIG -if WITH_LIBXL -USED_SYM_FILES += $(srcdir)/libvirt_xenxlconfig.syms -else ! WITH_LIBXL -SYM_FILES += $(srcdir)/libvirt_xenxlconfig.syms -endif ! WITH_LIBXL - if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms else ! WITH_SASL diff --git a/src/libvirt_xenxlconfig.syms b/src/libvirt_xenxlconfig.syms deleted file mode 100644 index dbe43aac7..000000000 --- a/src/libvirt_xenxlconfig.syms +++ /dev/null @@ -1,12 +0,0 @@ -# -# These symbols are dependent upon --with-libxl via WITH_LIBXL. -# - -#xenconfig/xen_xl.h -xenFormatXL; -xenParseXL; - -# Let emacs know we want case-insensitive sorting -# Local Variables: -# sort-fold-case: t -# End: -- 2.13.6

2 1

[libvirt] [PATCH REPOST 0/6] Privatize _virStoragePoolObj and _virStorageVolDefList (Batch #2)
by John Ferlan 06 Oct '17

06 Oct '17

Since the original series (19 patches): https://www.redhat.com/archives/libvir-list/2017-September/msg00594.html didn't garner any attention, I'm going with smaller patch piles to make forward progress. This series is the first half of the storage backend changes to use the virStoragePoolObjGetDef accessor. The next/last series will be the next half, plus the change to move virStoragePoolObj and virStorageVolDefList into virstoragepoolobj.c. After that adjustments to virstoragepoolobj similar to other drivers and perhaps even generating a virStorageVolObjPtr - e.g. a hash table of volume defs rather than a linked list of defs. John Ferlan (6): storage: Use virStoragePoolObjGetDef accessor for storage_util storage: Use virStoragePoolObjGetDef accessor for Disk backend storage: Use virStoragePoolObjGetDef accessor for Logical backend storage: Use virStoragePoolObjGetDef accessor for Sheepdog backend storage: Use virStoragePoolObjGetDef accessor for FS backend storage: Use virStoragePoolObjGetDef accessor for Gluster backend src/storage/storage_backend_disk.c | 98 ++++++++++++++++------------ src/storage/storage_backend_fs.c | 90 +++++++++++++------------ src/storage/storage_backend_gluster.c | 20 +++--- src/storage/storage_backend_logical.c | 63 ++++++++++-------- src/storage/storage_backend_sheepdog.c | 23 ++++--- src/storage/storage_util.c | 116 ++++++++++++++++++--------------- 6 files changed, 230 insertions(+), 180 deletions(-) -- 2.13.6

2 7

[libvirt] [PATCH 0/2] format vgamem_mb on QEMU command line for cirrus video
by Pavel Hrdina 06 Oct '17

06 Oct '17

Pavel Hrdina (2): qemu: caps: add QEMU_CAPS_CIRRUS_VGAMEM capability qemu: format vgamem_mb on QEMU command line for cirrus video src/qemu/qemu_capabilities.c | 8 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 + .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 58 ++++++++++---- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 44 ++++++----- .../caps_2.10.0.x86_64.replies | 91 ++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 67 ++++++++++++---- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 69 +++++++++++----- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.replies | 44 ++++++----- .../caps_2.6.0-gicv3.aarch64.replies | 44 ++++++----- .../caps_2.6.0.ppc64le.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 69 +++++++++++----- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 40 ++++++---- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 74 +++++++++++++----- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 74 +++++++++++++----- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + .../caps_2.9.0.ppc64le.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 91 ++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-video-cirrus-vgamem.args | 22 ++++++ .../qemuxml2argv-video-cirrus-vgamem.xml | 22 ++++++ tests/qemuxml2argvtest.c | 4 + 41 files changed, 999 insertions(+), 387 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-cirrus-vgamem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-cirrus-vgamem.xml -- 2.13.6

2 4

[libvirt] [PATCH REPOST 0/6] Privatize _virStoragePoolObj and _virStorageVolDefList (Batch #1)
by John Ferlan 06 Oct '17

06 Oct '17

Since the previous series (19 patches): https://www.redhat.com/archives/libvir-list/2017-September/msg00594.html didn't garner any attention, let me try with smaller patch piles with the hope that forward progress will be made. The only "new" one in this series from the other is patch2 - something that Coverity let me know about in an error scenario. Essentially the bulk of these patches remove direct obj->def referencing in favor of a virStoragePoolObjGetDef call. John Ferlan (6): conf: Fix prototype/definition for virStoragePoolObj get functions tests: Fix possible NULL deref storage: Use virStoragePoolObjGetDef accessor for driver test: Rename @vol to @volDef in testOpenVolumesForPool test: Create local virStoragePoolObjPtr VolLookup APIs test: Use virStoragePoolObjGetDef accessor src/conf/virstorageobj.c | 4 +- src/conf/virstorageobj.h | 4 +- src/storage/storage_driver.c | 411 +++++++++++++++++++++++------------------ src/test/test_driver.c | 203 +++++++++++--------- tests/storagevolxml2argvtest.c | 3 +- 5 files changed, 352 insertions(+), 273 deletions(-) -- 2.13.6

2 9

[libvirt] [RFC PATCH] build: isolate core libvirt libs deps from xen runtime
by Wim Ten Have 06 Oct '17

06 Oct '17

From: Wim ten Have <wim.ten.have(a)oracle.com> Generating libvirt packages per make rpm, "with_libxl=1" and "with_xen=1", adds strict runtime dependencies per libxenlight for xen-libs package from core libvirt-libs package. This is not necessary and unfortunate since those dependencies set demand to "xen-libs" package even when there's no need for libvirt xen or libxl driver components. This patch is to have two separate xenconfig lib tool libraries: one for core libvirt (without XL), and a another that contains xl for libxl driver (libvirt_driver_libxl_impl.la) which when loading the driver, loads the remaining symbols (xen{Format,Parse}XL. For the user/sysadmin, this means the xen dependencies are moved into libxl driver, instead of core libvirt. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> Signed-off-by: Wim ten Have <wim.ten.have(a)oracle.com> --- src/Makefile.am | 17 +++++++++++++---- src/libvirt_xenxlconfig.syms | 2 -- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 173fba1e6..80fa2feba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1197,7 +1197,8 @@ XENCONFIG_SOURCES = \ xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ xenconfig/xen_xm.c xenconfig/xen_xm.h if WITH_LIBXL -XENCONFIG_SOURCES += \ +XENCONFIG_LIBXL_SOURCES = \ + $(XENCONFIG_SOURCES) \ xenconfig/xen_xl.c xenconfig/xen_xl.h endif WITH_LIBXL @@ -1258,10 +1259,17 @@ endif WITH_VMX if WITH_XENCONFIG noinst_LTLIBRARIES += libvirt_xenconfig.la libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la -libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS) libvirt_xenconfig_la_CFLAGS = \ - -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) + -I$(srcdir)/conf $(AM_CFLAGS) libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES) + +if WITH_LIBXL +noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la +libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS) +libvirt_xenconfig_libxl_la_CFLAGS = \ + -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) +libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES) +endif WITH_LIBXL endif WITH_XENCONFIG @@ -1417,7 +1425,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ $(AM_CFLAGS) libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) \ - libvirt_xenconfig.la \ + libvirt_xenconfig_libxl.la \ libvirt_secret.la libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) @@ -2045,6 +2053,7 @@ EXTRA_DIST += \ $(VBOX_DRIVER_EXTRA_DIST) \ $(VMWARE_DRIVER_SOURCES) \ $(XENCONFIG_SOURCES) \ + $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) check-local: check-augeas diff --git a/src/libvirt_xenxlconfig.syms b/src/libvirt_xenxlconfig.syms index dbe43aac7..50407002d 100644 --- a/src/libvirt_xenxlconfig.syms +++ b/src/libvirt_xenxlconfig.syms @@ -3,8 +3,6 @@ # #xenconfig/xen_xl.h -xenFormatXL; -xenParseXL; # Let emacs know we want case-insensitive sorting # Local Variables: -- 2.13.6

2 1