- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Yet another round of hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

This time with some tests. You may recognize 2/3 which I've posted here: https://www.redhat.com/archives/libvir-list/2017-June/msg00258.html Michal Privoznik (3): qemuxml2xmltest: Test hugepage enabled domains qemu: Allow memAccess for hugepages again qemu: Prefer hugepages over mem source='file' src/qemu/qemu_command.c | 24 +++------ .../qemuxml2argv-fd-memory-numa-topology2.args | 2 +- .../qemuxml2argv-hugepages-memaccess.args | 42 +++++++++++++++ .../qemuxml2argv-hugepages-memaccess.xml | 62 ++++++++++++++++++++++ .../qemuxml2argv-hugepages-memaccess2.args | 39 ++++++++++++++ .../qemuxml2argv-hugepages-memaccess2.xml | 62 ++++++++++++++++++++++ .../qemuxml2argv-hugepages-pages4.xml | 14 +++-- .../qemuxml2argv-hugepages-pages5.xml | 14 +++-- .../qemuxml2argv-hugepages-pages6.xml | 14 +++-- tests/qemuxml2argvtest.c | 6 +++ .../qemuxml2xmlout-hugepages-memaccess.xml | 1 + .../qemuxml2xmlout-hugepages-memaccess2.xml | 1 + .../qemuxml2xmlout-hugepages-pages4.xml | 1 + .../qemuxml2xmlout-hugepages-pages5.xml | 1 + .../qemuxml2xmlout-hugepages-pages6.xml | 1 + tests/qemuxml2xmltest.c | 5 ++ 16 files changed, 262 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml -- 2.13.0

2 5

[libvirt] [PATCH v3 0/6] Fix error reporting in streams
by Michal Privoznik 13 Jun '17

13 Jun '17

diff to v3: -In the last patch, instead of reporting errors from callbacks, report system error based on errno set by the callbacks. Michal Privoznik (6): virfdstream: Check for thread error more frequently fdstream: Report error from the I/O thread virStream*All: Call virStreamAbort() more frequently virStream*All: Preserve reported error virFileInData: preserve errno in cleanup path virStream*All: Report error if a callback fails daemon/stream.c | 18 ++++++--- include/libvirt/libvirt-stream.h | 17 +++++++- src/libvirt-stream.c | 83 +++++++++++++++++++++++++++++++--------- src/util/virfdstream.c | 22 ++++++++--- src/util/virfile.c | 5 ++- 5 files changed, 113 insertions(+), 32 deletions(-) -- 2.13.0

2 24

[libvirt] [PATCH v2 0/2] Two simple hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-June/msg00395.html diff to v1: - Moved the decision logic to a separate static function as requested in the review. - In 2/2 the function header moved to a different location as requested. Michal Privoznik (2): qemuProcessBuildDestroyHugepagesPath: create path more frequently qemuDomainAttachMemory: Crate hugepage dir if needed src/qemu/qemu_hotplug.c | 3 +++ src/qemu/qemu_process.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_process.h | 5 +++++ 3 files changed, 55 insertions(+), 5 deletions(-) -- 2.13.0

2 5

[libvirt] [PATCH] daemonUnixSocketPaths: Unify exit paths
by Michal Privoznik 13 Jun '17

13 Jun '17

Right now, there is a lot of exit points from the function. Depending on their position they need to copy the same free calls. This goes against our style where we usually have just one exit point from the function which also does the necessary free. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d17a694c9..db239f0d4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -262,50 +262,47 @@ daemonUnixSocketPaths(struct daemonConfig *config, char **rosockfile, char **admsockfile) { + int ret = -1; + char *rundir = NULL; + if (config->unix_sock_dir) { if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir) < 0) - goto error; + goto cleanup; if (privileged) { - if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0) - goto error; - if (virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0) - goto error; + if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0 || + virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0) + goto cleanup; } } else { if (privileged) { if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock") < 0 || VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro") < 0 || VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/libvirt-admin-sock") < 0) - goto error; + goto cleanup; } else { - char *rundir = NULL; mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) - goto error; + goto cleanup; old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); - VIR_FREE(rundir); - goto error; + goto cleanup; } umask(old_umask); if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 || - virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) { - VIR_FREE(rundir); - goto error; - } - - VIR_FREE(rundir); + virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) + goto cleanup; } } - return 0; - error: - return -1; + ret = 0; + cleanup: + VIR_FREE(rundir); + return ret; } -- 2.13.0

2 1

[libvirt] [PATCH] fix memory leak in daemonUnixSocketPaths
by Yi Wang 13 Jun '17

13 Jun '17

The @rundir is allocated in virGetUserRuntimeDirectory, may lost when virFileMakePath failed. Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- daemon/libvirtd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index bac4bc1..d17a694 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -288,6 +288,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); + VIR_FREE(rundir); goto error; } umask(old_umask); -- 1.8.3.1

3 5

[libvirt] [PATCH 0/2] Two simple hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

Ideally, we would have the security driver relabelling the paths qemu is going to touch. And this indeed is how I approached this problem firstly. But there are couple of problems: a) we generate the paths, add them onto the cmd line and forget them. You won't find them in virDomainDef. The secdriver cannot reconstruct them either as they may depend on qemu.conf (admin can whitelist just a few hugetlbfs mount points). b) Storing the paths in virDomainDef (which is all the the secriver sees) turns out to be not trivial too: where would you store them? In function that constructs the paths (qemuBuildMemoryBackendStr) we don't know what 'device' are we working with. All the callers either pass memory dev directly (for <memory/> cells), or construct a dummy one (for <memoryBacking/> and <numa/> cells) and pass it. This we wouldn't know where to store the constructed path anyway. This solution presented here turned out to be the least painful (yet not very clear from design POV, I give you that). Michal Privoznik (2): qemuProcessBuildDestroyHugepagesPath: create path more frequently qemuDomainAttachMemory: Crate hugepage dir if needed src/qemu/qemu_hotplug.c | 3 +++ src/qemu/qemu_process.c | 44 +++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_process.h | 5 +++++ 3 files changed, 47 insertions(+), 5 deletions(-) -- 2.13.0

2 5

[libvirt] [PATCH] qemu: Fix starting a domain with corrupted managed save file
by Jiri Denemark 13 Jun '17

13 Jun '17

Commit v3.4.0-44-gac793bd71 fixed a memory leak, but failed to return the special -3 value. Thus an attempt to start a domain with corrupted managed save file would removed the corrupted file and report "An error occurred, but the cause is unknown" instead of starting the domain from scratch. https://bugzilla.redhat.com/show_bug.cgi?id=1460962 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6654fd3e2..ba1dba5b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6450,17 +6450,15 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def = def; *ret_data = data; + cleanup: virObjectUnref(caps); - return fd; error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - virObjectUnref(caps); - - return -1; + goto cleanup; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 2.13.1

2 1

[libvirt] [PATCH] qemu/doc: Fix function name for handling events
by Philipp Hahn 13 Jun '17

13 Jun '17

Insert missing "IO" into function name. --- src/qemu/EVENTHANDLERS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/EVENTHANDLERS.txt b/src/qemu/EVENTHANDLERS.txt index 79c1505caa..c7798d600b 100644 --- a/src/qemu/EVENTHANDLERS.txt +++ b/src/qemu/EVENTHANDLERS.txt @@ -17,7 +17,7 @@ other qemu events in the future. ---------------------------------------------------- Any event emitted by qemu is received by -qemu_monitor_json.c:qemuMonitorJSONProcessEvent(). It looks up the +qemu_monitor_json.c:qemuMonitorJSONIOProcessEvent(). It looks up the event by name in the table eventHandlers (in the same file), which should have an entry like this for each event that libvirt understands: -- 2.11.0

2 1

[libvirt] [PATCH 1/3] bhyve: tests: add vnc test to bhyvexml2xmltest
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml | 41 +++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml new file mode 100644 index 000000000..9e470e432 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index d591576ca..b3759919e 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -104,6 +104,7 @@ mymain(void) DO_TEST_DIFFERENT("serial"); DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); + DO_TEST_DIFFERENT("vnc"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); @@ -127,7 +128,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so") #else -- 2.12.1

2 2

[libvirt] [PATCH] qemu: hotplug: Release address properly when redirected device attach failure
by Shivaprasad G Bhat 12 Jun '17

12 Jun '17

The virDomainUSBAddressEnsure returns 0 or -1 and checking for 1 is wrong. Fix it. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a7d997..f339148 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1707,7 +1707,6 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, virDomainRedirdevDefPtr redirdev) { int ret = -1; - int rc; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; char *charAlias = NULL; @@ -1724,10 +1723,9 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) goto cleanup; - if ((rc = virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) + if ((virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) goto cleanup; - if (rc == 1) - need_release = true; + need_release = true; if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup;

2 1