- Devel - libvirt List Archives

[libvirt] Libvirt fails to apply security context to fd/node to USB device
by Randy Aybar 23 Jan '18

23 Jan '18

Hi, I'm attempting to attach and expose a USB device (WiFi adapter for testing) to an LXC container with SELinux enabled. But when enabling the XML snippet, the container fails to start with this error: 2018-01-12 19:24:31.914+0000: 2181: error : virSecuritySELinuxSetFileconHelper:1182 : unable to set security context 'system_u:object_r:svirt_sandbox_file_t:s0:c139,c284' on '//var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002': No such file or directory Failure in libvirt_lxc startup: unable to set security context 'system_u:object_r:svirt_sandbox_file_t:s0:c139,c284' on '//var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002': No such file or directory The XML snippet for attaching USB device: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x05ac'/> <product id='0x1006'/> </source> <address type='usb' bus='2' port='2'/> </hostdev> SELinux snippet (using the dynamic label for the moment): <seclabel type='dynamic' model='selinux' relabel='yes'/> Running it on CentOS 7.2 and I've tried the distro from the package manager (1.3.3.3), as well as downloaded and compiled the latest stable from libvirt.org (3.10?) and came to the same error each time. Did a small dive into the code after realizing that the path just doesn't seem right. Path (seems to have an unusual and incorrect concatenation of folders) : //var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002 "vroot" seems to be declared by the LXC controller (src/lxc/lxc_controller.c) as such: if (virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name) < 0) goto cleanup; Then upon setting up security for all of the container's attached devices, we call virUSBDeviceNew to setup the attached USB device and give us the path to apply a context to. Since vroot is present, we get this weird path when running through this (src/util/virusb.c): if (virAsprintf(&dev->path, "%s" USB_DEVFS "%03d/%03d", vroot ? vroot : "", dev->bus, dev->dev) < 0) { virUSBDeviceFree(dev); return NULL; } Note: # define USB_DEVFS "/dev/bus/usb/" Should we just be blindly appending this definition if vroot is present, making the path incorrect? If this isn't a bug, I propose the following change: if (virAsprintf(&dev->path, "%s" "%03d/%03d", vroot ? vroot : USB_DEVFS, dev->bus, dev->dev) < 0) { virUSBDeviceFree(dev); return NULL; } Would kindly appreciate any feedback on whether this is a bug or maybe I'm missing something and is the reason why it's written this way. Thanks, Randy

2 2

[libvirt] [PATCH 0/9] Yet another version of CAT stuff (no idea about the version number)
by Martin Kletzander 23 Jan '18

23 Jan '18

Added stuff that Pavel wanted, removed some testcases that I still have in my repo, but it's way to complicated to add properly, so for now I would just go with this and manual testing of starting some domains. I got no hardware to test this on, currently, so some testing is needed before pushing this. @Eli: Can you help with the testing? Martin Kletzander (9): Rename virResctrlInfo to virResctrlInfoPerCache util: Add virResctrlInfo conf: Use virResctrlInfo in capabilities util: Remove now-unneeded resctrl functions resctrl: Add functions to work with resctrl allocations conf: Add support for cputune/cachetune tests: Add virresctrltest qemu: Add support for resctrl docs: Add CAT (resctrl) support into news.xml docs/formatdomain.html.in | 54 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 32 + po/POTFILES.in | 1 + src/Makefile.am | 2 +- src/conf/capabilities.c | 55 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 251 ++++ src/conf/domain_conf.h | 13 + src/libvirt_private.syms | 16 +- src/qemu/qemu_process.c | 61 +- src/util/virresctrl.c | 1380 ++++++++++++++++++-- src/util/virresctrl.h | 86 +- src/util/virresctrlpriv.h | 27 + tests/Makefile.am | 8 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 36 + .../cachetune-colliding-allocs.xml | 30 + .../cachetune-colliding-tunes.xml | 32 + .../cachetune-colliding-types.xml | 30 + tests/genericxml2xmlindata/cachetune-small.xml | 29 + tests/genericxml2xmlindata/cachetune.xml | 33 + tests/genericxml2xmltest.c | 10 + tests/virresctrldata/resctrl-cdp.schemata | 2 + .../virresctrldata/resctrl-skx-twocaches.schemata | 1 + tests/virresctrldata/resctrl-skx.schemata | 1 + tests/virresctrldata/resctrl.schemata | 1 + tests/virresctrltest.c | 102 ++ 27 files changed, 2174 insertions(+), 132 deletions(-) create mode 100644 src/util/virresctrlpriv.h create mode 100644 tests/genericxml2xmlindata/cachetune-cdp.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-tunes.xml create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-types.xml create mode 100644 tests/genericxml2xmlindata/cachetune-small.xml create mode 100644 tests/genericxml2xmlindata/cachetune.xml create mode 100644 tests/virresctrldata/resctrl-cdp.schemata create mode 100644 tests/virresctrldata/resctrl-skx-twocaches.schemata create mode 100644 tests/virresctrldata/resctrl-skx.schemata create mode 100644 tests/virresctrldata/resctrl.schemata create mode 100644 tests/virresctrltest.c -- 2.15.1

6 31

[libvirt] [dbus PATCH v2] main: add support for all usable libvirt drivers
by Pavel Hrdina 23 Jan '18

23 Jan '18

Some of the drivers are remote only, such as ESX, GSX, VPX, PHyp and HyperV. Currently we support only local drivers. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/main.c | 21 +++++++++++++++++---- test/libvirttest.py | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index ab03bc1..32c1cc4 100644 --- a/src/main.c +++ b/src/main.c @@ -85,13 +85,26 @@ struct virtDBusDriver { }; static const struct virtDBusDriver sessionDrivers[] = { - { "qemu:///session", "/org/libvirt/qemu" }, - { "test:///default", "/org/libvirt/test" }, + { "qemu:///session", "/org/libvirt/QEMU" }, + { "test:///default", "/org/libvirt/Test" }, + { "uml:///session", "/org/libvirt/UML" }, + { "vbox:///session", "/org/libvirt/VBox" }, + { "vmwarefusion:///session", "/org/libvirt/VMwareFusion" }, + { "vmwareplayer:///session", "/org/libvirt/VMwarePlayer" }, + { "vmwarews:///session", "/org/libvirt/VMwareWS" }, }; static const struct virtDBusDriver systemDrivers[] = { - { "qemu:///system", "/org/libvirt/qemu" }, - { "test:///default", "/org/libvirt/test" }, + { "XenApi://localhost/", "/org/libvirt/XenAPI" }, + { "bhyve:///system", "/org/libvirt/BHyve" }, + { "lxc:///", "/org/libvirt/LXC" }, + { "openvz:///system", "/org/libvirt/OpenVZ" }, + { "qemu:///system", "/org/libvirt/QEMU" }, + { "test:///default", "/org/libvirt/Test" }, + { "uml:///system", "/org/libvirt/UML" }, + { "vbox:///system", "/org/libvirt/VBox" }, + { "vz:///system", "/org/libvirt/VZ" }, + { "xen:///", "/org/libvirt/Xen" }, }; int diff --git a/test/libvirttest.py b/test/libvirttest.py index 579485f..6a00aea 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -38,7 +38,7 @@ class TestCase(unittest.TestCase): else: raise TimeoutError('error starting libvirt-dbus') - obj = self.bus.get_object('org.libvirt', '/org/libvirt/test') + obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') def tearDown(self): -- 2.14.3

2 1

[libvirt] [dbus RFC 00/11] improve libvirt connections handling
by Pavel Hrdina 23 Jan '18

23 Jan '18

This patch series is a proposal to how to implement libvirt connections in the libvirt D-Bus binding. The design is based on a discussion with Daniel and it should follow D-Bus convention. Each connection is represented as existing object where the object path contains the driver name: /org/libvirt/qemu and there is no need to call any connect API but simply use the existing object directly to operate with that connection. This patch series also implements strict difference between system and user bus. On the user bus only drivers with session capability are available and on the system bus only drivers with system capability are available. Pavel Hrdina (11): util: introduce VIRT_ARRAY_CARDINALITY macro util: introduce virtDBusUtilSetError helper src: rename manager to connect connect: implement lazy connection connect: don't use default libvirt authentication callback connect: implement reconnect functionality to libvirt connect: move domain related code to domain.c connect: store connect path in connect structure domain: derive domain path from connect path main: implement multiple connection within one daemon main: add support for all libvirt drivers src/Makefile.am | 2 +- src/connect.c | 308 ++++++++++++++++++++++++++++++ src/connect.h | 27 +++ src/domain.c | 131 ++++++++----- src/domain.h | 4 +- src/events.c | 64 +++---- src/events.h | 4 +- src/main.c | 75 ++++++-- src/manager.c | 216 --------------------- src/manager.h | 20 -- src/util.c | 17 +- src/util.h | 12 +- test/Makefile.am | 2 +- test/libvirttest.py | 6 +- test/{test_manager.py => test_connect.py} | 12 +- test/test_domain.py | 6 +- 16 files changed, 543 insertions(+), 363 deletions(-) create mode 100644 src/connect.c create mode 100644 src/connect.h delete mode 100644 src/manager.c delete mode 100644 src/manager.h rename test/{test_manager.py => test_connect.py} (79%) -- 2.14.3

2 28

[libvirt] [PATCH] docs: formatdomain: Document the CPU feature 'name' attribute
by Kashyap Chamarthy 23 Jan '18

23 Jan '18

Currently, the CPU feature 'name' XML attribute, as in: [...] <cpu match='exact'> <model fallback='forbid'>IvyBridge</model> <vendor>Intel</vendor> <feature policy='require' name='pcid'/> </cpu> [...] isn't explicitly documented in formatdomain.html. Document it now. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/formatdomain.html.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d272cc1ba..e717fb3aa 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1454,6 +1454,23 @@ <span class="since">Since 0.8.5</span> the <code>policy</code> attribute can be omitted and will default to <code>require</code>. + + Individual CPU feature names can be specified as part of the + <code>name</code> attribute. The list of known CPU feature + names (e.g. 'vmx', 'cmt', et cetera) can be found in the same + file as CPU models -- <code>cpu_map.xml</code>. For example, + to explicitly specify the 'pcid' feature with Intel IvyBridge + CPU model: + +<pre> +... +<cpu match='exact'> + <model fallback='forbid'>IvyBridge</model> + <vendor>Intel</vendor> + <feature policy='require' name='pcid'/> +</cpu> +...</pre> + </dd> <dt><code>cache</code></dt> -- 2.13.6

2 4

[libvirt] a libvirt event question
by Chen, Xiaogang 22 Jan '18

22 Jan '18

Hello: We are adding libvirt functions to launch SEV VM. When start VM I put it at "pause" state. During that time qemu sends an event "sev_measurement". We hope libvirtd get this event before we resume VM. But I did not see libvirtd receive it. If I send this event at qemu during resume time libvirtd can get this event successfully. I traced qemuMonitorJSONIOProcessEvent function for events received, did not see any event coming before resume VM. Is there something I missed to get this event during pause state? Thank you for your help. Regards Xiaogang

1 1

[libvirt] [PATCH v3] libvirtd: clarify the TLS conf default value setting
by Chen Hanxiao 22 Jan '18

22 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Provide more details related to the requirement that setting one of the values requires setting all of them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v3: description updated follow John's comments v2: fix a typo daemon/libvirtd.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8e0c0d96d..91b3f47de 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -182,6 +182,20 @@ # TLS x509 certificate configuration # +# Use of TLS requires that x509 certificates be issued. The default locations +# for the certificate files is as follows: +# +# /etc/pki/CA/cacert.pem - The CA master certificate +# /etc/pki/libvirt/servercert.pem - The server certificate signed with +# the cacert.pem +# /etc/pki/libvirt/private/serverkey.pem - The server private key +# +# It is possible to override the default locations by altering the 'key_file', +# 'cert_file', and 'ca_file' values and uncommenting them below. +# +# NB, overriding the default of one location requires uncommenting and +# possibly additionally overriding the other settings. +# # Override the default server key file path # -- 2.14.3

2 1

[libvirt] [PATCH] libvirtd: Explicit dependency on systemd-machined
by Michal Koutný 22 Jan '18

22 Jan '18

The libvirtd daemon uses systemd-machined D-Bus API when manipulating domains. The systemd-machined is D-Bus activated on demand. However, during system shutdown systemd-machined is stopped concurrently with libvirtd and virsh users also doing their final cleanup may transitively fail due to unavailability of systemd-machined. Example error message > libvirtd[1390]: 2017-12-20 18:55:56.182+0000: 32700: error : virSystemdTerminateMachine:503 : Refusing activation, D-Bus is shutting down. To circumvent this we need to explicitly specify both ordering and requirement dependency (to avoid late D-Bus activation) on systemd-machined. See [1] for the dependency debate. [1] https://lists.freedesktop.org/archives/systemd-devel/2018-January/040095.ht… --- The Wants= dependency is for the case when systemd-machined wasn't started neither D-Bus activated anytime before the shutdown transaction. AFAICS this is very unlikely so for the sake of lazy activation, the Wants= hunk can be dropped. daemon/libvirtd.service.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index c189f5e65..769702ea7 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -7,6 +7,7 @@ Description=Virtualization daemon Requires=virtlogd.socket Requires=virtlockd.socket +Wants=systemd-machined.service Before=libvirt-guests.service After=network.target After=dbus.service @@ -14,6 +15,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target After=remote-fs.target +After=systemd-machined.service Documentation=man:libvirtd(8) Documentation=https://libvirt.org -- 2.13.6

3 4

[libvirt] [PATCH 0/4] Add admin protocol support for virtlogd/virtlockd
by Daniel P. Berrange 22 Jan '18

22 Jan '18

The initial admin protocol support was only integrated into libvirtd. This series extracts that code so that it is reusable with all the daemons we have (and more than we'll get). Daniel P. Berrange (4): admin: move admins server impl/dispatch into src/admin directory util: add virGetUNIXSocketPath helper logd: add support for admin protocol in virtlogd lockd: add support for admin protocol in virtlockd .gitignore | 1 + cfg.mk | 3 +- daemon/Makefile.am | 33 +---- daemon/libvirtd.c | 2 +- daemon/libvirtd.h | 10 -- po/POTFILES.in | 4 +- src/Makefile.am | 33 ++++- {daemon => src/admin}/admin_server.c | 4 +- {daemon => src/admin}/admin_server.h | 6 +- .../admin.c => src/admin/admin_server_dispatch.c | 21 ++-- .../admin.h => src/admin/admin_server_dispatch.h | 9 +- src/libvirt-admin.c | 23 +++- src/locking/lock_daemon.c | 132 +++++++++++++++----- src/locking/lock_daemon_config.c | 3 + src/locking/lock_daemon_config.h | 1 + src/locking/test_virtlockd.aug.in | 4 + src/locking/virtlockd-admin.socket.in | 10 ++ src/locking/virtlockd.aug | 1 + src/locking/virtlockd.conf | 6 + src/locking/virtlockd.service.in | 1 + src/logging/log_daemon.c | 135 +++++++++++++++------ src/logging/log_daemon_config.c | 3 + src/logging/log_daemon_config.h | 1 + src/logging/test_virtlogd.aug.in | 4 + src/logging/virtlogd-admin.socket.in | 10 ++ src/logging/virtlogd.aug | 1 + src/logging/virtlogd.service.in | 1 + src/util/virutil.c | 45 +++++++ src/util/virutil.h | 1 + 29 files changed, 371 insertions(+), 137 deletions(-) rename {daemon => src/admin}/admin_server.c (99%) rename {daemon => src/admin}/admin_server.h (96%) rename daemon/admin.c => src/admin/admin_server_dispatch.c (96%) rename daemon/admin.h => src/admin/admin_server_dispatch.h (83%) create mode 100644 src/locking/virtlockd-admin.socket.in create mode 100644 src/logging/virtlogd-admin.socket.in -- 2.14.3

2 11

[libvirt] [PATCH] qemu: Don't initialize struct utsname
by Jiri Denemark 22 Jan '18

22 Jan '18

It breaks the build and it is not really useful for anything. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed under the build breaker rule. src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c573827f1..5e03447baa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5431,7 +5431,7 @@ virQEMUCapsCacheNew(const char *libDir, char *capsCacheDir = NULL; virFileCachePtr cache = NULL; virQEMUCapsCachePrivPtr priv = NULL; - struct utsname uts = { 0 }; + struct utsname uts; if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) goto error; -- 2.16.0

2 3

[libvirt] [PATCH] Raise the frame limit for tests
by Ján Tomko 22 Jan '18

22 Jan '18

After the latest CPU additions, the build fails with clang: cputest.c:905:1: error: stack frame size of 26136 bytes in function 'mymain' [-Werror,-Wframe-larger-than=] Raise the relaxed limit which is used for tests. --- m4/virt-compile-warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a build breaker fix diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index f18a08a8f..b9c974842 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -200,7 +200,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # but using 1024 bytes sized buffers (mostly for virStrerror) # stops us from going down further gl_WARN_ADD([-Wframe-larger-than=4096], [STRICT_FRAME_LIMIT_CFLAGS]) - gl_WARN_ADD([-Wframe-larger-than=25600], [RELAXED_FRAME_LIMIT_CFLAGS]) + gl_WARN_ADD([-Wframe-larger-than=32768], [RELAXED_FRAME_LIMIT_CFLAGS]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 2.13.6

4 10

[libvirt] [PATCH] qemu: auto-add generic xhci rather than NEC xhci to Q35 domains
by Laine Stump 22 Jan '18

22 Jan '18

We recently added a generic XHCI USB3 controller to QEMU, and libvirt supports adding that controller rather than the NEC XHCI USB3 controller, but when auto-adding a USB controller to Q35 domains we were still adding the vendor-specific NEC controller. This patch changes to add the generic controller instead, if it's available in the QEMU binary that will be used. --- src/qemu/qemu_domain.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1676c03fc..6b4bd3cca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2660,12 +2660,13 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, addPCIeRoot = true; addImplicitSATA = true; - /* Prefer adding USB3 controller if supported - * (nec-usb-xhci). Failing that, add a USB2 controller set - * if the ich9-usb-ehci1 device is supported. Otherwise - * don't add anything. + /* Prefer adding a USB3 controller if supported, fall back + * to USB2 if there is no USB3 available, and if that's + * unavailable don't add anything. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) + usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI)) usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_USB_EHCI1)) usbModel = VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1; -- 2.14.3

2 1

[libvirt] [PATCH v2] libvirtd: clarify the TLS conf default vaule setting
by Chen Hanxiao 22 Jan '18

22 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As the description of daemon/libvirtd.conf, setting key_file, cert_file or key_file will override the default value. But if we set any one of them, we need to set all the rest of them. This patch clarify that description. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: fix a typo daemon/libvirtd.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8e0c0d96d..7040ff26b 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -183,6 +183,9 @@ # +# NB, if the default value of 'key_file', 'cert_file' or +# 'ca_file' would be changed, +# all of them should be changed together. # Override the default server key file path # #key_file = "/etc/pki/libvirt/private/serverkey.pem" -- 2.14.3

3 2

[libvirt] [PATCH] add support of iSER transport type in qemu with libiscsi
by lichstor＠gmail.com 20 Jan '18

20 Jan '18

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> --- docs/schemas/domaincommon.rng | 28 +++++++++++++ src/conf/domain_conf.c | 8 ++++ src/qemu/qemu_block.c | 24 ++++++++++- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_parse_command.c | 10 ++++- src/storage/storage_backend_gluster.c | 1 + src/util/virstoragefile.c | 3 +- src/util/virstoragefile.h | 1 + .../disk-drive-network-iser-auth.args | 25 ++++++++++++ .../disk-drive-network-iser-auth.xml | 44 ++++++++++++++++++++ .../qemuargv2xmldata/disk-drive-network-iser.args | 25 ++++++++++++ tests/qemuargv2xmldata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuargv2xmltest.c | 2 + ...-drive-network-iser-auth-secrettype-invalid.xml | 33 +++++++++++++++ ...sk-drive-network-iser-auth-wrong-secrettype.xml | 33 +++++++++++++++ .../disk-drive-network-iser-auth.args | 31 ++++++++++++++ .../disk-drive-network-iser-auth.xml | 43 ++++++++++++++++++++ .../disk-drive-network-iser-lun.args | 27 +++++++++++++ .../disk-drive-network-iser-lun.xml | 28 +++++++++++++ .../qemuxml2argvdata/disk-drive-network-iser.args | 29 +++++++++++++ tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 +++++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ .../disk-drive-network-iser-auth.xml | 47 ++++++++++++++++++++++ .../qemuxml2xmloutdata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 25 files changed, 569 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f22c932f6..819a8791d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1534,6 +1534,7 @@ <choice> <value>tcp</value> <value>rdma</value> + <value>iser</value> </choice> </attribute> </optional> @@ -1613,6 +1614,15 @@ <optional> <ref name="encryption"/> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> </element> </define> @@ -4386,6 +4396,15 @@ <attribute name="name"> <text/> </attribute> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <interleave> <oneOrMore> <element name='host'> @@ -4397,6 +4416,15 @@ <ref name="PortNumber"/> </attribute> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <empty/> </element> </oneOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c25060f..8aa193ac2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7075,6 +7075,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, virStorageNetHostDefPtr *hosts, size_t *nhosts) { + char *transport = NULL; xmlNodePtr child; for (child = node->children; child; child = child->next) { @@ -7086,6 +7087,9 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, } } + if ((*hosts) && (transport = virXMLPropString(node, "transport"))) + (*hosts)->transport = virStorageNetHostTransportTypeFromString(transport); + return 0; } @@ -8490,6 +8494,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) goto cleanup; + virStorageSourceNetworkAssignDefaultPorts(src); ret = 0; @@ -22371,6 +22376,9 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, VIR_FREE(path); + if (src->hosts && src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) + virBufferEscapeString(attrBuf, " transport='%s'", "iser"); + if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && src->tlsFromConfig)) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..49837205f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -433,6 +433,12 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_STRDUP(uri->scheme, virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; + } else if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) { + uri->port = src->hosts->port; + + if (VIR_STRDUP(uri->scheme, + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) + goto cleanup; } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -506,6 +512,19 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, goto cleanup; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: + transport = "iser"; + if (virAsprintf(&port, "%u", host->port) < 0) + goto cleanup; + + if (virJSONValueObjectCreate(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) + goto cleanup; + break; + case VIR_STORAGE_NET_HOST_TRANS_UNIX: if (virJSONValueObjectCreate(&server, "s:type", "unix", @@ -590,7 +609,8 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) virJSONValuePtr ret = NULL; char *port = NULL; - if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP && + host->transport != VIR_STORAGE_NET_HOST_TRANS_ISER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only TCP protocol can be converted to InetSocketAddress")); return NULL; @@ -831,7 +851,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", virStorageNetHostTransportTypeToString(src->hosts->transport), "S:user", username, "S:password-secret", objalias, NULL)); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b8aede32d..dd6e3be9a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -883,6 +883,8 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, if (!((src->hosts->name && strchr(src->hosts->name, ':')) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP && !src->hosts->name) || + (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER && + !src->hosts->name) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && src->hosts->socket && src->hosts->socket[0] != '/'))) { @@ -891,6 +893,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, switch (src->hosts->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: + case VIR_STORAGE_NET_HOST_TRANS_ISER: virBufferAsprintf(&buf, "%s:%u", src->hosts->name, src->hosts->port); break; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d0..d376af208 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -70,7 +70,9 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (STRNEQ(uri->scheme, scheme)) { + if (STREQ(uri->scheme, "iser")) { + transp = (char *)"iser"; + } else if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -709,6 +711,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (qemuParseISCSIString(def) < 0) goto error; + } else if (STRPREFIX(def->src->path, "iser:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; + + if (qemuParseISCSIString(def) < 0) + goto error; } else if (STRPREFIX(def->src->path, "sheepdog:")) { char *p = def->src->path; char *port, *vdi; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 5eea84f16..1452fa0cd 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -608,6 +608,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, hoststr = host->socket; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_LAST: break; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5780180a9..63253a9c4 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -92,7 +92,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma") + "rdma", + "iser") VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ecd806c93..5a6ec7776 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -147,6 +147,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..aaf10d8c8 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args @@ -0,0 +1,25 @@ +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 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ +format=raw,if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..7226443fb --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='qemuargv2xml_usage'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.args b/tests/qemuargv2xmldata/disk-drive-network-iser.args new file mode 100644 index 000000000..c476e759e --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.args @@ -0,0 +1,25 @@ +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 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example,format=raw,\ +if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.xml b/tests/qemuargv2xmldata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index cb010268c..59b26c647 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -213,6 +213,8 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix"); DO_TEST("disk-drive-network-iscsi"); DO_TEST("disk-drive-network-iscsi-auth"); + DO_TEST("disk-drive-network-iser"); + DO_TEST("disk-drive-network-iser-auth"); DO_TEST("disk-drive-network-gluster"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-rbd-auth"); diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml new file mode 100644 index 000000000..dbcf484dc --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml new file mode 100644 index 000000000..5525e9d86 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..5fa7a04bb --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args @@ -0,0 +1,31 @@ +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 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..fbcb6b4f1 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args new file mode 100644 index 000000000..d9428533b --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args @@ -0,0 +1,27 @@ +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 214 \ +-smp 1,sockets=1,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 \ +-no-acpi \ +-boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=iser://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml new file mode 100644 index 000000000..25fa76140 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='3260' transport='iser'/> + </source> + <target dev='sda' bus='scsi'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.args b/tests/qemuxml2argvdata/disk-drive-network-iser.args new file mode 100644 index 000000000..49ea467ff --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.args @@ -0,0 +1,29 @@ +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 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.xml b/tests/qemuxml2argvdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..b1634555c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be32d891e..dcb35f017 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -939,6 +939,13 @@ mymain(void) DO_TEST("disk-drive-network-iscsi-lun", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); + DO_TEST("disk-drive-network-iser", NONE); + DO_TEST("disk-drive-network-iser-auth", NONE); + DO_TEST_PARSE_ERROR("disk-drive-network-iser-auth-secrettype-invalid", NONE); + DO_TEST_PARSE_ERROR("disk-drive-network-iser-auth-wrong-secrettype", NONE); + DO_TEST("disk-drive-network-iser-lun", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-drive-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-drive-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..1b27fdea2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <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='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2be8eb2c1..aeeda2dd1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -515,6 +515,8 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix", NONE); DO_TEST("disk-drive-network-iscsi", NONE); DO_TEST("disk-drive-network-iscsi-auth", NONE); + DO_TEST("disk-drive-network-iser", NONE); + DO_TEST("disk-drive-network-iser-auth", NONE); DO_TEST("disk-drive-network-gluster", NONE); DO_TEST("disk-drive-network-rbd", NONE); DO_TEST("disk-drive-network-rbd-auth", NONE); -- 2.13.6 (Apple Git-96)

3 4

[libvirt] [PATCH V3] nodedev: Fix failing to parse PCI address for non-PCI network devices
by Jim Fehlig 19 Jan '18

19 Jan '18

Commit 8708ca01c added virNetDevSwitchdevFeature() to check if a network device has Switchdev capabilities. virNetDevSwitchdevFeature() attempts to retrieve the PCI device associated with the network device, ignoring non-PCI devices. It does so via the following call chain virNetDevSwitchdevFeature()->virNetDevGetPCIDevice()-> virPCIGetDeviceAddressFromSysfsLink() For non-PCI network devices (qeth, Xen vif, etc), virPCIGetDeviceAddressFromSysfsLink() will report an error when virPCIDeviceAddressParse() fails. virPCIDeviceAddressParse() also logs an error. After commit 8708ca01c there are now two errors reported for each non-PCI network device even though the errors are harmless. To avoid the errors, introduce virNetDevIsPCIDevice() and use it in virNetDevGetPCIDevice() before attempting to retrieve the associated PCI device. virNetDevIsPCIDevice() uses the 'subsystem' property of the device to determine if it is PCI. See the sysfs rules in kernel documentation for more details https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html --- V2: https://www.redhat.com/archives/libvir-list/2018-January/msg00233.html Changes in V3: Implement checking if netdev is PCI in virnetdev.c instead of virpci.c Addressed other comments from eskultet src/util/virnetdev.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index eb2d119bf..baf4a71fe 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -22,6 +22,7 @@ #include <config.h> +#include "dirname.h" #include "virnetdev.h" #include "virnetlink.h" #include "virmacaddr.h" @@ -1147,6 +1148,48 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, return 0; } +/** + * Determine if the device path specified in devpath is a PCI Device + * by resolving the 'subsystem'-link in devpath and looking for + * 'pci' in the last component. For more information see the rules + * for accessing sysfs in the kernel docs + * + * https://www.kernel.org/doc/html/latest/admin-guide/sysfs-rules.html + * + * Returns true if devpath's susbsystem is pci, false otherwise. + */ +static bool +virNetDevIsPCIDevice(const char *devpath) +{ + char *subsys_link = NULL; + char *abs_path = NULL; + char *subsys = NULL; + bool ret = false; + + if (virAsprintf(&subsys_link, "%s/subsystem", devpath) < 0) + return false; + + if (!virFileExists(subsys_link)) + goto cleanup; + + if (virFileIsLink(subsys_link) != 1) + goto cleanup; + + if (virFileResolveLink(subsys_link, &abs_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to resolve device subsystem symlink %s"), + subsys_link); + goto cleanup; + } + + subsys = last_component(abs_path); + ret = STRPREFIX(subsys, "pci"); + + cleanup: + VIR_FREE(subsys_link); + VIR_FREE(abs_path); + return ret; +} static virPCIDevicePtr virNetDevGetPCIDevice(const char *devName) @@ -1158,6 +1201,9 @@ virNetDevGetPCIDevice(const char *devName) if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device") < 0) goto cleanup; + if (!virNetDevIsPCIDevice(vfSysfsDevicePath)) + goto cleanup; + vfPCIAddr = virPCIGetDeviceAddressFromSysfsLink(vfSysfsDevicePath); if (!vfPCIAddr) goto cleanup; -- 2.15.1

2 2

[libvirt] [PATCH] virt-aa-helper: Allow parsing supported features for qemu/kvm
by Shivaprasad G Bhat 19 Jan '18

19 Jan '18

The virt-aa-helper fails to parse the xmls with the memory/cpu hotplug features or user assigned aliases. Set the features in xmlopt->config for the parsing to succeed. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 21 --------------------- src/conf/domain_conf.h | 21 +++++++++++++++++++++ src/security/virt-aa-helper.c | 7 +++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a1c2506..20ce83e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -64,27 +64,6 @@ VIR_LOG_INIT("conf.domain_conf"); -/* This structure holds various callbacks and data needed - * while parsing and creating domain XMLs */ -struct _virDomainXMLOption { - virObject parent; - - /* XML parser callbacks and defaults */ - virDomainDefParserConfig config; - - /* domain private data management callbacks */ - virDomainXMLPrivateDataCallbacks privateData; - - /* XML namespace callbacks */ - virDomainXMLNamespace ns; - - /* ABI stability callbacks */ - virDomainABIStability abi; - - /* Private data for save image stored in snapshot XML */ - virSaveCookieCallbacks saveCookie; -}; - #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ VIR_DOMAIN_DEF_FORMAT_INACTIVE | \ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6f7f96b..aacb88a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2662,6 +2662,27 @@ struct _virDomainABIStability { virDomainABIStabilityDomain domain; }; +/* This structure holds various callbacks and data needed + * while parsing and creating domain XMLs */ +struct _virDomainXMLOption { + virObject parent; + + /* XML parser callbacks and defaults */ + virDomainDefParserConfig config; + + /* domain private data management callbacks */ + virDomainXMLPrivateDataCallbacks privateData; + + /* XML namespace callbacks */ + virDomainXMLNamespace ns; + + /* ABI stability callbacks */ + virDomainABIStability abi; + + /* Private data for save image stored in snapshot XML */ + virSaveCookieCallbacks saveCookie; +}; + virDomainXMLOptionPtr virDomainXMLOptionNew(virDomainDefParserConfigPtr config, virDomainXMLPrivateDataCallbacksPtr priv, virDomainXMLNamespacePtr xmlns, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f7ccae0..8b0ca46 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -699,6 +699,13 @@ get_definition(vahControl * ctl, const char *xmlStr) goto exit; } + if (virtType == VIR_DOMAIN_VIRT_QEMU || virtType == VIR_DOMAIN_VIRT_KVM) { + ctl->xmlopt->config.features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | + VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN | + VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS | + VIR_DOMAIN_DEF_FEATURE_USER_ALIAS; + } + if (virCapabilitiesAddGuestDomain(guest, virtType, NULL,

3 2

[libvirt] Release of libvirt-4.0.0
by Daniel Veillard 19 Jan '18

19 Jan '18

First release of the year ! A bit late but it is now tagged in git and signed tarball and rpms are at the usual place: ftp://libvirt.org/libvirt/ I also pushed a release of the python bindings in git and at ftp://libvirt.org/libvirt/python/ This is a relatively small release, probably due to the end of year slowdown though there is some notable addition: * New features - tools: Provide bash completion support. Both virsh and virt-admin now implement basic bash completion support. - qemu: Refresh capabilities on host microcode update A microcode update can cause the CPUID bits to change; therefore, the capabilities cache should be rebuilt when such an update is detected on the host. - lxc: Set hostname based on container name * Improvements - CPU frequency reporting improvements The CPU frequency will now be reported by virsh nodeinfo and other tools for s390 hosts; at the same time; CPU frequency has been disabled on aarch64 hosts because there's no way to detect it reliably. - libxl: Mark domain0 as persistent - Xen: Add support for multiple IP addresses on interface devices - qemu: Add support for hot unplugging redirdev device * Bug fixes - qemu: Enforce vCPU hotplug granularity constraints QEMU 2.7 and newer don't allow guests to start unless the initial vCPUs count is a multiple of the vCPU hotplug granularity, so validate it and report an error if needed. thanks everybody for your help with this release, be it code, bug reports reviews, documentation, etc ... Enjoy the new release ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Revert "qemu: monitor: do not report error on shutdown"
by Michal Privoznik 19 Jan '18

19 Jan '18

This reverts commit aeda1b8c56dc58b0a413acc61bbea938b40499e1. Problem is that we need mon->lastError to be set because it's used all over the place. Also, there's nothing wrong with reporting error if one occurred. I mean, if there's a thread executing an API and which currently is talking on monitor it definitely wants the error reported. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 85c7d68a1..fc146bdbf 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -78,7 +78,6 @@ struct _qemuMonitor { * < 0: an error occurred during the registration of @fd */ int watch; int hasSendFD; - int willhangup; virDomainObjPtr vm; @@ -716,10 +715,8 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) if (events & VIR_EVENT_HANDLE_HANGUP) { hangup = true; if (!error) { - if (!mon->willhangup) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); - } + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("End of file from qemu monitor")); eof = true; events &= ~VIR_EVENT_HANDLE_HANGUP; } @@ -758,7 +755,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) if (mon->lastError.code != VIR_ERR_OK) { /* Already have an error, so clear any new error */ virResetLastError(); - } else if (!mon->willhangup) { + } else { virErrorPtr err = virGetLastError(); if (!err) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1352,7 +1349,6 @@ qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; VIR_DEBUG("mon=%p guest=%u", mon, guest); - mon->willhangup = 1; QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; -- 2.13.6

2 2

[libvirt] [PATCH] qemu: Don't send any monitor commands afer SHUTDOWN event
by Michal Privoznik 19 Jan '18

19 Jan '18

After aeda1b8c56dc5 we tried to stop reporting I/O errors on expected monitor HUP. We've achieved that by not setting mon->lastError once we've received SHUTDOWN event. However, this makes us to deadlock in case there's thread that enters the monitor after the event is received. The problem is, we're no longer setting mon->lastError and therefore qemuMonitorSend() does not return early and continues execution until virCondWait() (which will never wake up). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 85c7d68a1..9f3e3eb14 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1063,7 +1063,7 @@ qemuMonitorSend(qemuMonitorPtr mon, { int ret = -1; - /* Check whether qemu quit unexpectedly */ + /* Check whether qemu quit unexpectedly, */ if (mon->lastError.code != VIR_ERR_OK) { VIR_DEBUG("Attempt to send command while error is set %s", NULLSTR(mon->lastError.message)); @@ -1071,6 +1071,12 @@ qemuMonitorSend(qemuMonitorPtr mon, return -1; } + /* or expectedly. */ + if (mon->willhangup) { + VIR_DEBUG("Attempt to send command while domain is shutting down"); + return -1; + } + mon->msg = msg; qemuMonitorUpdateWatch(mon); -- 2.13.6

2 2

[libvirt] [PATCH] qemu: Fix crash in offline migration
by Jiri Denemark 19 Jan '18

19 Jan '18

When migrating a shutoff domain (i.e., offline migration), we have no statistics to report and thus jobInfo will be NULL in qemuMigrationFinish. Broken by me in v3.10.0-183-ge8784e7868. https://bugzilla.redhat.com/show_bug.cgi?id=1536351 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a56bc596ff..1854900c9a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5481,8 +5481,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (dom) { - VIR_STEAL_PTR(priv->job.completed, jobInfo); - priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + if (jobInfo) { + VIR_STEAL_PTR(priv->job.completed, jobInfo); + priv->job.completed->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED; + } if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, QEMU_MIGRATION_COOKIE_STATS) < 0) -- 2.16.0

2 1

[libvirt] [PATCH 00/17] CPU models and features for Spectre, CVE-2017-5715
by Jiri Denemark 18 Jan '18

18 Jan '18

This is the libvirt's part of the changes related to CVE-2017-5715. The new models can be used to pass the protective CPU features to guests. But remember, the host CPU microcode, host kernel, QEMU, and libvirt all need to be updated for this to be any useful. Based on a patch from Paolo Bonzini. See QEMU patches from Eduardo for more details: https://patchew.org/QEMU/20180109154519.25634-1-ehabkost@redhat.com/ Jiri Denemark (16): cputest: Add data for Intel(R) Xeon(R) CPU E5-2609 v3 cputest: Add data for Intel(R) Xeon(R) CPU E5-2623 v4 cputest: Add data for Intel(R) Xeon(R) Gold 5115 CPU cputest: Add data for updated AMD EPYC 7601 32-Core Processor cputest: Add data for updated Intel(R) Core(TM) i7-5600U CPU cpu: Add Nehalem-IBRS CPU model cpu: Add Westmere-IBRS CPU model cpu: Add SandyBridge-IBRS CPU model cpu: Add IvyBridge-IBRS CPU model cpu: Add Haswell-noTSX-IBRS CPU model cpu: Add Haswell-IBRS CPU model cpu: Add Broadwell-noTSX-IBRS CPU model cpu: Add Broadwell-IBRS CPU model cpu: Add Skylake-Client-IBRS CPU model cpu: Add Skylake-Server-IBRS CPU model cpu: Add EPYC-IBPB CPU model Paolo Bonzini (1): cpu: add CPU features for indirect branch prediction protection src/cpu/cpu_map.xml | 622 ++++++++++++++++++ tests/cputest.c | 5 + .../x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-5600U-ibrs-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml | 29 + .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 30 + .../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml | 15 + .../x86_64-cpuid-Core-i7-5600U-ibrs.json | 525 +++++++++++++++ .../x86_64-cpuid-Core-i7-5600U-ibrs.xml | 41 ++ ...86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml | 7 + ...x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml | 9 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 17 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 17 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml | 12 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.json | 722 ++++++++++++++++++++ .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.xml | 54 ++ .../x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml | 6 + .../x86_64-cpuid-Xeon-E5-2609-v3-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml | 31 + .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 32 + .../x86_64-cpuid-Xeon-E5-2609-v3-json.xml | 14 + .../cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json | 726 +++++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.xml | 37 ++ .../x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml | 7 + .../x86_64-cpuid-Xeon-E5-2623-v4-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 30 + .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 34 + .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 11 + .../cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json | 662 +++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.xml | 43 ++ .../x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 8 + .../x86_64-cpuid-Xeon-Gold-5115-enabled.xml | 8 + .../x86_64-cpuid-Xeon-Gold-5115-guest.xml | 29 + .../x86_64-cpuid-Xeon-Gold-5115-host.xml | 30 + .../x86_64-cpuid-Xeon-Gold-5115-json.xml | 8 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json | 614 +++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.xml | 54 ++ 37 files changed, 4519 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.xml -- 2.15.1

4 24

[libvirt] Test failures in libvirt RHEL-6.2.AUS errata job
by Jingjing Shao 18 Jan '18

18 Jan '18

Hi admin, I met the error as below in the in libvirt RHEL-6.2.AUS errata job, can you help to check it ? ======================================= 1 of 54 tests failed (2 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[1]: *** [check-TESTS] Error 1 make[1]: Leaving directory `/home/test/rpmbuild/BUILD/libvirt-0.9.4/tests' make: *** [check-am] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.FOpZXU (%check) Details can be seen in attachment. Reference: http://nest.test.redhat.com/mnt/qa/scratch/x86-64-6s-2aus-v1/2017:32031/tps… -- Regards, Jingjing Shao

2 1

[libvirt] [PATCH] Add Eduardo Otubo to Planet Virt-Tools
by Eduardo Otubo 18 Jan '18

18 Jan '18

Adding Eduardo Otubo's blog information and avatar to config.ini at Planet Virt-Tools. Signed-ff-by: Eduardo Otubo <otubo(a)redhat.com> --- updater/virt-tools/config.ini | 6 ++++++ updater/virt-tools/images/otubo.png | Bin 0 -> 10597 bytes 2 files changed, 6 insertions(+) create mode 100644 updater/virt-tools/images/otubo.png diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index 988e572..d47e82f 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -167,3 +167,9 @@ name = Nathan Gauër [https://virtualpenguins.blogspot.com/feeds/posts/default] name = Cornelia Huck + +[http://www.otubo.net/feeds/posts/default/-/virt/?alt=rss] +name = Eduardo Otubo +face = otubo.png +facewidth = 80 +faceheight = 80 diff --git a/updater/virt-tools/images/otubo.png b/updater/virt-tools/images/otubo.png new file mode 100644 index 0000000000000000000000000000000000000000..9dfd30fce1c7b06bac5ad9b07052ad170bbe768a GIT binary patch literal 10597 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 literal 0 HcmV?d00001 -- 2.14.3

2 1

[libvirt] [RFC PATCH 00/10] Resolve libvirtd hang on termination with connected long running client
by John Ferlan 17 Jan '18

17 Jan '18

This RFC is a combination of a couple of different patch postings that I've combined into one central "stream" of patches that can be discussed for their relative importance or need to fix the problem. Although a bit long winded, I think I've captured enough history for anyone so inclined to walk through the history to understand the maze of twisty patches that it takes to hopefully resolve the issue. The first two patches were presented previously, but not accepted: https://www.redhat.com/archives/libvir-list/2017-November/msg00296.html https://www.redhat.com/archives/libvir-list/2017-November/msg00297.html However since that time, it seems "some form" of the patches is necessary. Most importantly making sure the virObjectUnref for @srv and @srvAdm occurs *prior to* the virNetDaemonClose(dmn); at cleanup (IOW: out of order for a reason). Doing that also requires any program started on the servers also has the virObjectUnref prior to daemon close. The 3rd and 4th patches are a result of discussions held in mid December related to libvirtd crashes/hangs and some possible adjustments to help. Discussion starts here: https://www.redhat.com/archives/libvir-list/2017-December/msg00515.html This led to suggestions to move the toggling of services from Dispose to Close *and* to split the virThreadPoolFree into a Drain function that could also be called during the Close function rather than waiting for the Dispose to occur. Still testing showed that just those 4 patches it still wasn't enough as libvirtd ended up just "hung" because of some patches Nikolay posted that add a new shutdown state, see: https://www.redhat.com/archives/libvir-list/2017-October/msg01134.html Those patches languished mainly because it wasn't clear (at the time) the relationship between them and another series dealing with libvirtd crashes that was partially accepted and pushed: https://www.redhat.com/archives/libvir-list/2017-October/msg01347.html and followup discussion starting here: https://www.redhat.com/archives/libvir-list/2017-November/msg00023.html The 9th patch can be used to test that the first 8 do the job. The details on how I set up the test environment is in the patch. If the sequence is run before the first 8 patches, you will end up with a couple of different hang scenarios. So if you're compelled to see what the big deal is, then apply this one alone and have fun playing. The 10th patch is the one patch from the partially pushed series that wasn't pushed as it was not deemed necessary. It's presented here mainly for completeness. John Ferlan (5): libvirtd: Alter refcnt processing for domain server objects libvirtd: Alter refcnt processing for server program objects netserver: Toggle service off during close qemu: Introduce virTheadPoolDrain APPLY ONLY FOR TESTING PURPOSES Nikolay Shirokovskiy (5): libvirt: introduce hypervisor driver shutdown function qemu: implement state driver shutdown function qemu: agent: fix monitor close during first sync qemu: monitor: check monitor not closed upon send libvirtd: fix crash on termination daemon/libvirtd.c | 46 ++++++++++++++++++++++++++++++++----------- src/driver-state.h | 4 ++++ src/libvirt.c | 18 +++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_agent.c | 14 ++++++------- src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 ++++++++++++------------- src/rpc/virnetdaemon.c | 1 + src/rpc/virnetserver.c | 5 ++--- src/rpc/virnetserverservice.c | 2 ++ src/util/virthreadpool.c | 19 ++++++++++++------ src/util/virthreadpool.h | 2 ++ 13 files changed, 143 insertions(+), 42 deletions(-) -- 2.13.6

3 19

[libvirt] [PATCH V2] nodedev: Fix failing to parse PCI address for non-PCI network devices
by Jim Fehlig 17 Jan '18

17 Jan '18

Based loosely on a patch from Fei Li <fli(a)suse.com>. Commit 8708ca01c added virNetDevSwitchdevFeature() to check if a network device has Switchdev capabilities. virNetDevSwitchdevFeature() attempts to retrieve the PCI device associated with the network device, ignoring non-PCI devices. It does so via the following call chain virNetDevSwitchdevFeature()->virNetDevGetPCIDevice()-> virPCIGetDeviceAddressFromSysfsLink() For non-PCI network devices (qeth, Xen vif, etc), virPCIGetDeviceAddressFromSysfsLink() will report an error when virPCIDeviceAddressParse() fails. virPCIDeviceAddressParse() also logs an error. After commit 8708ca01c there are now two errors reported for each non-PCI network device even though the errors are harmless. To avoid changing virPCIGetDeviceAddressFromSysfsLink(), virPCIDeviceAddressParse() and related code that has quite a few call sites, add a function to check if a network device is a PCI device and use it in virNetDevSwitchdevFeature() before attempting to retrieve the PCI device. --- Suggestions welcome on a better name for virPCIIsPCIDevice, or even a better approach to solving this issue. Currently virPCIIsPCIDevice assumes the device is PCI if its subsystem starts with 'pci'. I'd be happy to hear if there is a better way to determine if a network device is PCI. src/libvirt_private.syms | 1 + src/util/virnetdev.c | 25 ++++++++++++++++++++++--- src/util/virpci.c | 32 ++++++++++++++++++++++++++++++++ src/util/virpci.h | 3 +++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a705fa846..bdf98ded1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2458,6 +2458,7 @@ virPCIGetVirtualFunctionInfo; virPCIGetVirtualFunctions; virPCIHeaderTypeFromString; virPCIHeaderTypeToString; +virPCIIsPCIDevice; virPCIIsVirtualFunction; virPCIStubDriverTypeFromString; virPCIStubDriverTypeToString; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index eb2d119bf..a9af08797 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1148,6 +1148,21 @@ virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, } +static bool +virNetDevIsPCIDevice(const char *devName) +{ + char *vfSysfsDevicePath = NULL; + bool ret; + + if (virNetDevSysfsFile(&vfSysfsDevicePath, devName, "device/subsystem") < 0) + return false; + + ret = virPCIIsPCIDevice(vfSysfsDevicePath); + VIR_FREE(vfSysfsDevicePath); + return ret; +} + + static virPCIDevicePtr virNetDevGetPCIDevice(const char *devName) { @@ -3236,14 +3251,18 @@ virNetDevSwitchdevFeature(const char *ifname, if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) goto cleanup; - pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : - virNetDevGetPCIDevice(ifname); + if (pfname == NULL && VIR_STRDUP(pfname, ifname) < 0) + goto cleanup; + /* No PCI device, then no feature bit to check/add */ - if (pci_device_ptr == NULL) { + if (!virNetDevIsPCIDevice(pfname)) { ret = 0; goto cleanup; } + if ((pci_device_ptr = virNetDevGetPCIDevice(pfname)) == NULL) + goto cleanup; + if (!(nl_msg = nlmsg_alloc_simple(family_id, NLM_F_REQUEST | NLM_F_ACK))) { virReportOOMError(); diff --git a/src/util/virpci.c b/src/util/virpci.c index fe57bef32..f22d89cd7 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2651,6 +2651,38 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) return bdf; } +/** + * virPCIIsPCIDevice: + * @device_link: sysfs path for the device + * + * Returns true if the device specified in @device_link sysfs + * path is a PCI device, otherwise returns false. + */ +bool +virPCIIsPCIDevice(const char *device_link) +{ + char *device_path = NULL; + char *subsys = NULL; + bool ret; + + if (!virFileExists(device_link)) { + VIR_DEBUG("'%s' does not exist", device_link); + return false; + } + + device_path = canonicalize_file_name(device_link); + if (device_path == NULL) { + VIR_DEBUG("Failed to resolve device link '%s'", device_link); + return false; + } + + subsys = last_component(device_path); + ret = STRPREFIX(subsys, "pci"); + + VIR_FREE(device_path); + return ret; +} + /** * virPCIGetPhysicalFunction: * @vf_sysfs_path: sysfs path for the virtual function diff --git a/src/util/virpci.h b/src/util/virpci.h index f1fbe39e6..489d8a777 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -190,6 +190,9 @@ int virPCIDeviceWaitForCleanup(virPCIDevicePtr dev, const char *matcher); virPCIDeviceAddressPtr virPCIGetDeviceAddressFromSysfsLink(const char *device_link); +bool +virPCIIsPCIDevice(const char *device_link); + int virPCIGetPhysicalFunction(const char *vf_sysfs_path, virPCIDeviceAddressPtr *pf); -- 2.15.1

2 2