- Devel - libvirt List Archives

[libvirt] [PATCH 00/26] Support multiple PHBs for pSeries guests
by Andrea Bolognani 14 Jun '17

14 Jun '17

Book 1: A Journey Begins ======================== These commits merely set the stage for what's coming next. Adventure! Challenges! Friendship! Perhaps even love? 00-03: Trivial cleanups 04-05: Test suite changes that will make implementing future test cases possible; get them out of the way early in order to make patches more straightforward when the time finally comes 06: Simple is beautiful Book 2: From Great POWERs ========================= Our hero faces and overcomes many hardships and by doing so grows as an individual, but something is still amiss. 07-09: Get ready to remove some assumptions... 10: ... and then promptly remove them. Hashtag efficient 11-17: Introduce new characters-I mean, XML elements and attributes and capabilities and all that jazz. Close enough, I say. 18: By now, our hero has acquired amazing powers such as being able to create pSeries guests with multiple PHBs; unfortunately, he still has to rely on his strenght and his strength alone when facing new challenges. Wouldn't it be great if he could get some help? Maybe that's exactly where the story is heading, but we'll have to wait for the next books to find out... 19: Prove to the world that the journey is more important than the destination, yet you still gotta get there at some point Book 3: With a Little Help ========================== Joined by a ragtag group of newfound friends, our hero can push forward knowing that he will always be able to count on their help, and that he'll never again be alone. 20: You can only know how far you've come if you marked your starting point on the map 21-22: The Evil One can only recoil in horror as its minions are banished from the land, one by one. Onwards to the final battle! Book 4: The Parting of the Ways =============================== Every journey must come to an end. The Evil One is at last ready to set in motion its plan to take over the entire land; our hero and his companions are the only obstacles standing in its way. Will they be able to stop impending doom? Maybe, but chances are sure stacked against them. Will knowing this stop them from fighting until their last breath? Of course not. Is the title a Doctor Who reference? You better believe it is! 23-25: More characters join the fray, as the narrative gears up for an epic finale 26: The final battle takes place. Swords will clash, spells will be cast, old friends will fall, and when all is said and done... Well, you didn't really expect me to give away the ending so easily, did you? :) Book 5: ??? =========== Whew, that was quite something, wasn't it? But wait, there's more! The fifth book in this engrossing tetralogy is still being drafted, but is meant to be published along with the rest and provide insights and details that might have escaped even the most attentive reader... Yes, I'm talking about documentation here. Hardcover and paperback editions available. Signed copies can be purchased via mail order. Andrea Bolognani (26): conf: Remove obsolete comment conf: Make virDomainPCIAddressSetGrow() private conf: Tweak virDomainPCIAddressGetNextAddr() signature tests: Update qemumemlock data tests: Mock IOMMU groups conf: Simplify slot allocation qemu: Allow qemuBuildControllerDevStr() to return NULL qemu: Tweak index number checking conf: Move index number checking to drivers qemu: Relax pci-root index requirement for pSeries guests schema: Allow <target index='...'/> conf: Parse and format <target index='...'/> schema: Allow 'spapr-pci-host-bridge' controller model conf: Add 'spapr-pci-host-bridge' controller model qemu: Automatically pick index and model for pci-root controllers qemu: Introduce QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE qemu: Deal with PHB naming convention qemu: Use multiple PHBs for pSeries guests tests: Add tests for pSeries guests with multiple PHBs tests: Add baseline tests for automatic PHB usage qemu: Use PHBs to fill holes in PCI bus numbering qemu: Use PHBs when extending the guest PCI topology conf: Introduce isolation groups schema: Allow <isolationGroup/> conf: Parse and format <isolationGroup/> qemu: Isolate hostdevs on pSeries guests docs/schemas/domaincommon.rng | 12 ++ src/bhyve/bhyve_device.c | 4 +- src/bhyve/bhyve_domain.c | 15 ++ src/conf/device_conf.h | 8 +- src/conf/domain_addr.c | 138 +++++++-------- src/conf/domain_addr.h | 28 +-- src/conf/domain_conf.c | 50 +++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 - src/libxl/libxl_domain.c | 14 ++ src/lxc/lxc_domain.c | 14 ++ src/openvz/openvz_driver.c | 14 ++ src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 146 +++++++++++++--- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain_address.c | 190 ++++++++++++++++++--- src/qemu/qemu_hotplug.c | 5 +- src/uml/uml_driver.c | 14 ++ src/vz/vz_driver.c | 14 ++ src/xen/xen_driver.c | 14 ++ .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 5 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemumemlock-pc-hardlimit+hostdev.xml | 2 +- .../qemumemlock-pc-hardlimit+locked+hostdev.xml | 2 +- tests/qemumemlockdata/qemumemlock-pc-hostdev.xml | 2 +- .../qemumemlock-pc-locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hardlimit+hostdev.xml | 2 +- ...emumemlock-pseries-hardlimit+locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hostdev.xml | 2 +- .../qemumemlock-pseries-locked+hostdev.xml | 2 +- tests/qemumemlocktest.c | 21 ++- .../qemuxml2argv-pseries-hostdev.args | 25 +++ .../qemuxml2argv-pseries-hostdev.xml | 33 ++++ .../qemuxml2argv-pseries-many-buses-1.args | 22 +++ .../qemuxml2argv-pseries-many-buses-1.xml | 20 +++ .../qemuxml2argv-pseries-many-buses-2.args | 22 +++ .../qemuxml2argv-pseries-many-buses-2.xml | 18 ++ .../qemuxml2argv-pseries-many-devices.args | 53 ++++++ .../qemuxml2argv-pseries-many-devices.xml | 49 ++++++ .../qemuxml2argv-pseries-phb-default-missing.args | 22 +++ .../qemuxml2argv-pseries-phb-default-missing.xml | 16 ++ .../qemuxml2argv-pseries-phb-simple.args | 22 +++ .../qemuxml2argv-pseries-phb-simple.xml | 17 ++ tests/qemuxml2argvtest.c | 51 +++++- .../qemuxml2xmlout-panic-pseries.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller-legacy.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller.xml | 5 +- .../qemuxml2xmlout-pseries-hostdev.xml | 56 ++++++ ...xml => qemuxml2xmlout-pseries-many-buses-1.xml} | 19 ++- ...xml => qemuxml2xmlout-pseries-many-buses-2.xml} | 20 ++- .../qemuxml2xmlout-pseries-many-devices.xml | 125 ++++++++++++++ .../qemuxml2xmlout-pseries-nvram.xml | 5 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 5 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 5 +- ...qemuxml2xmlout-pseries-phb-default-missing.xml} | 18 +- ...m.xml => qemuxml2xmlout-pseries-phb-simple.xml} | 18 +- tests/qemuxml2xmltest.c | 47 ++++- tests/virpcimock.c | 43 ++++- 61 files changed, 1306 insertions(+), 204 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdev.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-1.xml} (55%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-2.xml} (54%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-default-missing.xml} (56%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-simple.xml} (56%) -- 2.7.5

3 57

[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

[libvirt] [PATCH] bhyve: add support for video device configuration
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Connect domain XML <driver vgaconf=""> configuration (introduced in a previous patch) to bhyve command generation. Unfortunately, this option was documented just recently and at the time of writing official online manpages didn't have it updated, so for now one can refer to: https://github.com/freebsd/freebsd/blob/master/usr.sbin/bhyve/bhyve.8#L327 for the detailed description of the possible vga configuration options. Also, add some tests for this new feature. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_command.c | 4 ++ .../bhyvexml2argv-vnc-vgaconf.args | 12 ++++++ .../bhyvexml2argv-vnc-vgaconf.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf.xml | 31 ++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-vnc-vgaconf.xml | 43 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 7 files changed, 93 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..f70e3bc60 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -408,6 +408,10 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, _("Unsupported listen type")); } + if (video->driver) + virBufferAsprintf(&opt, ",vga=%s", + virDomainVideoVgaconfTypeToString(video->driver->vgaconf)); + virCommandAddArg(cmd, "-s"); virCommandAddArgBuffer(cmd, &opt); return 0; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args new file mode 100644 index 000000000..70347ee0b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml new file mode 100644 index 000000000..f1bcd1bde --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml @@ -0,0 +1,31 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <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> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'> + <driver vgaconf='off'/> + </model> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..a369a447a 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -193,6 +193,7 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-vgaconf"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml new file mode 100644 index 000000000..6cc1aa088 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml @@ -0,0 +1,43 @@ +<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'> + <driver vgaconf='off'/> + </model> + <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 b3759919e..70e4caeb3 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,7 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-vgaconf"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.12.1

2 4

[libvirt] [PATCH 1/2] conf: add video driver configuration element
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Add support for video driver configuration. In domain xml it looks like this: <video> <model type=''> <driver .../> </model> </video> At present, the only supported configuration is 'vgaconf' that looks this way: <driver vgaconf='io|on|off'> It was added with bhyve gop video in mind to allow users control how the video device is exposed to the guest, specifically, how VGA I/O is handled. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- docs/schemas/domaincommon.rng | 13 +++++++++ src/conf/domain_conf.c | 63 +++++++++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 17 ++++++++++++ src/libvirt_private.syms | 2 ++ 4 files changed, 93 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 281309ec0..f45820383 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3278,6 +3278,19 @@ </optional> </element> </optional> + <optional> + <element name="driver"> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </element> + </optional> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ff216e3a..2ab55b52f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -553,6 +553,11 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "virtio", "gop") +VIR_ENUM_IMPL(virDomainVideoVgaconf, VIR_DOMAIN_VIDEO_VGACONF_LAST, + "io", + "on", + "off") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet", @@ -2280,6 +2285,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) virDomainDeviceInfoClear(&def->info); VIR_FREE(def->accel); + VIR_FREE(def->driver); VIR_FREE(def); } @@ -13368,6 +13374,43 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) return def; } +static virDomainVideoDriverDefPtr +virDomainVideoDriverDefParseXML(xmlNodePtr node) +{ + xmlNodePtr cur; + virDomainVideoDriverDefPtr def; + char *vgaconf = NULL; + int val; + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (!vgaconf && + xmlStrEqual(cur->name, BAD_CAST "driver")) { + vgaconf = virXMLPropString(cur, "vgaconf"); + } + } + cur = cur->next; + } + + if (!vgaconf) + return NULL; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if ((val = virDomainVideoVgaconfTypeFromString(vgaconf)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vgaconf value '%s'"), vgaconf); + goto cleanup; + } + def->vgaconf = val; + + cleanup: + VIR_FREE(vgaconf); + return def; +} + static virDomainVideoDefPtr virDomainVideoDefParseXML(xmlNodePtr node, const virDomainDef *dom, @@ -13405,6 +13448,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } def->accel = virDomainVideoAccelDefParseXML(cur); + def->driver = virDomainVideoDriverDefParseXML(cur); } } cur = cur->next; @@ -22998,6 +23042,18 @@ virDomainVideoAccelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } +static void +virDomainVideoDriverDefFormat(virBufferPtr buf, + virDomainVideoDriverDefPtr def) +{ + virBufferAddLit(buf, "<driver"); + if (def->vgaconf) { + virBufferAsprintf(buf, " vgaconf='%s'", + virDomainVideoVgaconfTypeToString(def->vgaconf)); + } + virBufferAddLit(buf, "/>\n"); +} + static int virDomainVideoDefFormat(virBufferPtr buf, @@ -23028,10 +23084,13 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " heads='%u'", def->heads); if (def->primary) virBufferAddLit(buf, " primary='yes'"); - if (def->accel) { + if (def->accel || def->driver) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virDomainVideoAccelDefFormat(buf, def->accel); + if (def->accel) + virDomainVideoAccelDefFormat(buf, def->accel); + if (def->driver) + virDomainVideoDriverDefFormat(buf, def->driver); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</model>\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09fb7aada..cbf25a67b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1350,6 +1350,16 @@ typedef enum { } virDomainVideoType; +typedef enum { + VIR_DOMAIN_VIDEO_VGACONF_IO = 0, + VIR_DOMAIN_VIDEO_VGACONF_ON, + VIR_DOMAIN_VIDEO_VGACONF_OFF, + + VIR_DOMAIN_VIDEO_VGACONF_LAST +} virDomainVideoVgaconf; + +VIR_ENUM_DECL(virDomainVideoVgaconf) + typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { @@ -1358,6 +1368,12 @@ struct _virDomainVideoAccelDef { }; +typedef struct _virDomainVideoDriverDef virDomainVideoDriverDef; +typedef virDomainVideoDriverDef *virDomainVideoDriverDefPtr; +struct _virDomainVideoDriverDef { + virDomainVideoVgaconf vgaconf; +}; + struct _virDomainVideoDef { int type; unsigned int ram; /* kibibytes (multiples of 1024) */ @@ -1367,6 +1383,7 @@ struct _virDomainVideoDef { unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; + virDomainVideoDriverDefPtr driver; virDomainDeviceInfo info; }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e6901a8f1..40995533c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -525,6 +525,8 @@ virDomainVideoDefaultType; virDomainVideoDefFree; virDomainVideoTypeFromString; virDomainVideoTypeToString; +virDomainVideoVgaconfTypeFromString; +virDomainVideoVgaconfTypeToString; virDomainVirtTypeFromString; virDomainVirtTypeToString; virDomainWatchdogActionTypeFromString; -- 2.12.1

2 2

[libvirt] [PATCH 1/2] util: rename qemuGetProcessInfo to virProcessGetStat
by Wang King 12 Jun '17

12 Jun '17

qemuGetProcessInfo is more likely a process utility function, just rename it to virProcessGetStat and move it to virprocess.c source file. --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 83 ++++++++++-------------------------------------- src/util/virprocess.c | 62 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 4 +++ 4 files changed, 83 insertions(+), 67 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d361454..3681869 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2382,6 +2382,7 @@ virProcessGetMaxMemLock; virProcessGetNamespaces; virProcessGetPids; virProcessGetStartTime; +virProcessGetStat; virProcessKill; virProcessKillPainfully; virProcessNamespaceAvailable; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6c79d4f..a4aa5da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1378,68 +1378,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, return ret; } - -static int -qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, - pid_t pid, int tid) -{ - char *proc; - FILE *pidinfo; - unsigned long long usertime = 0, systime = 0; - long rss = 0; - int cpu = 0; - int ret; - - /* In general, we cannot assume pid_t fits in int; but /proc parsing - * is specific to Linux where int works fine. */ - if (tid) - ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int) pid, tid); - else - ret = virAsprintf(&proc, "/proc/%d/stat", (int) pid); - if (ret < 0) - return -1; - - pidinfo = fopen(proc, "r"); - VIR_FREE(proc); - - /* See 'man proc' for information about what all these fields are. We're - * only interested in a very few of them */ - if (!pidinfo || - fscanf(pidinfo, - /* pid -> stime */ - "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" - /* cutime -> endcode */ - "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" - /* startstack -> processor */ - "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", - &usertime, &systime, &rss, &cpu) != 4) { - VIR_WARN("cannot parse process status data"); - } - - /* We got jiffies - * We want nanoseconds - * _SC_CLK_TCK is jiffies per second - * So calculate thus.... - */ - if (cpuTime) - *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) - / (unsigned long long)sysconf(_SC_CLK_TCK); - if (lastCpu) - *lastCpu = cpu; - - if (vm_rss) - *vm_rss = rss * virGetSystemPageSizeKB(); - - - VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", - (int) pid, tid, usertime, systime, cpu, rss); - - VIR_FORCE_FCLOSE(pidinfo); - - return 0; -} - - static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, @@ -1482,9 +1420,9 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, vcpuinfo->number = i; vcpuinfo->state = VIR_VCPU_RUNNING; - if (qemuGetProcessInfo(&vcpuinfo->cpuTime, - &vcpuinfo->cpu, NULL, - vm->pid, vcpupid) < 0) { + if (virProcessGetStat(vm->pid, vcpupid, + &vcpuinfo->cpuTime, + &vcpuinfo->cpu, NULL) < 0) { virReportSystemError(errno, "%s", _("cannot get vCPU placement & pCPU time")); return -1; @@ -2641,7 +2579,7 @@ qemuDomainGetInfo(virDomainPtr dom, } if (virDomainObjIsActive(vm)) { - if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { + if (virProcessGetStat(vm->pid, 0, &(info->cpuTime), NULL, NULL) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot read cputime for domain")); goto cleanup; @@ -8172,6 +8110,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; + virQEMUCapsPtr qemuCaps = NULL; + qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -8190,6 +8130,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; + priv = vm->privateData; + if (virDomainUpdateDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; @@ -8216,6 +8158,12 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, goto endjob; } + if (priv->qemuCaps) + qemuCaps = virObjectRef(priv->qemuCaps); + else if (!(qemuCaps = virQEMUCapsCacheLookup(caps, driver->qemuCapsCache, + vm->def->emulator))) + goto endjob; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -8263,6 +8211,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: + virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); @@ -11107,7 +11056,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriverPtr driver, ret = 0; } - if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { + if (virProcessGetStat(vm->pid, 0, NULL, NULL, &rss) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get RSS for domain")); } else { diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3..98f4b25 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1426,3 +1426,65 @@ virProcessSetScheduler(pid_t pid ATTRIBUTE_UNUSED, } #endif /* !HAVE_SCHED_SETSCHEDULER */ + +int +virProcessGetStat(pid_t pid, int tid, + unsigned long long *cpuTime, + int *lastCpu, long *vm_rss) +{ + char *proc; + FILE *pidinfo; + unsigned long long usertime = 0, systime = 0; + long rss = 0; + int cpu = 0; + int ret; + + /* In general, we cannot assume pid_t fits in int; but /proc parsing + * is specific to Linux where int works fine. */ + if (tid) + ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int) pid, tid); + else + ret = virAsprintf(&proc, "/proc/%d/stat", (int) pid); + if (ret < 0) + return -1; + + pidinfo = fopen(proc, "r"); + VIR_FREE(proc); + + /* See 'man proc' for information about what all these fields are. We're + * only interested in a very few of them */ + if (!pidinfo || + fscanf(pidinfo, + /* pid -> stime */ + "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" + /* cutime -> endcode */ + "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" + /* startstack -> processor */ + "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", + &usertime, &systime, &rss, &cpu) != 4) { + VIR_WARN("cannot parse process status data"); + } + + /* We got jiffies + * We want nanoseconds + * _SC_CLK_TCK is jiffies per second + * So calculate thus.... + */ + if (cpuTime) + *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) + / (unsigned long long)sysconf(_SC_CLK_TCK); + if (lastCpu) + *lastCpu = cpu; + + if (vm_rss) + *vm_rss = rss * virGetSystemPageSizeKB(); + + + VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", + (int) pid, tid, usertime, systime, cpu, rss); + + VIR_FORCE_FCLOSE(pidinfo); + + return 0; + +} diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 3c5a882..2a2b91d 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -106,4 +106,8 @@ typedef enum { int virProcessNamespaceAvailable(unsigned int ns); +int virProcessGetStat(pid_t pid, int tid, + unsigned long long *cpuTime, + int *lastCpu, long *vm_rss); + #endif /* __VIR_PROCESS_H__ */ -- 2.8.3

2 2

[libvirt] [PATCH] qemu: Explain why mdevs are assumed to be PCI Express
by Andrea Bolognani 12 Jun '17

12 Jun '17

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain_address.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 2106b34..b5b863f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -645,6 +645,11 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return pcieFlags; } + /* mdevs don't have corresponding files in /sys that we can poke to + * try and figure out whether they are legacy PCI or PCI Express, so + * the logic below would never work; instead, we just go ahead and + * assume they're PCI Express. This is a very reasonable assumption, + * as all current mdev-capable devices are indeed PCI Express */ if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV) return pcieFlags; -- 2.7.5

2 1

[libvirt] [PATCH 0/2] fix VNC and Spice unix socket escaping
by Pavel Hrdina 12 Jun '17

12 Jun '17

Pavel Hrdina (2): qemu: skip only ',' for VNC and Spice unix socket Revert "util: virqemu: introduce virQEMUBuildBufferEscape" src/libvirt_private.syms | 1 - src/qemu/qemu_command.c | 4 ++-- src/util/virqemu.c | 17 ----------------- src/util/virqemu.h | 1 - tests/qemuxml2argvdata/qemuxml2argv-name-escape.args | 4 ++-- 5 files changed, 4 insertions(+), 23 deletions(-) -- 2.13.0

3 5

[libvirt] [PATCH] cpu_ppc64: Add support for host-model on POWER9
by Jiri Denemark 12 Jun '17

12 Jun '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_ppc64.c | 8 ++++---- .../qemuxml2argv-pseries-cpu-compat-power9.args | 24 ++++++++++++++++++++++ .../qemuxml2argv-pseries-cpu-compat-power9.xml | 21 +++++++++++++++++++ tests/qemuxml2argvtest.c | 7 +++++++ tests/testutilsqemu.c | 13 +++++++++++- tests/testutilsqemu.h | 1 + 6 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index f64592b55..bf0859904 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -92,22 +92,22 @@ ppc64CheckCompatibilityMode(const char *host_model, if (!compat_mode) return VIR_CPU_COMPARE_IDENTICAL; - /* Valid host CPUs: POWER6, POWER7, POWER8 */ + /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9 */ if (!STRPREFIX(host_model, "POWER") || !(tmp = (char *) host_model + strlen("POWER")) || virStrToLong_i(tmp, NULL, 10, &host) < 0 || - host < 6 || host > 8) { + host < 6 || host > 9) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Host CPU does not support compatibility modes")); goto out; } - /* Valid compatibility modes: power6, power7, power8 */ + /* Valid compatibility modes: power6, power7, power8, power9 */ if (!STRPREFIX(compat_mode, "power") || !(tmp = (char *) compat_mode + strlen("power")) || virStrToLong_i(tmp, NULL, 10, &compat) < 0 || - compat < 6 || compat > 8) { + compat < 6 || compat > 9) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown compatibility mode %s"), compat_mode); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args new file mode 100644 index 000000000..af93d63dc --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.args @@ -0,0 +1,24 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ +-S \ +-M pseries \ +-cpu host,compat=power9 \ +-m 256 \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-boot c \ +-usb \ +-chardev pty,id=charserial0 \ +-device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml new file mode 100644 index 000000000..30ab5c267 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat-power9.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <cpu mode='host-model'> + <model>power9</model> + </cpu> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <console type='pty'> + <address type="spapr-vio"/> + </console> + <memballoon model="none"/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 426959857..669caa0e4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1673,6 +1673,13 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + DO_TEST_FAILURE("pseries-cpu-compat-power9", QEMU_CAPS_KVM); + + qemuTestSetHostCPU(driver.caps, cpuPower9); + DO_TEST("pseries-cpu-compat-power9", + QEMU_CAPS_KVM, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + qemuTestSetHostCPU(driver.caps, NULL); + qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE); DO_TEST("pseries-panic-missing", diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 709e291bd..ee4853841 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -17,6 +17,7 @@ virCPUDefPtr cpuDefault; virCPUDefPtr cpuHaswell; virCPUDefPtr cpuPower8; +virCPUDefPtr cpuPower9; static virCPUFeatureDef cpuDefaultFeatures[] = { { (char *) "ds", -1 }, @@ -94,6 +95,15 @@ static virCPUDef cpuPower8Data = { .threads = 8, }; +static virCPUDef cpuPower9Data = { + .type = VIR_CPU_TYPE_HOST, + .arch = VIR_ARCH_PPC64, + .model = (char *) "POWER9", + .sockets = 1, + .cores = 16, + .threads = 1, +}; + typedef enum { TEST_UTILS_QEMU_BIN_I686, TEST_UTILS_QEMU_BIN_X86_64, @@ -467,7 +477,8 @@ virCapsPtr testQemuCapsInit(void) if (!(cpuDefault = virCPUDefCopy(&cpuDefaultData)) || !(cpuHaswell = virCPUDefCopy(&cpuHaswellData)) || - !(cpuPower8 = virCPUDefCopy(&cpuPower8Data))) + !(cpuPower8 = virCPUDefCopy(&cpuPower8Data)) || + !(cpuPower9 = virCPUDefCopy(&cpuPower9Data))) goto cleanup; qemuTestSetHostCPU(caps, NULL); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 3393f5eb7..05e5651ae 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -21,6 +21,7 @@ virQEMUCapsPtr qemuTestParseCapabilities(virCapsPtr caps, extern virCPUDefPtr cpuDefault; extern virCPUDefPtr cpuHaswell; extern virCPUDefPtr cpuPower8; +extern virCPUDefPtr cpuPower9; void qemuTestSetHostArch(virCapsPtr caps, virArch arch); -- 2.13.0

3 8

[libvirt] [PATCH] qemuDomainBlockCopyCommon: Fix the memory leak
by Jie Wang 12 Jun '17

12 Jun '17

When take the cleanup branch, will leads to the mirror memory leak --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e3c7fc..74cc2c4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16856,7 +16856,6 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, endjob: if (need_unlink && unlink(mirror->path)) VIR_WARN("unable to unlink just-created %s", mirror->path); - virStorageSourceFree(mirror); qemuDomainObjEndJob(driver, vm); if (monitor_error) { virSetError(monitor_error); @@ -16866,6 +16865,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, cleanup: VIR_FREE(device); virObjectUnref(cfg); + virStorageSourceFree(mirror); return ret; } -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: Add AAVMF32 to the list of known UEFIs
by dann frazier 09 Jun '17

09 Jun '17

Add a path for UEFI VMs for AArch32 VMs. This is the path Debian is currently using in experimental. libvirt is the de facto canonical location for where distros should place these firmware images, so let's define this path here to try and minimize distro fragmentation. --- src/qemu/qemu_conf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 73c33d6788..c1bd91935b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,6 +130,8 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #define VIR_QEMU_OVMF_SEC_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" #define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" #define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" +#define VIR_QEMU_AAVMF32_LOADER_PATH "/usr/share/AAVMF/AAVMF32_CODE.fd" +#define VIR_QEMU_AAVMF32_NVRAM_PATH "/usr/share/AAVMF/AAVMF32_VARS.fd" virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { @@ -334,11 +336,11 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) goto error; #else - if (VIR_ALLOC_N(cfg->firmwares, 3) < 0) + if (VIR_ALLOC_N(cfg->firmwares, 4) < 0) goto error; - cfg->nfirmwares = 3; + cfg->nfirmwares = 4; if (VIR_ALLOC(cfg->firmwares[0]) < 0 || VIR_ALLOC(cfg->firmwares[1]) < 0 || - VIR_ALLOC(cfg->firmwares[2]) < 0) + VIR_ALLOC(cfg->firmwares[2]) < 0 || VIR_ALLOC(cfg->firmwares[3]) < 0) goto error; if (VIR_STRDUP(cfg->firmwares[0]->name, VIR_QEMU_AAVMF_LOADER_PATH) < 0 || @@ -346,7 +348,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) VIR_STRDUP(cfg->firmwares[1]->name, VIR_QEMU_OVMF_LOADER_PATH) < 0 || VIR_STRDUP(cfg->firmwares[1]->nvram, VIR_QEMU_OVMF_NVRAM_PATH) < 0 || VIR_STRDUP(cfg->firmwares[2]->name, VIR_QEMU_OVMF_SEC_LOADER_PATH) < 0 || - VIR_STRDUP(cfg->firmwares[2]->nvram, VIR_QEMU_OVMF_SEC_NVRAM_PATH) < 0) + VIR_STRDUP(cfg->firmwares[2]->nvram, VIR_QEMU_OVMF_SEC_NVRAM_PATH) < 0 || + VIR_STRDUP(cfg->firmwares[3]->name, VIR_QEMU_AAVMF32_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->firmwares[3]->nvram, VIR_QEMU_AAVMF32_NVRAM_PATH) < 0) goto error; #endif -- 2.11.0

2 2

[libvirt] [PATCH] qemu: report an error if usb keyboards are unsupported
by Ján Tomko 09 Jun '17

09 Jun '17

Be nicer to the user and report a proper error instead of: An error occurred, but the cause is unknown https://bugzilla.redhat.com/show_bug.cgi?id=1460086 --- src/qemu/qemu_command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 20af16b..0f87809 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4261,8 +4261,12 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virBufferAsprintf(&buf, "usb-tablet,id=%s", dev->info.alias); break; case VIR_DOMAIN_INPUT_TYPE_KBD: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_KBD)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("usb keyboard is not supported by this " + "QEMU binary")); goto error; + } virBufferAsprintf(&buf, "usb-kbd,id=%s", dev->info.alias); break; } -- 2.10.2

2 1

[libvirt] Need help with running libvirt-test-api
by lmurthy＠codeaurora.org 09 Jun '17

09 Jun '17

Hi All, I am new to libvirt; to create a virtual machine using libvirt-test-API framework, I am starting with "repos/domain/linux_domain.conf". Before starting the script, I downloaded Fedora-Server-DVD-aarch64-23.iso under /var/lib/libvirt/images, and changed the parameter "testfullimagepath" under global.cfg to reflect the path of iso image. On trying to run the script using python libvirt-test-api --casefile /home/fedora/libvirt-test-API/cases/linux_domain.conf -l 1 I am getting below error message. Please let me know how to resolve this. Log file: root@null-8cfdf006971f:~/libvirt-test-API# python libvirt-test-api --casefile /home/ubuntu/libvirt-test-API/cases/linux_domain.conf -l 1 Parameter guestname is required the No.1 : domain:install_linux_cdrom Parameter guestname is required the No.2 : domain:install_linux_check Parameter guestname is required the No.3 : domain:shutdown Parameter guestname is required the No.4 : domain:start Parameter guestname is required the No.5 : domain:guest_time Parameter guestname is required the No.6 : domain:set_guest_time Parameter guestname is required the No.8 : domain:securitylabel Parameter guestname is required the No.9 : domain:coredump_with_format Parameter guestname is required the No.10 : domain:destroy Parameter guestname is required the No.11 : domain:undefine Parameter guestname is required the No.12 : domain:define Parameter guestname is required the No.13 : domain:suspend Parameter guestname is required the No.14 : domain:resume Parameter guestname is required the No.15 : domain:autostart Parameter guestname is required the No.16 : domain:ifstats Parameter guestname is required the No.17 : domain:blkstats Parameter guestname is required the No.18 : domain:dump Parameter guestname is required the No.19 : domain:attach_disk Parameter guestname is required the No.20 : domain:detach_disk Parameter guestname is required the No.21 : domain:cpu_affinity Parameter guestname is required the No.22 : domain:balloon_memory Parameter guestname is required the No.23 : domain:open_graphicsfd Parameter guestname is required the No.24 : domain:domain_fsfreeze Parameter guestname is required the No.25 : domain:domain_fsthaw Parameter guestname is required the No.26 : virconn:connection_security_model Parameter guestname is required the No.27 : domain:cpu_status Parameter guestname is required the No.28 : domain:set_memory_period Parameter guestname is required the No.29 : domain:add_del_iothread Parameter guestname is required the No.30 : domain:pin_iothread Parameter guestname is required the No.31 : domain:info_iothread Parameter guestname is required the No.32 : domain:fsinfo Parameter guestname is required the No.33 : domain:set_user_passwd root@null-8cfdf006971f:~/libvirt-test-API# root@null-8cfdf006971f:~/libvirt-test-API#

2 1

[libvirt] [PATCH v2] virsh: workaround readline prototypes warnings
by Roman Bogorodskiy 08 Jun '17

08 Jun '17

When building with clang 4.0.0, virsh build fails like this: gmake[3]: Entering directory '/usr/home/novel/code/libvirt/tools' CC virsh-virsh.o In file included from virsh.c:45: In file included from /usr/local/include/readline/readline.h:31: /usr/local/include/readline/rltypedefs.h:35:22: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] typedef int Function () __attribute__ ((deprecated)); ^ void /usr/local/include/readline/rltypedefs.h:36:24: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] typedef void VFunction () __attribute__ ((deprecated)); ^ void /usr/local/include/readline/rltypedefs.h:37:26: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] typedef char *CPFunction () __attribute__ ((deprecated)); ^ void /usr/local/include/readline/rltypedefs.h:38:28: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] typedef char **CPPFunction () __attribute__ ((deprecated)); ^ void In file included from virsh.c:45: /usr/local/include/readline/readline.h:385:23: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] extern int rl_message (); ^ void 5 errors generated. gmake[3]: *** [Makefile:2823: virsh-virsh.o] Error 1 Fix that by adding -D_FUNCTION_DEF to READLINE_CFLAGS to fix *Function related warnings and add a check for stdarg.h so readline headers use proper rl_message declaration. Bug report on the readline mailing list: http://lists.gnu.org/archive/html/bug-readline/2017-05/msg00004.html --- configure.ac | 2 +- m4/virt-readline.m4 | 4 +++- tools/Makefile.am | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1af5538ee..1a73b3466 100644 --- a/configure.ac +++ b/configure.ac @@ -328,7 +328,7 @@ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ - libtasn1.h sys/ucred.h sys/mount.h]) + libtasn1.h sys/ucred.h sys/mount.h stdarg.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64]) diff --git a/m4/virt-readline.m4 b/m4/virt-readline.m4 index ee70ea36b..9fba5148a 100644 --- a/m4/virt-readline.m4 +++ b/m4/virt-readline.m4 @@ -45,7 +45,9 @@ AC_DEFUN([LIBVIRT_CHECK_READLINE],[ # function, to ensure we aren't being confused by caching. LIBS=$lv_saved_libs AC_CHECK_LIB([readline], [rl_initialize], - [], [READLINE_LIBS="$READLINE_LIBS $extra_LIBS"]) + [READLINE_CFLAGS="-D_FUNCTION_DEF $READLINE_CFLAGS" + AC_SUBST(READLINE_CFLAGS)], + [READLINE_LIBS="$READLINE_LIBS $extra_LIBS"]) LIBS=$lv_saved_libs ]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 56691c289..345521457 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -244,7 +244,8 @@ virsh_CFLAGS = \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(LIBXML_CFLAGS) + $(LIBXML_CFLAGS) \ + $(READLINE_CFLAGS) virt_admin_SOURCES = \ virt-admin.c virt-admin.h \ -- 2.13.0

2 4

[libvirt] CFP: KVM Forum 2017
by Paolo Bonzini 08 Jun '17

08 Jun '17

================================================================ KVM Forum 2017: Call For Participation October 25-27, 2017 - Hilton Prague - Prague, Czech Republic (All submissions must be received before midnight June 15, 2017) ================================================================= KVM Forum is an annual event that presents a rare opportunity for developers and users to meet, discuss the state of Linux virtualization technology, and plan for the challenges ahead. We invite you to lead part of the discussion by submitting a speaking proposal for KVM Forum 2017. At this highly technical conference, developers driving innovation in the KVM virtualization stack (Linux, KVM, QEMU, libvirt) can meet users who depend on KVM as part of their offerings, or to power their data centers and clouds. KVM Forum will include sessions on the state of the KVM virtualization stack, planning for the future, and many opportunities for attendees to collaborate. As we celebrate ten years of KVM development in the Linux kernel, KVM continues to be a critical part of the FOSS cloud infrastructure. This year, KVM Forum is joining Open Source Summit in Prague, Czech Republic. Selected talks from KVM Forum will be presented on Wednesday October 25 to the full audience of the Open Source Summit. Also, attendees of KVM Forum will have access to all of the talks from Open Source Summit on Wednesday. http://events.linuxfoundation.org/cfp Suggested topics: * Scaling, latency optimizations, performance tuning, real-time guests * Hardening and security * New features * Testing KVM and the Linux kernel: * Nested virtualization * Resource management (CPU, I/O, memory) and scheduling * VFIO: IOMMU, SR-IOV, virtual GPU, etc. * Networking: Open vSwitch, XDP, etc. * virtio and vhost * Architecture ports and new processor features QEMU: * Management interfaces: QOM and QMP * New devices, new boards, new architectures * Graphics, desktop virtualization and virtual GPU * New storage features * High availability, live migration and fault tolerance * Emulation and TCG * Firmware: ACPI, UEFI, coreboot, U-Boot, etc. Management and infrastructure * Managing KVM: Libvirt, OpenStack, oVirt, etc. * Storage: Ceph, Gluster, SPDK, etc.r * Network Function Virtualization: DPDK, OPNFV, OVN, etc. * Provisioning =============== SUBMITTING YOUR PROPOSAL =============== Abstracts due: June 15, 2017 Please submit a short abstract (~150 words) describing your presentation proposal. Slots vary in length up to 45 minutes. Also include the proposal type -- one of: - technical talk - end-user talk Submit your proposal here: http://events.linuxfoundation.org/cfp Please only use the categories "presentation" and "panel discussion" You will receive a notification whether or not your presentation proposal was accepted by August 10, 2017. Speakers will receive a complimentary pass for the event. In the instance that case your submission has multiple presenters, only the primary speaker for a proposal will receive a complimentary event pass. For panel discussions, all panelists will receive a complimentary event pass. TECHNICAL TALKS A good technical talk should not just report on what has happened over the last year; it should present a concrete problem and how it impacts the user and/or developer community. Whenever applicable, focus on work that needs to be done, difficulties that haven't yet been solved, and on decisions that other developers should be aware of. Summarizing recent developments is okay but it should not be more than a small portion of the overall talk. END-USER TALKS One of the big challenges as developers is to know what, where and how people actually use our software. We will reserve a few slots for end users talking about their deployment challenges and achievements. If you are using KVM in production you are encouraged submit a speaking proposal. Simply mark it as an end-user talk. As an end user, this is a unique opportunity to get your input to developers. HANDS-ON / BOF SESSIONS We will reserve some time for people to get together and discuss strategic decisions as well as other topics that are best solved within smaller groups. These sessions will be announced during the event. If you are interested in organizing such a session, please add it to the list at http://www.linux-kvm.org/page/KVM_Forum_2017_BOF Let people you think who might be interested know about your BOF, and encourage them to add their names to the wiki page as well. Please try to add your ideas to the list before KVM Forum starts. PANEL DISCUSSIONS If you are proposing a panel discussion, please make sure that you list all of your potential panelists in your the abstract. We will request full biographies if a panel is accepted. =============== HOTEL / TRAVEL =============== This year's event will take place at the Hilton Prague. For information on discounted room rates for conference attendees and on other hotels close to the conference, please visit http://events.linuxfoundation.org/events/kvm-forum/attend/hotel-travel. =============== IMPORTANT DATES =============== Submission deadline: June 15, 2017 Notification: August 10, 2017 Schedule announced: August 17, 2017 Event dates: October 25-27, 2017 Thank you for your interest in KVM. We're looking forward to your submissions and seeing you at the KVM Forum 2017 in October! -your KVM Forum 2017 Program Committee Please contact us with any questions or comments at kvm-forum-2017-pc(a)redhat.com

1 1

[libvirt] [sandbox 0/2] misc fixes
by Cédric Bosdonnat 08 Jun '17

08 Jun '17

Hi all, Here are a two fixes for virt-sandbox. One to actually use -d and -v flags in the init program, and the other to get host-bound mounts writable as non-root user. Cédric Bosdonnat (2): Pass debug and verbose values to init machine: use squash security mode for non-root virt-sandbox mounts bin/virt-sandbox.c | 3 + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 5 +- libvirt-sandbox/libvirt-sandbox-config.c | 75 +++++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config.h | 6 ++ libvirt-sandbox/libvirt-sandbox-init-common.c | 3 + libvirt-sandbox/libvirt-sandbox.sym | 4 ++ 6 files changed, 95 insertions(+), 1 deletion(-) -- 2.12.2

1 2

[libvirt] [PATCH 0/2] Two trivial MTU fixes
by Michal Privoznik 08 Jun '17

08 Jun '17

I'm inclined to pushed them as trivial, but since they have a bugzilla assigned I'd rather have a proper review. Michal Privoznik (2): qemu: Set iface MTU on hotplug qemuDomainChangeNet: Forbid changing MTU src/qemu/qemu_hotplug.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.13.0

2 4

[libvirt] [PATCH] qemu: Allow memAccess for hugepages again
by Michal Privoznik 08 Jun '17

08 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 4 +- .../qemuxml2argv-hugepages-memaccess.args | 38 ++++++++++++++++++ .../qemuxml2argv-hugepages-memaccess.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 015af1036..2a076301f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3361,7 +3361,9 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, return -1; if (pagesize || mem->nvdimmPath || - def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { + def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE || + (memAccess == VIR_DOMAIN_MEMORY_ACCESS_SHARED && + def->mem.nhugepages)) { *backendType = "memory-backend-file"; if (mem->nvdimmPath) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args new file mode 100644 index 000000000..c3f2c5397 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args @@ -0,0 +1,38 @@ +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 4096 \ +-smp 4,sockets=4,cores=1,threads=1 \ +-object memory-backend-file,id=ram-node0,prealloc=yes,\ +mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\ +host-nodes=0-3,policy=bind \ +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \ +-object memory-backend-file,id=ram-node1,prealloc=yes,\ +mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\ +host-nodes=0-3,policy=bind \ +-numa node,nodeid=1,cpus=1,memdev=ram-node1 \ +-object memory-backend-file,id=ram-node2,prealloc=yes,\ +mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\ +host-nodes=0-3,policy=bind \ +-numa node,nodeid=2,cpus=2,memdev=ram-node2 \ +-object memory-backend-file,id=ram-node3,prealloc=yes,\ +mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,size=1073741824,\ +host-nodes=3,policy=bind \ +-numa node,nodeid=3,cpus=3,memdev=ram-node3 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml new file mode 100644 index 000000000..55379dcab --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <hugepages> + <page size='2048' unit='KiB' nodeset='1'/> + <page size='1048576' unit='KiB' nodeset='0,2-3'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <numatune> + <memory mode='strict' nodeset='0-3'/> + <memnode cellid='3' mode='strict' nodeset='3'/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <numa> + <cell id='0' cpus='0' memory='1048576'/> + <cell id='1' cpus='1' memory='1048576' memAccess='shared'/> + <cell id='2' cpus='2' memory='1048576' memAccess='private'/> + <cell id='3' cpus='3' memory='1048576'/> + </numa> + </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'> + <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'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b7d7cc2ab..836f413ce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -819,6 +819,7 @@ 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-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-iscsi", NONE); -- 2.13.0

1 1

[libvirt] [PATCH] virNetDevOpenvswitchGetVhostuserIfname: Fix off by one error
by Michal Privoznik 08 Jun '17

08 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1459091 We try to get the last element of the passed path by calling strrch(path, '/'). However, the pointer that strrchr() returns points at the slash, We want string that starts right after that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/util/virnetdevopenvswitch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 42abcb4bb..8f7215e06 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -444,6 +444,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, goto cleanup; } + tmpIfname++; cmd = virCommandNew(OVSVSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "get", "Interface", tmpIfname, "name", NULL); -- 2.13.0

1 0

[libvirt] [PATCHv3 00/14] Allow virtio devices to use vIOMMU
by Ján Tomko 08 Jun '17

08 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1283251 new in v3: * eliminated multi-word attribute names * eliminated extra virBufferTrims * added ABI stability checks * post-parse checks for non-virtio disks and nets * removed duplicate devices from the test file Ján Tomko (14): conf: add iotlb attribute to iommu qemu: format device-iotlb on intel-iommu command line qemuxml2xmltest: add virtio-options test conf: use a leading space in virDomainVirtioNetDriverFormat Add virtio-related options to interfaces add virtio-related options to memballoon Add virtio-related options to disks Add virtio-related options to controllers Add virtio-related options to filesystems Add virtio-related options to rng devices Add virtio-related options to video Add virtio-related options to input devices qemuxml2argvtest: add virtio-options test case qemu: format virtio-related options on the command line docs/formatdomain.html.in | 82 ++++++ docs/schemas/domaincommon.rng | 40 +++ src/conf/domain_conf.c | 283 ++++++++++++++++++++- src/conf/domain_conf.h | 18 ++ src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 69 +++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-intel-iommu-device-iotlb.args | 19 ++ .../qemuxml2argv-intel-iommu-device-iotlb.xml | 31 +++ .../qemuxml2argv-virtio-options.args | 50 ++++ .../qemuxml2argv-virtio-options.xml | 92 +++++++ tests/qemuxml2argvtest.c | 18 ++ .../qemuxml2xmlout-intel-iommu-device-iotlb.xml | 1 + .../qemuxml2xmlout-virtio-options.xml | 1 + tests/qemuxml2xmltest.c | 2 + 16 files changed, 715 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml -- 2.10.2

2 22

[libvirt] [PATCH 0/2] Two vhostuser improvements
by Michal Privoznik 08 Jun '17

08 Jun '17

*** BLURB HERE *** Michal Privoznik (2): virsh: Accept iface alias for domifstats too qemu: Query for vhostuser iface names at runtime src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_domain.c | 20 ++++--------- src/qemu/qemu_driver.c | 6 ++-- src/util/virnetdevopenvswitch.c | 1 + tests/Makefile.am | 7 ----- tests/qemuxml2xmlmock.c | 33 ---------------------- .../qemuxml2xmlout-net-vhostuser.xml | 2 -- tests/qemuxml2xmltest.c | 2 +- tools/virsh-domain-monitor.c | 3 +- 9 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 tests/qemuxml2xmlmock.c -- 2.13.0

2 4

[libvirt] [PATCH go-xml] Add support for Node Device with basic testing.
by Vladik Romanovsky 07 Jun '17

07 Jun '17

--- node_device.go | 310 +++++++++++++++++++++++++++++++++++++++++++++++ node_device_test.go | 337 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 647 insertions(+) create mode 100644 node_device.go create mode 100644 node_device_test.go diff --git a/node_device.go b/node_device.go new file mode 100644 index 0000000..cc40451 --- /dev/null +++ b/node_device.go @@ -0,0 +1,310 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" +) + +type NodeDevice struct { + Name string `xml:"name"` + Path string `xml:"path,omitempty"` + Parent string `xml:"parent,omitempty"` + Driver string `xml:"driver>name,omitempty"` + Capability interface{} `xml:"capability"` +} + +type NodeDeviceVendor struct { + ID string `xml:"id,attr,omitempty"` + Name string `xml:",chardata"` +} +type NodeDeviceProduct struct { + ID string `xml:"id,attr,omitempty"` + Name string `xml:",chardata"` +} + +type NodeDevicePciExpress struct { + Links []NodeDevicePciExpressLink `xml:"link"` +} + +type NodeDevicePciExpressLink struct { + Validity string `xml:"validity,attr,omitempty"` + Speed float64 `xml:"speed,attr,omitempty"` + Port int `xml:"port,attr,omitempty"` + Width int `xml:"width,attr,omitempty"` +} + +type NodeDeviceIOMMUGroup struct { + Number int `xml:"number,attr"` +} + +type NodeDeviceNUMA struct { + Node int `xml:"node,attr"` +} + +type NodeDevicePCIAddress struct { + Domain string `xml:"domain,attr"` + Bus string `xml:"bus,attr"` + Slot string `xml:"slot,attr"` + Function string `xml:"function,attr"` +} + +type NodeDeviceSystemHardware struct { + Vendor string `xml:"vendor"` + Version string `xml:"version"` + Serial string `xml:"serial"` + UUID string `xml:"uuid"` +} + +type NodeDeviceSystemFirmware struct { + Vendor string `xml:"vendor"` + Version string `xml:"version"` + ReleaseDate string `xml:"release_date"` +} + +type NodeDeviceNetOffloadFeatures struct { + Name string `xml:"name,attr"` +} + +type NodeDeviceNetLink struct { + State string `xml:"state,attr"` + Speed string `xml:"speed,attr,omitempty"` +} + +type NodeDevicePciCapability struct { + Domain int `xml:"domain,omitempty"` + Bus int `xml:"bus,omitempty"` + Slot int `xml:"slot,omitempty"` + Function int `xml:"function,omitempty"` + Product *NodeDeviceProduct `xml:"product,omitempty"` + Vendor *NodeDeviceVendor `xml:"vendor,omitempty"` + IommuGroup *NodeDeviceIOMMUGroup `xml:"iommuGroup,omitempty"` + Numa *NodeDeviceNUMA `xml:"numa,omitempty"` + PciExpress *NodeDevicePciExpress `xml:"pci-express,omitempty"` + Capability []NodeDeviceNestedPciCapability `xml:"capability,omitempty"` +} + +type NodeDeviceNestedPciCapability struct { + Type string `xml:"type,attr"` + Address []NodeDevicePCIAddress `xml:"address,omitempty"` + MaxCount int `xml:"maxCount,attr,omitempty"` +} + +type NodeDeviceSystemCapability struct { + Product string `xml:"product"` + Hardware *NodeDeviceSystemHardware `xml:"hardware"` + Firmware *NodeDeviceSystemFirmware `xml:"firmware"` +} + +type NodeDeviceUSBDeviceCapability struct { + Bus int `xml:"bus"` + Device int `xml:"device"` + Product *NodeDeviceProduct `xml:"product,omitempty"` + Vendor *NodeDeviceVendor `xml:"vendor,omitempty"` +} + +type NodeDeviceUSBCapability struct { + Number int `xml:"number"` + Class int `xml:"class"` + Subclass int `xml:"subclass"` + Protocol int `xml:"protocol"` + Description string `xml:"description,omitempty"` +} + +type NodeDeviceNetCapability struct { + Interface string `xml:"interface"` + Address string `xml:"address"` + Link *NodeDeviceNetLink `xml:"link"` + Features []NodeDeviceNetOffloadFeatures `xml:"feature,omitempty"` + Capability *NodeDeviceNestedNetCapability `xml:"capability"` +} + +type NodeDeviceNestedNetCapability struct { + Type string `xml:"type,attr"` +} + +type NodeDeviceSCSIHostCapability struct { + Host int `xml:"host"` + UniqueID int `xml:"unique_id"` + Capability []NodeDeviceNestedSCSIHostCapability `xml:"capability"` +} + +type NodeDeviceNestedSCSIHostCapability struct { + Type string `xml:"type,attr"` + Vports int `xml:"vports,omitempty"` + MaxVports int `xml:"maxvports,,omitempty"` + WWNN string `xml:"wwnn,omitempty"` + WWPN string `xml:"wwpn,omitempty"` + FabricWWN string `xml:"fabric_wwn,omitempty"` +} + +type NodeDeviceSCSICapability struct { + Host int `xml:"host"` + Bus int `xml:"bus"` + Target int `xml:"target"` + Lun int `xml:"lun"` + Type string `xml:"type"` +} + +type NodeDeviceNestedStorageCapability struct { + Type string `xml:"type,attr"` + MediaAvailable int `xml:"media_available,omitempty"` + MediaSize int `xml:"media_size,omitempty"` + MediaLable int `xml:"media_label,omitempty"` +} + +type NodeDeviceStorageCapability struct { + Block string `xml:"block"` + Bus string `xml:"bus"` + DriverType string `xml:"drive_type"` + Model string `xml:"model"` + Vendor string `xml:"vendor"` + Serial string `xml:"serial,omitempty"` + Size int `xml:"size,omitempty"` + Capability *NodeDeviceNestedStorageCapability `xml:"capability,omitempty"` +} + +type NodeDeviceDRMCapability struct { + Type string `xml:"type"` +} + +func (c *NodeDevice) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + + for { + t, err := d.Token() + if err != nil { + return err + } + switch token := t.(type) { + case xml.StartElement: + switch token.Name.Local { + case "name": + var content string + if err := d.DecodeElement(&content, &start); err != nil { + return err + } + c.Name = content + case "path": + var content string + if err := d.DecodeElement(&content, &start); err != nil { + return err + } + c.Path = content + case "parent": + var content string + if err := d.DecodeElement(&content, &start); err != nil { + return err + } + c.Parent = content + case "driver": + tmp := struct { + Name string `xml:"name"` + }{} + if err := d.DecodeElement(&tmp, &token); err != nil { + return err + } + c.Driver = tmp.Name + case "capability": + for _, attr := range token.Attr { + if attr.Name.Local == "type" { + switch attr.Value { + case "pci": + var pciCaps NodeDevicePciCapability + if err := d.DecodeElement(&pciCaps, &token); err != nil { + return err + } + c.Capability = pciCaps + case "system": + var systemCaps NodeDeviceSystemCapability + if err := d.DecodeElement(&systemCaps, &token); err != nil { + return err + } + c.Capability = systemCaps + case "usb_device": + var usbdevCaps NodeDeviceUSBDeviceCapability + if err := d.DecodeElement(&usbdevCaps, &token); err != nil { + return err + } + c.Capability = usbdevCaps + case "usb": + var usbCaps NodeDeviceUSBCapability + if err := d.DecodeElement(&usbCaps, &token); err != nil { + return err + } + c.Capability = usbCaps + case "net": + var netCaps NodeDeviceNetCapability + if err := d.DecodeElement(&netCaps, &token); err != nil { + return err + } + c.Capability = netCaps + case "scsi_host": + var scsiHostCaps NodeDeviceSCSIHostCapability + if err := d.DecodeElement(&scsiHostCaps, &token); err != nil { + return err + } + c.Capability = scsiHostCaps + case "scsi": + var scsiCaps NodeDeviceSCSICapability + if err := d.DecodeElement(&scsiCaps, &token); err != nil { + return err + } + c.Capability = scsiCaps + case "storage": + var storageCaps NodeDeviceStorageCapability + if err := d.DecodeElement(&storageCaps, &token); err != nil { + return err + } + c.Capability = storageCaps + case "drm": + var drmCaps NodeDeviceDRMCapability + if err := d.DecodeElement(&drmCaps, &token); err != nil { + return err + } + c.Capability = drmCaps + } + } + } + } + case xml.EndElement: + return nil + } + } + + return nil +} + +func (c *NodeDevice) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), c) +} + +func (c *NodeDevice) Marshal() (string, error) { + doc, err := xml.MarshalIndent(c, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/node_device_test.go b/node_device_test.go new file mode 100644 index 0000000..a9f939e --- /dev/null +++ b/node_device_test.go @@ -0,0 +1,337 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "reflect" + "strings" + "testing" +) + +var NodeDeviceTestData = []struct { + Object *NodeDevice + XML []string +}{ + { + Object: &NodeDevice{ + Name: "pci_0000_81_00_0", + Parent: "pci_0000_80_01_0", + Driver: "ixgbe", + Capability: NodeDevicePciCapability{ + Domain: 1, + Bus: 21, + Slot: 10, + Function: 50, + Product: &NodeDeviceProduct{ + ID: "0x1528", + Name: "Ethernet Controller 10-Gigabit X540-AT2", + }, + Vendor: &NodeDeviceVendor{ + ID: "0x8086", + Name: "Intel Corporation", + }, + IommuGroup: &NodeDeviceIOMMUGroup{ + Number: 3, + }, + Numa: &NodeDeviceNUMA{ + Node: 1, + }, + Capability: []NodeDeviceNestedPciCapability{ + NodeDeviceNestedPciCapability{ + Type: "virt_functions", + Address: []NodeDevicePCIAddress{ + NodeDevicePCIAddress{ + Domain: "0x0000", + Bus: "0x81", + Slot: "0x10", + Function: "0x1", + }, + NodeDevicePCIAddress{ + Domain: "0x0000", + Bus: "0x81", + Slot: "0x10", + Function: "0x3", + }, + }, + MaxCount: 63, + }, + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>pci_0000_81_00_0</name>`, + ` <parent>pci_0000_80_01_0</parent>`, + ` <driver>`, + ` <name>ixgbe</name>`, + ` </driver>`, + ` <capability type='pci'>`, + ` <domain>1</domain>`, + ` <bus>21</bus>`, + ` <slot>10</slot>`, + ` <function>50</function>`, + ` <product id='0x1528'>Ethernet Controller 10-Gigabit X540-AT2</product>`, + ` <vendor id='0x8086'>Intel Corporation</vendor>`, + ` <capability type='virt_functions' maxCount='63'>`, + ` <address domain='0x0000' bus='0x81' slot='0x10' function='0x1'/>`, + ` <address domain='0x0000' bus='0x81' slot='0x10' function='0x3'/>`, + ` </capability>`, + ` <iommuGroup number='3'>`, + ` <address domain='0x0000' bus='0x15' slot='0x00' function='0x4'/>`, + ` </iommuGroup>`, + ` <numa node='1'/>`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "pci_10df_fe00_0_scsi_host", + Parent: "pci_10df_fe00_0", + Capability: NodeDeviceSCSIHostCapability{ + Host: 4, + Capability: []NodeDeviceNestedSCSIHostCapability{ + NodeDeviceNestedSCSIHostCapability{ + Type: "fc_host", + WWNN: "20000000c9848141", + WWPN: "10000000c9848141", + }, + NodeDeviceNestedSCSIHostCapability{ + Type: "vport_ops", + }, + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>pci_10df_fe00_0_scsi_host</name>`, + ` <parent>pci_10df_fe00_0</parent>`, + ` <capability type='scsi_host'>`, + ` <host>4</host>`, + ` <capability type='fc_host'>`, + ` <wwnn>20000000c9848141</wwnn>`, + ` <wwpn>10000000c9848141</wwpn>`, + ` </capability>`, + ` <capability type='vport_ops' />`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "computer", + Capability: NodeDeviceSystemCapability{ + Hardware: &NodeDeviceSystemHardware{ + Vendor: "LENOVO", + Version: "ThinkPad T61", + Serial: "L3B2616", + UUID: "97e80381-494f-11cb-8e0e-cbc168f7d753", + }, + Firmware: &NodeDeviceSystemFirmware{ + Vendor: "LENOVO", + Version: "7LET51WW (1.21 )", + ReleaseDate: "08/22/2007", + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>computer</name>`, + ` <capability type='system'>`, + ` <hardware>`, + ` <vendor>LENOVO</vendor>`, + ` <version>ThinkPad T61</version>`, + ` <serial>L3B2616</serial>`, + ` <uuid>97e80381-494f-11cb-8e0e-cbc168f7d753</uuid>`, + ` </hardware>`, + ` <firmware>`, + ` <vendor>LENOVO</vendor>`, + ` <version>7LET51WW (1.21 )</version>`, + ` <release_date>08/22/2007</release_date>`, + ` </firmware>`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "usb_device_1d6b_1_0000_00_1a_0", + Parent: "pci_8086_2834", + Driver: "usb", + Capability: NodeDeviceUSBDeviceCapability{ + Bus: 3, + Device: 1, + Product: &NodeDeviceProduct{ + ID: "0x0001", + Name: "1.1 root hub", + }, + Vendor: &NodeDeviceVendor{ + ID: "0x1d6b", + Name: "Linux Foundation", + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>usb_device_1d6b_1_0000_00_1a_0</name>`, + ` <parent>pci_8086_2834</parent>`, + ` <driver>`, + ` <name>usb</name>`, + ` </driver>`, + ` <capability type='usb_device'>`, + ` <bus>3</bus>`, + ` <device>1</device>`, + ` <product id='0x0001'>1.1 root hub</product>`, + ` <vendor id='0x1d6b'>Linux Foundation</vendor>`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "usb_device_1d6b_1_0000_00_1a_0_if0", + Parent: "usb_device_1d6b_1_0000_00_1a_0", + Driver: "hub", + Capability: NodeDeviceUSBCapability{ + Number: 0, + Class: 9, + Subclass:0, + Protocol: 0, + }, + }, + XML: []string{ + `<device>`, + ` <name>usb_device_1d6b_1_0000_00_1a_0_if0</name>`, + ` <parent>usb_device_1d6b_1_0000_00_1a_0</parent>`, + ` <driver>`, + ` <name>hub</name>`, + ` </driver>`, + ` <capability type='usb'>`, + ` <number>0</number>`, + ` <class>9</class>`, + ` <subclass>0</subclass>`, + ` <protocol>0</protocol>`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "net_wlp3s0_4c_eb_42_aa_aa_82", + Path: "/sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlp3s0", + Parent: "pci_0000_03_00_0", + Capability: NodeDeviceNetCapability{ + Interface: "wlp3s0", + Address: "4c:eb:42:aa:aa:82", + Link: &NodeDeviceNetLink{ + State: "up", + }, + Features: []NodeDeviceNetOffloadFeatures{ + NodeDeviceNetOffloadFeatures{ + Name: "sg", + }, + NodeDeviceNetOffloadFeatures{ + Name: "gso", + }, + NodeDeviceNetOffloadFeatures{ + Name: "gro", + }, + }, + Capability: &NodeDeviceNestedNetCapability{ + Type: "80211", + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>net_wlp3s0_4c_eb_42_aa_aa_82</name>`, + ` <path>/sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlp3s0</path>`, + ` <parent>pci_0000_03_00_0</parent>`, + ` <capability type='net'>`, + ` <interface>wlp3s0</interface>`, + ` <address>4c:eb:42:aa:aa:82</address>`, + ` <link state='up'/>`, + ` <feature name='sg'/>`, + ` <feature name='gso'/>`, + ` <feature name='gro'/>`, + ` <capability type='80211'/>`, + ` </capability>`, + `</device>`, + }, + }, + { + Object: &NodeDevice{ + Name: "storage_model_DVDRAM_GSA_U10N", + Parent: "pci_8086_2850_scsi_host_scsi_device_lun0", + Capability: NodeDeviceStorageCapability{ + Block: "/dev/sr1", + Bus: "pci", + DriverType: "cdrom", + Model:"DVDRAM GSA-U10N", + Vendor: "HL-DT-ST", + Capability: &NodeDeviceNestedStorageCapability{ + Type: "removable", + MediaAvailable: 0, + MediaSize: 0, + }, + }, + }, + XML: []string{ + `<device>`, + ` <name>storage_model_DVDRAM_GSA_U10N</name>`, + ` <parent>pci_8086_2850_scsi_host_scsi_device_lun0</parent>`, + ` <capability type='storage'>`, + ` <block>/dev/sr1</block>`, + ` <bus>pci</bus>`, + ` <drive_type>cdrom</drive_type>`, + ` <model>DVDRAM GSA-U10N</model>`, + ` <vendor>HL-DT-ST</vendor>`, + ` <capability type='removable'>`, + ` <media_available>0</media_available>`, + ` <media_size>0</media_size>`, + ` </capability>`, + ` </capability>`, + `</device>`, + }, + }, + +} + +func TestNodeDevice(t *testing.T) { + for _, test := range NodeDeviceTestData { + xmlDoc := strings.Join(test.XML, "\n") + nodeDevice := NodeDevice{} + err := nodeDevice.Unmarshal(xmlDoc) + if err != nil { + t.Fatal(err) + } + + res := reflect.DeepEqual(&nodeDevice, test.Object) + if !res { + t.Fatal("Bad NodeDevice object creation.", "\nExpected: ", test.Object, "\nActual: ", nodeDevice) + } + } +} -- 2.9.4

1 0

[libvirt] [PATCH] virFDStreamThread: Make sure we won't exceed @length
by Michal Privoznik 07 Jun '17

07 Jun '17

There's a problem with current streams after I switched them from iohelper to thread implementation. Previously, iohelper made sure not to exceed specified @length resulting in the pipe EOF appearing at the exact right moment (the pipe was used to tunnel the data from the iohelper to the daemon). Anyway, when switching to thread I had to write the I/O code from scratch. Whilst doing that I took an inspiration from the iohelper code, but since the usage of pipe switched to slightly different meaning, there was no 1:1 relationship between the codes. Moreover, after introducing VIR_FDSTREAM_MSG_TYPE_HOLE, the condition that should made sure we won't exceed @length was completely wrong. The fix is to: a) account for holes for @length b) cap not just data sections but holes too (if @length would be exceeded) For this purpose, the condition needs to be brought closer to the code that handles holes and data sections. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfdstream.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 7ee58be13..ae6f78e01 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -420,6 +420,8 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst, const int fdout, const char *fdinname, const char *fdoutname, + size_t length, + size_t total, size_t *dataLen, size_t buflen) { @@ -433,10 +435,18 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst, if (virFileInData(fdin, &inData, &sectionLen) < 0) goto error; + if (length && + sectionLen > length - total) + sectionLen = length - total; + if (inData) *dataLen = sectionLen; } + if (length && + buflen > length - total) + buflen = length - total; + if (VIR_ALLOC(msg) < 0) goto error; @@ -578,13 +588,6 @@ virFDStreamThread(void *opaque) while (1) { ssize_t got; - if (length && - (length - total) < buflen) - buflen = length - total; - - if (buflen == 0) - break; /* End of requested data from client */ - while (doRead == (fdst->msg != NULL) && !fdst->threadQuit) { if (virCondWait(&fdst->threadCond, &fdst->parent.lock)) { @@ -608,6 +611,7 @@ virFDStreamThread(void *opaque) got = virFDStreamThreadDoRead(fdst, sparse, fdin, fdout, fdinname, fdoutname, + length, total, &dataLen, buflen); else got = virFDStreamThreadDoWrite(fdst, sparse, -- 2.13.0

3 4

[libvirt] [PATCH] virNetClientStreamQueuePacket: Set st->incomingEOF on the end of stream
by Michal Privoznik 07 Jun '17

07 Jun '17

While reworking client side of streams, I had to postpone payload decoding so that stream holes and stream data can be distinguished in virNetClientStreamRecvPacket. That's merely what 18944b7aea46d does. However, I accidentally removed one important bit: when server sends us an empty STREAM packet (with no payload) - meaning end of stream - st->incomingEOF flag needs to be set. It used to be before I touched the code. After I removed it, virNetClientStreamRecvPacket will try to fetch more data from the stream, but it will never come. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Thanks to Martin who helped me debug this. src/rpc/virnetclientstream.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index a9bf271dc..54729c84f 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -278,6 +278,15 @@ int virNetClientStreamQueuePacket(virNetClientStreamPtr st, VIR_DEBUG("Incoming stream message: stream=%p message=%p", st, msg); + if (msg->bufferLength == msg->bufferOffset) { + /* No payload means end of the stream. */ + virObjectLock(st); + st->incomingEOF = true; + virNetClientStreamEventTimerUpdate(st); + virObjectUnlock(st); + return 0; + } + /* Unfortunately, we must allocate new message as the one we * get in @msg is going to be cleared later in the process. */ -- 2.13.0

2 2

[libvirt] [PATCH] virDomainNetDefParseXML: Fix typo
by Michal Privoznik 07 Jun '17

07 Jun '17

In 9cb891141c we've introduced some logic to clearing suggested macvtap/macvlan ifnames. The logic consists of comparing ifname string with strings that libvirt would generate. However, due to a typo only VIR_NET_GENERATED_MACVTAP_PREFIX was compared. Twice. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e2e7334a..3e884225b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10074,7 +10074,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (ifname && flags & VIR_DOMAIN_DEF_PARSE_INACTIVE && (STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) || - STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX))) { + STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX))) { VIR_FREE(ifname); } -- 2.13.0

1 0

[libvirt] [PATCHv2 00/15] Allow virtio devices to use vIOMMU
by Ján Tomko 07 Jun '17

07 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1283251 Ján Tomko (15): conf: eliminate monster condition in virDomainControllerDefFormat virDomainControllerDefFormat: do not mix attributes and subelements conf: add device_iotlb attribute to iommu qemu: format device-iotlb on intel-iommu command line qemuxml2xmltest: add virtio-options test Add virtio-related options to interfaces add virtio-related options to memballoon Add virtio-related options to disks Add virtio-related options to controllers Add virtio-related options to filesystems Add virtio-related options to rng devices Add virtio-related options to video Add virtio-related options to input devices qemuxml2argvtest: add virtio-options test case qemu: format virtio-related options on the command line docs/formatdomain.html.in | 87 ++++++++ docs/schemas/domaincommon.rng | 40 ++++ src/conf/domain_conf.c | 224 ++++++++++++++++++--- src/conf/domain_conf.h | 27 +++ src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 69 +++++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-intel-iommu-device-iotlb.args | 19 ++ .../qemuxml2argv-intel-iommu-device-iotlb.xml | 31 +++ .../qemuxml2argv-virtio-options.args | 57 ++++++ .../qemuxml2argv-virtio-options.xml | 104 ++++++++++ tests/qemuxml2argvtest.c | 18 ++ .../qemuxml2xmlout-intel-iommu-device-iotlb.xml | 1 + .../qemuxml2xmlout-virtio-options.xml | 104 ++++++++++ tests/qemuxml2xmltest.c | 2 + 16 files changed, 772 insertions(+), 34 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-device-iotlb.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml -- 2.10.2

2 33

[libvirt] Remotable Libvirt
by Peter 07 Jun '17

07 Jun '17

Hi Everyone, We are working towards building on the virtualization management functionality in cockpit (http://cockpit-project.org/) and wanted to get some feedback on the best way to integrate with libvirt. As a quick overview, cockpit aims to talk to existing remotable system APIs. Usually these API’s take the form of dbus, REST or executable commands. The majority of cockpit is implemented in javascript. There is no cockpit backend that knows how to change a hostname for example. The cockpit backend knows how to handle a dbus payload. The javascript running in the users browser knows how to use the systemd dbus API at org.freedesktop.hostname1 to manage the system hostname. Right now some of the basics have been implemented by spawning commands on the system. This isn't ideal because it involves parsing / screen scraping output and doesn't support receiving events so we have to poll (ei run the command again) to keep the UI up to date. As far as I know libvirt doesn't currently have a remoteable API. It does have a daemon that communicates with clients via a XDR RPC. (https://libvirt.org/internals/rpc.html) However from what I'm hearing the RPC is considered an internal implementation and shouldn't be used by external applications. Is that still the case? Is there any chance of getting talking the daemon directly using the XDR standard for a subset of methods blessed as part of the externally supported API? An alternative is to implement a standards based remotable API, using something like dbus or REST, that can be used by external applications. I imagine that this would be at a bit of a higher level than the current RPC and contain at least some of the logic around the actions it performs rather than being a direct passthrough to the daemon. Of course that is a pretty big undertaking and would, in my opinion, only be worth it if there is broader interest in the community and use cases beyond what cockpit would like to.

10 23

[libvirt] [PATCH v2] qemu: Fix serial stub console allocation
by Erik Skultety 07 Jun '17

07 Jun '17

When adding the aliased serial stub console, the structure wasn't properly allocated (VIR_ALLOC instead of virDomainChrDefNew) which then resulted in SIGSEGV in virDomainChrSourceIsEqual during a serial device coldplug. https://bugzilla.redhat.com/show_bug.cgi?id=1434278 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_hotplug.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a7d99725..6701bd9bc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1802,15 +1802,17 @@ qemuDomainChrPreInsert(virDomainDefPtr vmdef, if (virDomainChrPreAlloc(vmdef, chr) < 0) return -1; - /* Due to some crazy backcompat stuff, the first serial device is an alias - * to the first console too. If this is the case, the definition must be - * duplicated as first console device. */ + /* Due to historical reasons, the first console is an alias to the + * first serial device (if such exists). If this is the case, we need to + * create an object for the first console as well. + */ if (vmdef->nserials == 0 && vmdef->nconsoles == 0 && chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { if (!vmdef->consoles && VIR_ALLOC(vmdef->consoles) < 0) return -1; - if (VIR_ALLOC(vmdef->consoles[0]) < 0) { + /* We'll be dealing with serials[0] directly, so NULL is fine here. */ + if (!(vmdef->consoles[0] = virDomainChrDefNew(NULL))) { VIR_FREE(vmdef->consoles); return -1; } @@ -1841,7 +1843,7 @@ qemuDomainChrInsertPreAllocCleanup(virDomainDefPtr vmdef, /* Remove the stub console added by qemuDomainChrPreInsert */ if (vmdef->nserials == 0 && vmdef->nconsoles == 1 && chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { - VIR_FREE(vmdef->consoles[0]); + virDomainChrDefFree(vmdef->consoles[0]); VIR_FREE(vmdef->consoles); vmdef->nconsoles = 0; } -- 2.13.0

2 2

[libvirt] [PATCH v2 00/20] Fix regression caused by recent CPU driver changes
by Jiri Denemark 07 Jun '17

07 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1441662 when I was enhancing libvirt's guest CPU configuration code to be able to really ensure stable guest CPU ABI, I added a new attribute //cpu/@check which is nicely backward compatible... an old libvirt will just ignore it. However, even if check='full' will be ignored, an old libvirt will still see the updated CPU definition (features added or removed by the hypervisor will be shown there). And because we need QEMU 2.9.0 to check what features are going to be added or removed before we actually start the domain, migrating such domain to an older libvirt or QEMU may fail if QEMU enables a feature which is not supported by the host CPU. Known features causing problems are, e.g., x2apic, hypervisor, and arat. To make things even worse, updating a CPU definition with the automatically added/removed features can be done since QEMU 1.5.0. Even save/restore or snapshot revert on a single host running new libvirt and QEMU < 2.9.0 is now affected by this regression. This series fixes the regression by storing the original guest CPU definition in migratable XML and sending the updated CPU in a side channel (a migration or save cookie). Version 2: - see individual patches for changes Jiri Denemark (20): conf: Make error reporting in virCPUDefIsEqual optional conf: Refactor virCPUDefParseXML conf: Make virDomainSnapshotDefFormat easier to read conf: Pass xmlopt to virDomainSnapshotDefFormat qemu: Rename xml_len in virQEMUSaveHeader as data_len qemu: Fix memory leaks in qemuDomainSaveImageOpen qemu: Introduce virQEMUSaveData{New,Free} qemu: Introduce virQEMUSaveDataFinish qemu: Refactor qemuDomainSaveHeader qemu: Introduce virQEMUSaveData structure conf: Introduce virSaveCookie conf: Add save cookie callbacks to xmlopt qemu: Implement virSaveCookie object and callbacks qemu: Store save cookie in save images and snapshots qemu: Remember CPU def from domain start qemu: Report the original CPU in migratable xml qemu: Always send persistent XML during migration qemu: Send updated CPU in migration cookie qemu: Store updated CPU in save cookie qemu: Use updated CPU when starting QEMU if possible docs/formatsnapshot.html.in | 6 + docs/schemas/domainsnapshot.rng | 7 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/bhyve/bhyve_domain.c | 2 +- src/conf/cpu_conf.c | 192 ++++++++-------- src/conf/cpu_conf.h | 12 +- src/conf/domain_conf.c | 30 ++- src/conf/domain_conf.h | 7 +- src/conf/snapshot_conf.c | 40 +++- src/conf/snapshot_conf.h | 3 + src/conf/virsavecookie.c | 144 ++++++++++++ src/conf/virsavecookie.h | 62 +++++ src/cpu/cpu.c | 5 +- src/esx/esx_driver.c | 2 +- src/libvirt_private.syms | 10 + src/libxl/libxl_conf.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 207 +++++++++++++++-- src/qemu/qemu_domain.h | 22 ++ src/qemu/qemu_driver.c | 468 ++++++++++++++++++++++++++------------ src/qemu/qemu_migration.c | 18 +- src/qemu/qemu_migration_cookie.c | 31 ++- src/qemu/qemu_migration_cookie.h | 5 + src/qemu/qemu_process.c | 37 ++- src/qemu/qemu_process.h | 2 + src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 3 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 3 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 3 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/cputest.c | 5 +- tests/domainsnapshotxml2xmltest.c | 1 + tests/testutils.c | 2 +- 43 files changed, 1047 insertions(+), 315 deletions(-) create mode 100644 src/conf/virsavecookie.c create mode 100644 src/conf/virsavecookie.h -- 2.13.0

2 30

[libvirt] [PATCH go-xml] 1,rename DomainInterfaceBoot to DomainDeviceBoot; 2,support disk boot order
by zhenwei.pi 07 Jun '17

07 Jun '17

--- domain.go | 5 +++-- domain_test.go | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/domain.go b/domain.go index 1d91dc3..7d8f6d6 100644 --- a/domain.go +++ b/domain.go @@ -98,6 +98,7 @@ type DomainDisk struct { ReadOnly *DomainDiskReadOnly `xml:"readonly"` Shareable *DomainDiskShareable `xml:"shareable"` Address *DomainAddress `xml:"address"` + Boot *DomainDeviceBoot `xml:"boot"` } type DomainFilesystemDriver struct { @@ -171,7 +172,7 @@ type DomainInterfaceLink struct { State string `xml:"state,attr"` } -type DomainInterfaceBoot struct { +type DomainDeviceBoot struct { Order uint `xml:"order,attr"` } @@ -193,7 +194,7 @@ type DomainInterface struct { Target *DomainInterfaceTarget `xml:"target"` Alias *DomainInterfaceAlias `xml:"alias"` Link *DomainInterfaceLink `xml:"link"` - Boot *DomainInterfaceBoot `xml:"boot"` + Boot *DomainDeviceBoot `xml:"boot"` Script *DomainInterfaceScript `xml:"script"` Driver *DomainInterfaceDriver `xml:"driver"` Address *DomainAddress `xml:"address"` diff --git a/domain_test.go b/domain_test.go index b83d4ae..3d015c7 100644 --- a/domain_test.go +++ b/domain_test.go @@ -87,6 +87,9 @@ var domainTestData = []struct { Bus: "virtio", }, Serial: "fishfood", + Boot: &DomainDeviceBoot{ + Order: 1, + }, }, DomainDisk{ Type: "block", @@ -189,6 +192,7 @@ var domainTestData = []struct { ` <source file="/var/lib/libvirt/images/demo.qcow2"></source>`, ` <target dev="vda" bus="virtio"></target>`, ` <serial>fishfood</serial>`, + ` <boot order="1"></boot>`, ` </disk>`, ` <disk type="block" device="disk">`, ` <driver name="qemu" type="raw"></driver>`, @@ -710,7 +714,7 @@ var domainTestData = []struct { Link: &DomainInterfaceLink{ State: "up", }, - Boot: &DomainInterfaceBoot{ + Boot: &DomainDeviceBoot{ Order: 1, }, Driver: &DomainInterfaceDriver{ -- 2.7.4

2 1

[libvirt] libvirt binding for Rust
by Sahid Orentino Ferdjaoui 07 Jun '17

07 Jun '17

Hello, I started a work on a libvirt binding for Rust [0]. Not all of the API is implemeted but I think it's now in a usable state. https://docs.rs/crate/virt https://github.com/sahid/libvirt-rs The code is licensed under LGPL-2.1, it's tested by a CI running libvirt 1.2.0, 2.5.0, 3.3.0. There are unit tests, integration tests and some examples to exercise the code (some parts are still not covered) I also have checked the code with valgrind to avoid any memory leaks. https://travis-ci.org/sahid/libvirt-rs Do you think that we can consider it ready to be hosted by libvirt.org GIT server ? That could help to get new contributors also interested by Rust and improve the code and coverage of the API. Thanks, s.

3 4

[libvirt] More CI options
by Martin Kletzander 07 Jun '17

07 Jun '17

Since the addition of Travis CI builds, there is some more progress towards more testing. I was just wondering if anyone was thinking about (or is already working on) some settings for other CI environments as well. For example if configured AppVeyor, we could have MSVC builds as well. And there are more of those, I didn't compare all of them, but the more environments we have, the more build failures we might catch. Or even test failures, maybe. Martin

2 3

[libvirt] [PATCH 0/2] qemu: Allow block-copy for persistent VMs under same conditions as for transient
by Peter Krempa 07 Jun '17

07 Jun '17

Peter Krempa (2): qemu: Conditionally allow block-copy for persistent domains virsh: Add support for VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB include/libvirt/libvirt-domain.h | 3 +++ src/libvirt-domain.c | 3 +++ src/qemu/qemu_driver.c | 9 ++++++--- tools/virsh-domain.c | 10 +++++++++- tools/virsh.pod | 4 ++++ 5 files changed, 25 insertions(+), 4 deletions(-) -- 2.12.2

2 4

[libvirt] [PATCH 00/15] Fix regression caused by recent CPU driver changes
by Jiri Denemark 07 Jun '17

07 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1441662 when I was enhancing libvirt's guest CPU configuration code to be able to really ensure stable guest CPU ABI, I added a new attribute //cpu/@check which is nicely backward compatible... an old libvirt will just ignore it. However, even if check='full' will be ignored, an old libvirt will still see the updated CPU definition (features added or removed by the hypervisor will be shown there). And because we need QEMU 2.9.0 to check what features are going to be added or removed before we actually start the domain, migrating such domain to an older libvirt or QEMU may fail if QEMU enables a feature which is not supported by the host CPU. Known features causing problems are, e.g., x2apic, hypervisor, and arat. To make things even worse, updating a CPU definition with the automatically added/removed features can be done since QEMU 1.5.0. Even save/restore or snapshot revert on a single host running new libvirt and QEMU < 2.9.0 is now affected by this regression. This series fixes the regression by storing the original guest CPU definition in migratable XML and sending the updated CPU in a side channel (a migration or save cookie). Jiri Denemark (15): conf: Make error reporting in virCPUDefIsEqual optional conf: Refactor virCPUDefParseXML conf: Make virDomainSnapshotDefFormat easier to read conf: Pass xmlopt to virDomainSnapshotDefFormat qemu: Rename xml_len in virQEMUSaveHeader as data_len qemu: Refactor save image header conf: Introduce virSaveCookie conf: Add save cookie callbacks to xmlopt qemu: Implement virSaveCookie object and callbacks qemu: Store save cookie in save images and snapshots qemu: Remember CPU def from domain start qemu: Report the original CPU in migratable xml qemu: Send updated CPU in migration cookie qemu: Store updated CPU in save cookie qemu: Use updated CPU when starting QEMU if possible docs/formatsnapshot.html.in | 6 + docs/schemas/domainsnapshot.rng | 7 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/bhyve/bhyve_domain.c | 2 +- src/conf/cpu_conf.c | 224 +++++++++++-------- src/conf/cpu_conf.h | 12 +- src/conf/domain_conf.c | 30 ++- src/conf/domain_conf.h | 7 +- src/conf/snapshot_conf.c | 40 +++- src/conf/snapshot_conf.h | 3 + src/conf/virsavecookie.c | 144 ++++++++++++ src/conf/virsavecookie.h | 62 +++++ src/cpu/cpu.c | 5 +- src/esx/esx_driver.c | 2 +- src/libvirt_private.syms | 10 + src/libxl/libxl_conf.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 207 +++++++++++++++-- src/qemu/qemu_domain.h | 22 ++ src/qemu/qemu_driver.c | 459 ++++++++++++++++++++++++++------------ src/qemu/qemu_migration.c | 18 +- src/qemu/qemu_migration_cookie.c | 31 ++- src/qemu/qemu_migration_cookie.h | 5 + src/qemu/qemu_process.c | 37 ++- src/qemu/qemu_process.h | 2 + src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 3 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 3 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 3 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/cputest.c | 5 +- tests/domainsnapshotxml2xmltest.c | 1 + tests/testutils.c | 2 +- 43 files changed, 1069 insertions(+), 316 deletions(-) create mode 100644 src/conf/virsavecookie.c create mode 100644 src/conf/virsavecookie.h -- 2.13.0

2 30

[libvirt] [PATCH] qemu: Set operation on completed migration job
by Jiri Denemark 07 Jun '17

07 Jun '17

Without this patch libvirt would just report the operation of a completed job as "unknown" instead of "incoming migration". https://bugzilla.redhat.com/show_bug.cgi?id=1457052 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration_cookie.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 12887892d..559b1f0c1 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1292,6 +1292,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, int cookieinlen, unsigned int flags) { + qemuDomainObjPrivatePtr priv = dom->privateData; qemuMigrationCookiePtr mig = NULL; /* Parse & validate incoming cookie (if any) */ @@ -1340,6 +1341,9 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, } } + if (flags & QEMU_MIGRATION_COOKIE_STATS && mig->jobInfo) + mig->jobInfo->operation = priv->job.current->operation; + return mig; error: -- 2.13.0

2 1

[libvirt] [PATCH] qemu: Starting a domain with custom model and allowed-fallback failed when host lacks some CPU features
by Yi Wang 06 Jun '17

06 Jun '17

An attemp to start a domain requesting a custom CPU model, core2duo, for example, will fail if some feature that the model needs doesn't exist in that host, even though fallback attibute is set allow: "error: the CPU is incompatible with host CPU: Host CPU does not provide required features: monitor" Of course we can start that domain through forbidding that feature, but that may not be flexible. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32ba8e3..1bb65d3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5324,7 +5324,8 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, virCPUCompare(caps->host.arch, virQEMUCapsGetHostModel(qemuCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_FULL), - def->cpu, true) < 0) + def->cpu, + def->cpu->fallback != VIR_CPU_FALLBACK_ALLOW) < 0) return -1; if (virCPUUpdate(def->os.arch, def->cpu, -- 1.8.3.1

3 3

[libvirt] [PATCH] docs: correct improper information about domain states in virsh manpage
by Laine Stump 06 Jun '17

06 Jun '17

Commit 24d4a0a1f removed the non-existent "dying" state from the list of possible domain states given in the virsh manpage, but didn't correct the count of states from 8 down to 7. This patch fixes that mismatch, while wording the sentence in a more readable/truthful manner. --- tools/virsh.pod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index aee9646..611ea88 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -418,8 +418,9 @@ State is the run state (see below). B<STATES> -The State field lists 8 states for a domain, and which ones the -current domain is in. +The State field lists what state each domain is currently in. A domain +can be in one of the following seven possible states: + =over 4 -- 2.9.3

2 1

[libvirt] [libvirt-php PATCH] add API bindings for get/set network autostart
by Dawid Zamirski 06 Jun '17

06 Jun '17

Aside from that: * fix arginfo_libvirt_conn_flags - it has 2 args not 1 * get rid arginfo_libvirt_domain_set_autostart and use arginfo_libvirt_conn_flags instead as it's the same. --- src/libvirt-php.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- src/libvirt-php.h | 2 ++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 99d6397..c2ab0da 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -284,7 +284,7 @@ ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, to) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_flags, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_flags, 0, 0, 2) ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() @@ -399,11 +399,6 @@ ZEND_ARG_INFO(0, res) ZEND_ARG_INFO(0, mac) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_autostart, 0, 0, 2) -ZEND_ARG_INFO(0, conn) -ZEND_ARG_INFO(0, flags) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_metadata, 0, 0, 4) ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, type) @@ -662,7 +657,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_block_info, arginfo_libvirt_domain_get_block_info) PHP_FE(libvirt_domain_get_network_info, arginfo_libvirt_domain_get_network_info) PHP_FE(libvirt_domain_get_autostart, arginfo_libvirt_conn) - PHP_FE(libvirt_domain_set_autostart, arginfo_libvirt_domain_set_autostart) + PHP_FE(libvirt_domain_set_autostart, arginfo_libvirt_conn_flags) PHP_FE(libvirt_domain_get_metadata, arginfo_libvirt_domain_get_metadata) PHP_FE(libvirt_domain_set_metadata, arginfo_libvirt_domain_set_metadata) PHP_FE(libvirt_domain_is_active, arginfo_libvirt_conn) @@ -724,6 +719,8 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_network_get_uuid_string, arginfo_libvirt_conn) PHP_FE(libvirt_network_get_uuid, arginfo_libvirt_conn) PHP_FE(libvirt_network_get_name, arginfo_libvirt_conn) + PHP_FE(libvirt_network_get_autostart, arginfo_libvirt_conn) + PHP_FE(libvirt_network_set_autostart, arginfo_libvirt_conn_flags) /* Node functions */ PHP_FE(libvirt_node_get_info, arginfo_libvirt_conn) PHP_FE(libvirt_node_get_cpu_stats, arginfo_libvirt_conn_optcpunr) @@ -10002,6 +9999,49 @@ PHP_FUNCTION(libvirt_network_get_name) } /* + * Function name: libvirt_network_get_autostart + * Since version: 0.5.4 + * Description: Function is getting the autostart value for the network + * Arguments: @res [resource]: libvirt network resource + * Returns: autostart value or -1 on error + */ +PHP_FUNCTION(libvirt_network_get_autostart) +{ + php_libvirt_network *network = NULL; + zval *znetwork; + int autostart; + + GET_NETWORK_FROM_ARGS("r", &znetwork); + + if (virNetworkGetAutostart(network->network, &autostart) != 0) + RETURN_LONG(-1); + + RETURN_LONG((long) autostart); +} + +/* + * Function name: libvirt_network_set_autostart + * Since version: 0.5.4 + * Description: Function is setting the autostart value for the network + * Arguments: @res [resource]: libvirt network resource + * @flags [int]: flag to enable/disable autostart + * Returns: TRUE on success, FALSE on error + */ +PHP_FUNCTION(libvirt_network_set_autostart) +{ + php_libvirt_network *network = NULL; + zval *znetwork; + zend_long autostart = 0; + + GET_NETWORK_FROM_ARGS("rl", &znetwork, &autostart); + + if (virNetworkSetAutostart(network->network, autostart) < 0) + RETURN_FALSE; + + RETURN_TRUE; +} + +/* * Function name: libvirt_version * Since version: 0.4.1(-1) * Description: Function is used to get libvirt, driver and libvirt-php version numbers. Can be used for information purposes, for version checking please use libvirt_check_version() defined below diff --git a/src/libvirt-php.h b/src/libvirt-php.h index f87d180..f9dec09 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -423,6 +423,8 @@ PHP_FUNCTION(libvirt_network_set_active); PHP_FUNCTION(libvirt_network_get_uuid_string); PHP_FUNCTION(libvirt_network_get_uuid); PHP_FUNCTION(libvirt_network_get_name); +PHP_FUNCTION(libvirt_network_get_autostart); +PHP_FUNCTION(libvirt_network_set_autostart); /* Nodedev functions */ PHP_FUNCTION(libvirt_nodedev_get); PHP_FUNCTION(libvirt_nodedev_capabilities); -- 2.13.0

3 2

[libvirt] [PATCH] lxc: add possibility to define init uid/gid
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

Users may want to run the init command of a container as a special user / group. Allow doing it using <inituser uid=""/> and <initgroup gid=""/> elements. --- docs/formatdomain.html.in | 6 ++++++ docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 19 +++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/lxc/lxc_container.c | 13 +++++++++++++ tests/lxcxml2xmldata/lxc-inituser.xml | 31 +++++++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 7 files changed, 84 insertions(+) create mode 100644 tests/lxcxml2xmldata/lxc-inituser.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7627fd0d0..85d5f4539 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -334,6 +334,10 @@ To set a custom work directory for the init, use the <code>initdir</code> element. </p> + <p> + To run the init command as a given user or group, use the <code>inituser</code> + or <code>initgroup</code> elements respectively. + </p> <pre> <os> @@ -343,6 +347,8 @@ <initarg>emergency.service</initarg> <initenv name='MYENV'>some value</initenv> <initdir>/my/custom/cwd</initdir> + <inituser uid="1000"/> + <initgroup gid="1000"/> </os> </pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5a4c4ecf1..385e937e9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -400,6 +400,18 @@ <ref name="absFilePath"/> </element> </optional> + <optional> + <element name="inituser"> + <attribute name="uid"> + <ref name="unsignedInt"/> + </attribute> + </element> + <element name="initgroup"> + <attribute name="gid"> + <ref name="unsignedInt"/> + </attribute> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3c2a81f52..21bb104a9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16806,6 +16806,18 @@ virDomainDefParseBootOptions(virDomainDefPtr def, def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt); def->os.initdir = virXPathString("string(./os/initdir[1])", ctxt); + if (virXPathUInt("string(./os/inituser[1]/@uid)", ctxt, &def->os.inituid) == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Failed to parse inituser uid")); + goto error; + } + + if (virXPathUInt("string(./os/initgroup[1]/@gid)", ctxt, &def->os.initgid) == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Failed to parse initgroup gid")); + goto error; + } + if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0) goto error; @@ -24593,6 +24605,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->os.initdir) virBufferEscapeString(buf, "<initdir>%s</initdir>\n", def->os.initdir); + if (def->os.inituid) + virBufferAsprintf(buf, "<inituser uid='%u'/>\n", + def->os.inituid); + if (def->os.initgid) + virBufferAsprintf(buf, "<initgroup gid='%u'/>\n", + def->os.initgid); + if (def->os.loader) virDomainLoaderDefFormat(buf, def->os.loader); virBufferEscapeString(buf, "<kernel>%s</kernel>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d6b8429c3..6e1997324 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1842,6 +1842,8 @@ struct _virDomainOSDef { char **initargv; virDomainOSEnvPtr *initenv; char *initdir; + uid_t inituid; + gid_t initgid; char *kernel; char *initrd; char *cmdline; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8d8e1a735..42bcd25c4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -247,6 +247,10 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); if (vmDef->os.initdir) virCommandSetWorkingDirectory(cmd, vmDef->os.initdir); + if (vmDef->os.inituid) + virCommandSetUID(cmd, vmDef->os.inituid); + if (vmDef->os.initgid) + virCommandSetGID(cmd, vmDef->os.initgid); for (i = 0; vmDef->os.initenv[i]; i++) { virCommandAddEnvPair(cmd, vmDef->os.initenv[i]->name, @@ -2192,6 +2196,15 @@ static int lxcContainerChild(void *data) goto cleanup; } + /* Change the newly created tty owner to the inituid for + * shells to have job control */ + if (vmDef->os.inituid && chown(ttyPath, vmDef->os.inituid, -1) < 0) { + virReportSystemError(errno, + _("Failed to change ownership of tty %s"), + ttyPath); + goto cleanup; + } + if (lxcContainerResolveAllSymlinks(vmDef) < 0) goto cleanup; diff --git a/tests/lxcxml2xmldata/lxc-inituser.xml b/tests/lxcxml2xmldata/lxc-inituser.xml new file mode 100644 index 000000000..61b5db4af --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-inituser.xml @@ -0,0 +1,31 @@ +<domain type='lxc'> + <name>jessie</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/sh</init> + <inituser uid='1000'/> + <initgroup gid='1234'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/jessie'/> + <target dir='/'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index c81b0eace..9b9314cf8 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -100,6 +100,7 @@ mymain(void) VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); DO_TEST("initenv"); DO_TEST("initdir"); + DO_TEST("inituser"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.12.2

1 0

[libvirt] [PATCH 0/2] Set lxc container working directory
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

Hi all, Here is a resubmit with: * virExec() call orders preserved while still sharing code with virCommandExec() * Cleanup in the last patch Cédric Bosdonnat (2): util: share code between virExec and virCommandExec lxc: allow user to specify command working directory docs/formatdomain.html.in | 5 +++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 5 +++ src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 2 ++ src/util/vircommand.c | 69 +++++++++++++++++++++--------------- tests/lxcxml2xmldata/lxc-initdir.xml | 30 ++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 8 files changed, 89 insertions(+), 29 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-initdir.xml -- 2.12.2

1 2

[libvirt] [PATCH] qemu: process: Save vcpu ordering information on reconnect
by Peter Krempa 06 Jun '17

06 Jun '17

vCPU ordering information would not be updated if a vCPU emerged or disappeared during the time libvirtd is not running. This allowed to create invalid configuration like: [...] <vcpu id='56' enabled='yes' hotpluggable='yes' order='57'/> <vcpu id='57' enabled='yes' hotpluggable='yes' order='58'/> <vcpu id='58' enabled='yes' hotpluggable='yes'/> Call the function that records the information on reconnect. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451251 --- src/qemu/qemu_process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index be031b56b..32ba8e373 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3492,6 +3492,8 @@ qemuProcessReconnect(void *opaque) if (qemuDomainRefreshVcpuInfo(driver, obj, QEMU_ASYNC_JOB_NONE, true) < 0) goto error; + qemuDomainVcpuPersistOrder(obj->def); + if (qemuSecurityReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; -- 2.12.2

2 1

[libvirt] libvirt builds failing on fedora-rawhide
by Yash Mankad 06 Jun '17

06 Jun '17

Hi, The libvirt-master-build on ci.c.o seems to be failing on the fedora-rawhide slave since Friday. This seems to be the commit/build that is causing it to fail. Commit ed914284ba74afb7dd16dcb623073bb1a1d5cd21 by pkrempa https://ci.centos.org/job/libvirt-master-build/systems=libvirt-fedora-rawhi… Thanks, Yash

4 3