- Devel - libvirt List Archives

[libvirt] [tck PATCH 0/2] Enable the storage encryption test
by Erik Skultety 02 Jan '20

02 Jan '20

The test was present, but at the time the test was added libvirt (apparently) didn't fully support LUKS encryption with disks. Erik Skultety (2): scripts: qemu: Fix the disk encryption test description scripts: qemu: Enable disk encryption test scripts/qemu/100-disk-encryption.t | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH] maint: update to latest gnulib
by Ján Tomko 02 Jan '20

02 Jan '20

Update to: commit 7d069378921bfa0d7c7198ea177aac0a2440016f Author: Pádraig Brady <P(a)draigBrady.com> CommitDate: 2020-01-01 22:00:28 +0000 md5, sha1, sha256, sha512: support --with-openssl=auto-gpl-compat Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- .gnulib | 2 +- bootstrap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Pushed. diff --git a/.gnulib b/.gnulib index 1f6fb368c0..7d06937892 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 1f6fb368c04919243e2c70f2aa514a5f88e95309 +Subproject commit 7d069378921bfa0d7c7198ea177aac0a2440016f diff --git a/bootstrap b/bootstrap index 5b08e7e2d4..70fd73cc74 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2019-01-04.17; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2019 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -166,7 +166,7 @@ bootstrap_epilogue() { :; } # specified directory. Fill in the first %s with the destination # directory and the second with the domain name. po_download_command_format=\ -"wget --mirror --level=1 -nd -q -A.po -P '%s' \ +"wget --mirror --level=1 -nd -nv -A.po -P '%s' \ https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else -- 2.19.2

1 0

[libvirt] [PATCH] storage: Fix volStorageBackendRBDRefreshVolInfo
by Yi Li 24 Dec '19

24 Dec '19

Fix the return value status comparison checking for call to volStorageBackendRBDRefreshVolInfo introduced by commit id f46d137e. we only should fail when the return is < 0. -ENOENT, -ETIMEDOUT will ignore according commit id f46d137e. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_backend_rbd.c | 40 ++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 7ce26ed..1551cf4 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -411,6 +411,7 @@ volStorageBackendRBDGetFeatures(rbd_image_t image, int r, ret = -1; if ((r = rbd_get_features(image, features)) < 0) { + ret = r; virReportSystemError(-r, _("failed to get the features of RBD image " "%s"), volname); goto cleanup; @@ -427,16 +428,19 @@ volStorageBackendRBDGetFlags(rbd_image_t image, const char *volname, uint64_t *flags) { - int rc; + int r, ret = -1; - if ((rc = rbd_get_flags(image, flags)) < 0) { - virReportSystemError(-rc, + if ((r = rbd_get_flags(image, flags)) < 0) { + ret = r; + virReportSystemError(-r, _("failed to get the flags of RBD image %s"), volname); - return -1; + goto cleanup; } + ret = 0; - return 0; + cleanup: + return ret; } static bool @@ -470,6 +474,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, if ((r = rbd_diff_iterate2(image, NULL, 0, info->size, 0, 1, &virStorageBackendRBDRefreshVolInfoCb, &allocation)) < 0) { + ret = r; virReportSystemError(-r, _("failed to iterate RBD image '%s'"), vol->name); goto cleanup; @@ -525,24 +530,28 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, uint64_t flags; if ((r = rbd_open_read_only(ptr->ioctx, vol->name, &image, NULL)) < 0) { - ret = -r; + ret = r; virReportSystemError(-r, _("failed to open the RBD image '%s'"), vol->name); goto cleanup; } if ((r = rbd_stat(image, &info, sizeof(info))) < 0) { - ret = -r; + ret = r; virReportSystemError(-r, _("failed to stat the RBD image '%s'"), vol->name); goto cleanup; } - if (volStorageBackendRBDGetFeatures(image, vol->name, &features) < 0) + if ((r = volStorageBackendRBDGetFeatures(image, vol->name, &features)) < 0) { + ret = r; goto cleanup; + } - if (volStorageBackendRBDGetFlags(image, vol->name, &flags) < 0) + if ((r = volStorageBackendRBDGetFlags(image, vol->name, &flags)) < 0) { + ret = r; goto cleanup; + } vol->target.capacity = info.size; vol->type = VIR_STORAGE_VOL_NETWORK; @@ -555,8 +564,11 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, "Querying for actual allocation", def->source.name, vol->name); - if (virStorageBackendRBDSetAllocation(vol, image, &info) < 0) + if ((r = virStorageBackendRBDSetAllocation(vol, image, &info) < 0)) { + ret = r; goto cleanup; + } + } else { vol->target.allocation = info.obj_size * info.num_objs; } @@ -734,12 +746,10 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) * * Do not error out and simply ignore the volume */ - if (r < 0) { - if (r == -ENOENT || r == -ETIMEDOUT) - continue; - + if (r == -ENOENT || r == -ETIMEDOUT) + continue; + else if (r < 0) goto cleanup; - } if (virStoragePoolObjAddVol(pool, vol) < 0) goto cleanup; -- 2.7.5

3 7

[libvirt] [go-xml PATCH 0/2] Fix libvirt-go-xml test CI
by Cole Robinson 23 Dec '19

23 Dec '19

Patch 1 is a nearby 'fix' Patch 2 fixes the CI for the new address type='unassigned' Cole Robinson (2): Fix virtio-s390 address lookup Support domain address type='unassigned' domain.go | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) -- 2.23.0

2 5

[libvirt] [jenkins-ci PATCH] guests: update FreeBSD to use py37 packages
by Daniel P. Berrangé 23 Dec '19

23 Dec '19

The base python3 package was updated to python 3.7.5, so we must update all the modules to match this version. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index ef4e17a..7b97546 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -160,7 +160,7 @@ mappings: flake8: deb: flake8 - pkg: py36-flake8 + pkg: py37-flake8 rpm: python3-flake8 CentOS7: @@ -824,14 +824,14 @@ mappings: python3-docutils: default: python3-docutils CentOS7: python36-docutils - FreeBSD: py36-docutils + FreeBSD: py37-docutils python3: default: python3 python3-dbus: default: python3-dbus - FreeBSD: py36-dbus + FreeBSD: py37-dbus CentOS7: python36-dbus python3-devel: @@ -843,24 +843,24 @@ mappings: python3-gi: deb: python3-gi - pkg: py36-gobject3 + pkg: py37-gobject3 rpm: python3-gobject CentOS7: python36-gobject python3-libxml2: default: python3-libxml2 - FreeBSD: py36-libxml2 + FreeBSD: py37-libxml2 CentOS7: Ubuntu1604: python3-lxml: default: python3-lxml - FreeBSD: py36-lxml + FreeBSD: py37-lxml CentOS7: python36-lxml python3-nose: default: python3-nose - FreeBSD: py36-nose + FreeBSD: py37-nose CentOS7: python36-nose python3-pip: @@ -871,17 +871,17 @@ mappings: python3-pytest: default: python3-pytest - FreeBSD: py36-pytest + FreeBSD: py37-pytest CentOS7: python36-pytest python3-requests: default: python3-requests - FreeBSD: py36-requests + FreeBSD: py37-requests CentOS7: python36-requests python3-setuptools: default: python3-setuptools - FreeBSD: py36-setuptools + FreeBSD: py37-setuptools qemu-img: default: qemu-utils -- 2.23.0

1 1

[libvirt] [PATCH] docs/auth.html.in: fixed typos
by Andrew Miloradovsky 23 Dec '19

23 Dec '19

Signed-off-by: Andrew Miloradovsky <andrew(a)interpretmath.pw> --- docs/auth.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index 62af43a915..c81c1e58ad 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -274,7 +274,7 @@ to turn on SASL auth in these listeners. Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a -config change is rquired to enable plain password auth. This is done by +config change is required to enable plain password auth. This is done by editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code> parameter to <code>scram-sha-1</code>. @@ -317,7 +317,7 @@ in these scenarios - only the plain TCP listener needs encryption Some operating systems do not install the SASL kerberos plugin by default. It may be necessary to install a sub-package such as <code>cyrus-sasl-gssapi</code>. To check whether the Kerberos plugin is installed run the <code>pluginviewer</code> -program and verify that <code>gssapi</code> is listed,eg: +program and verify that <code>gssapi</code> is listed, e.g.: <pre> # pluginviewer @@ -359,7 +359,7 @@ kadmin.local: quit Any client application wishing to connect to a Kerberos enabled libvirt server merely needs to run <code>kinit</code> to gain a user principal. This may well -be done automatically when a user logs into a desktop session, if PAM is setup +be done automatically when a user logs into a desktop session, if PAM is set up to authenticate against Kerberos. </body> -- 2.24.0

2 1

[libvirt] [PATCH] gconfig: Add GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_QEMU_XHCI
by Felipe Borges 23 Dec '19

23 Dec '19

Modern operating systems support qemu-xhci and that's available since libvirt 3.3.x and qemu 2.9.x Signed-off-by: Felipe Borges <feborges(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.h b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.h index d593764..3f93d7c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.h @@ -65,7 +65,8 @@ typedef enum { GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_ICH9_UHCI2, GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_ICH9_UHCI3, GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_VT82C686B_UHCI, - GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_PCI_OHCI + GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_PCI_OHCI, + GVIR_CONFIG_DOMAIN_CONTROLLER_USB_MODEL_QEMU_XHCI } GVirConfigDomainControllerUsbModel; GType gvir_config_domain_controller_usb_get_type(void); -- 2.24.1

2 1

[libvirt] [PATCH 0/5] Get rid of "no_memory" labels
by Fabiano Fidêncio 23 Dec '19

23 Dec '19

As pointed out by Ján Tomko, "no_memory seems suspicious in the times of abort()". As libvirt decided to take the path to not report OOM and simply abort when it happens, let's get rid of the no_memory labels and simplify the code around them. The two exceptions are: - phyp code, as libvirt may end up dropping this code entirely; - virfirewall.c code, as it seems we heavily really on firewall->err being set to ENOMEM; If one thinks that virfirewall.c should also be converted, please, shout out and I'll work on that. Fabiano Fidêncio (5): conf: Get rid of "no_memory" labels openvz: Get rid of "no_memory" labels rpc: Get rid of "no_memory" labels util: Get rid of "no_memory" labels vbox: Get rid of "no_memory" labels src/conf/capabilities.c | 16 ++-------- src/conf/domain_audit.c | 40 +++++++------------------ src/openvz/openvz_conf.c | 18 +++++------ src/rpc/virnetclient.c | 42 ++++++++------------------ src/util/virsysinfo.c | 64 +++++++++++++++------------------------- src/util/virsysinfo.h | 2 ++ src/util/viruri.c | 28 +++++++----------- src/vbox/vbox_common.c | 20 +++++-------- 8 files changed, 75 insertions(+), 155 deletions(-) -- 2.24.1

3 7

[libvirt] [PATCH] storage: Fix daemon crash on lookup storagepool by targetpath
by Yi Li 22 Dec '19

22 Dec '19

Causing a crash when storagePoolLookupByTargetPath because of Some types of storage pool have no target elements. Core was generated by `/usr/sbin/libvirtd'. Program terminated with signal 11, Segmentation fault. (gdb) bt 0 0x0000ffff9e951388 in strcmp () from /lib64/libc.so.6 1 0x0000ffff92103e9c in storagePoolLookupByTargetPathCallback ( obj=0xffff7009aab0, opaque=0xffff801058b0) at storage/storage_driver.c:1649 2 0x0000ffff9f2c52a4 in virStoragePoolObjListSearchCb ( payload=0xffff801058b0, name=<optimized out>, opaque=<optimized out>) at conf/virstorageobj.c:476 3 0x0000ffff9f1f2f7c in virHashSearch (ctable=0xffff800f4f60, iter=iter@entry=0xffff9f2c5278 <virStoragePoolObjListSearchCb>, data=data@entry=0xffff95af7488, name=name@entry=0x0) at util/virhash.c:696 4 0x0000ffff9f2c64f0 in virStoragePoolObjListSearch (pools=0xffff800f2ce0, searcher=searcher@entry=0xffff92103e68 <storagePoolLookupByTargetPathCallback>, opaque=<optimized out>) at conf/virstorageobj.c:505 5 0x0000ffff92101f54 in storagePoolLookupByTargetPath (conn=0xffff5c0009f0, path=0xffff7009a850 "/vms/images") at storage/storage_driver.c:1672 Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a33328d..5863e1f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1713,6 +1713,12 @@ storagePoolLookupByTargetPathCallback(virStoragePoolObjPtr obj, return false; def = virStoragePoolObjGetDef(obj); + + /* Some Storage pool types have no Target elements, + * so we should check it. */ + if (def->target.path == NULL) + return false; + return STREQ(path, def->target.path); } -- 2.7.5

2 3

Re: [libvirt] Add support for vhost-user-scsi-pci/vhost-user-blk-pci
by Cole Robinson 22 Dec '19

22 Dec '19

FYI there's some more recent discussion over here: https://www.redhat.com/archives/libvir-list/2019-December/msg00817.html There isn't any objections to using <disk type='vhostuser'/> for vhost-user-blk, so maybe that's a good place to start. Thanks, Cole On 10/15/19 7:34 AM, Li Feng wrote: > Cole Robinson <crobinso(a)redhat.com> 于2019年10月15日周二上午1:48写道： >> >> On 10/14/19 3:12 AM, Li Feng wrote: >>> Hi Cole & Michal, >>> >>> I'm sorry for my late response, I just end my journey today. >>> Thank your response, your suggestion is very helpful to me. >>> >>> I have added Michal in this mail, Michal helps me review my initial patchset. >>> (https://www.spinics.net/linux/fedora/libvir/msg191339.html) >>> >> >> Whoops I missed that posting, I didn't realize you had sent patches! >> >>> All concern about this feature is the XML design. >>> My original XML design exposes more details of Qemu. >>> >>> <vhost-user-blk-pci type='unix'> >>> <source type='bind' path='/tmp/vhost-blk.sock'> >>> <reconnect enabled='yes' timeout='5' /> >>> </source> >>> <queue num='4'/> >>> </vhost-user-blk-pci> >>> >>> As Cole's suggestion, the better design with all vhost-user-scsi/blk >>> features would like this: >>> >>> vhost-user-blk: >>> >>> <disk type='vhostuser' device='disk'> >>> <source type='unix' path='/path/to/vhost-user-blk.sock' mode='client'> >>> <reconnect enabled='yes' timeout='5' /> >>> </source> >>> <target dev='vda' bus='virtio'/> >>> <queue num='4'/> >>> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> >>> </disk> >>> >>> vhost-user-scsi: >>> >>> <disk type='vhostuser' device='disk'> >>> <source type='unix' path='/path/to/vhost-user-scsi.sock' mode='client'> >>> <reconnect enabled='yes' timeout='5' /> >>> </source> >>> <target dev='sda' bus='scsi'/> >>> <queue num='4'/> >>> </disk> >>> >> >> I think my SCSI idea is wrong, sorry. vhost-user-scsi is for passing a >> scsi host adapter to the VM, correct? If so, then it's not really a >> <disk>, and so using the existing vhost-scsi support in <hostdev> is >> probably better. <hostdev> could possible be used for vhost-user-blk as well >> >> Can you provide some examples of full qemu command lines using >> vhost-user-blk and vhost-user-scsi? Just linking to examples else where >> is fine, but I'm wondering if there's more context > > You could check the vhost-user-scsi/blk examples from SPDK pages: > https://spdk.io/doc/vhost.html > >> >> Internally we already have an abstraction for vhost-scsi: >> >> <hostdev mode='subsystem' type='scsi_host'> >> <source protocol='vhost' wwpn='XXX'/> >> </hostdev> >> >> >> The obvious extension would be >> >> <hostdev mode='subsystem' type='scsi_host'> >> <source protocol='vhostuser' type='unix' >> path='/path/to/vhost-user-scsi.sock' mode='client'/> >> </hostdev> >> >> Internally implementing this will be weird. The <source> parameters are >> only dictated by the hostdev type= field, but in this case they would be >> dictated by the <source protocol=> field, and we would want to reuse the >> internal chardev abstraction. >> >> vhost-user-blk could be implemented similarly, but with type='storage' >> which is the way we pass through block devices to LXC guests, but it >> isn't currently supported in the qemu driver. >> >> I dunno. Maybe Michal or danpb can provide guidance >> > @Michal, @danpb, could you give some guidance? >> >>> Conclusion: >>> 1. Add new type(vhostuser) for disk label; >>> 2. Add queue sub-label for disk to support multiqueue(<queue >>> num='4'/>) or reusing the driver label >>> (<driver name='vhostuser' queues='4'), which one is better? >>> Qemu support multiqueue like this: >>> -device vhost-user-scsi-pci,id=scsi0,chardev=spdk_vhost_scsi0,num_queues=4 >>> -device vhost-user-blk-pci,chardev=spdk_vhost_blk0,num-queues=4 >>> >> >> num-queues is already supported by libvirt for both <disk> and <hostdev> >> with <driver queues=X/>, so whether we use <disk> or <hostdev> you won't >> need to add any new XML here. > Got it. > >> >>> Another question: >>> When qemu is connecting to a vhost-user-scsi controller[1], there may >>> exist multiple LUNs under one target, >>> then one disklabel(<disk/>) will represent multiple SCSI LUNs, >>> the 'dev' property(<target dev='sda' bus='scsi'/>) will be ignored, right? >>> In other words, for vhost-user-scsi disk, it more likes a controller, >>> maybe the controller label is suitable. >>> >> >> Yes you are right, and this was my understanding. But then its not >> really a <controller> in libvirt's sense because we can't attach >> emulated devices to it, so it's more a fit for the existing <hostdev> >> vhost-user support. Unfortunately it's not really a clean fit anywhere, >> there will have to be some kind of compromise. And I'm not sure if >> <disk> or <hostdev> is right for vhost-user-blk, but hopefully others >> have more clear opinions. > > I'm also confused about it. > Thanks for your reply. > > Thanks, > Feng Li > >> >> Thanks, >> Cole >> >>> I look forward to hearing from you as soon as possible. >>> >>> [1]: https://spdk.io/doc/vhost.html >>> >>> Feng Li >>> >>> Cole Robinson <crobinso(a)redhat.com> 于2019年10月10日周四上午6:48写道： >>>> >>>> Sorry for the late reply, and thanks Jano for pointing out elsewhere >>>> that this didn't receive a response. >>>> >>>> On 8/12/19 5:56 AM, Li Feng wrote: >>>>> Hi Guys, >>>>> >>>>> And I want to add the vhost-user-scsi-pci/vhost-user-blk-pci support >>>>> for libvirt. >>>>> >>>>> The usage in qemu like this: >>>>> >>>>> Vhost-SCSI >>>>> -chardev socket,id=char0,path=/var/tmp/vhost.0 >>>>> -device vhost-user-scsi-pci,id=scsi0,chardev=char0 >>>>> Vhost-BLK >>>>> -chardev socket,id=char1,path=/var/tmp/vhost.1 >>>>> -device vhost-user-blk-pci,id=blk0,chardev=char1 >>>>> >>>> >>>> Indeed that matches what I see for the qemu commits too: >>>> >>>> https://git.qemu.org/?p=qemu.git;a=commit;h=00343e4b54b >>>> https://git.qemu.org/?p=qemu.git;a=commit;h=f12c1ebddf7 >>>> >>>>> What type should I add for libvirt. >>>>> Type1: >>>>> <hostdev mode='subsystem' type='vhost-user'> >>>>> <source protocol='vhost-user-scsi' path='/tmp/vhost-scsi.sock'></source> >>>>> <alias name="vhost-user-scsi-disk1"/> >>>>> </hostdev> >>>>> >>>>> >>>>> Type2: >>>>> >>>>> <disk type='network' device='disk'> >>>>> <driver name='qemu' type='raw' cache='none' io='native'/> >>>>> <source protocol='vhost-user' path='/tmp/vhost-scsi.sock'> >>>>> </source> >>>>> <target dev='sdb' bus='vhost-user-scsi'/> >>>>> <boot order='3'/> >>>>> <alias name='scsi0-0-0-1'/> >>>>> <address type='drive' controller='0' bus='0' target='0' unit='1'/> >>>>> </disk> >>>>> >>>>> >>>>> <disk type='network' device='disk'> >>>>> <driver name='qemu' type='raw' cache='none' io='native'/> >>>>> <source protocol='vhost-user' path='/tmp/vhost-blk.sock'> >>>>> </source> >>>>> <target dev='vda' bus='vhost-user-blk'/> >>>>> <boot order='1'/> >>>>> <alias name='virtio-disk0'/> >>>>> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' >>>>> function='0x0'/> >>>>> </disk> >>>>> >>>> >>>> I think wiring this into <disk> makes more sense. <hostdev> is really an >>>> abstraction for assigning a (typically) physical host device to the VM, >>>> so it handles things like hiding a PCI device from the host, and passing >>>> that exact device to the VM. >>>> >>>> In the vhost-user-scsi/blk case, the host device is just a special >>>> process running on the other side of a socket, and the device >>>> represented to the guest is a typical virtio device. So to me it makes >>>> more sense as a <disk> with a <source> that points at that socket. >>>> >>>> target bus=virtio vs bus=scsi is already used to distinguish between >>>> virtio-blk and virtio-scsi, so I think we can keep that bit as is, with >>>> the <address type=drive|pci> to match. We just need to differentiate >>>> between plain virtio and vhost-user >>>> >>>> network devices already have vhostuser support: >>>> >>>> <interface type='vhostuser'> >>>> <source type='unix' path='/tmp/vhost1.sock' mode='server|client'/> >>>> <model type='virtio'/> >>>> </interface> >>>> >>>> Internally that <source> is a virDomainChrSourceDefPtr which is our >>>> internal representation of a chardev. So I think something akin to this >>>> is the way to go. It will likely require updating a LOT of places in the >>>> code that check disk type= field, probably most places that care about >>>> whether type=NETWORK or type=!NETWORK will need to be mirrored for the >>>> new type. >>>> >>>> <disk type='vhostuser' device='disk'> >>>> <source type='unix' path='/path/to/vhost-user-blk.sock' mode='client'/> >>>> <target dev='vda' bus='virtio'/> >>>> </disk> >>>> >>>> <disk type='vhostuser' device='disk'> >>>> <source type='unix' path='/path/to/vhost-user-scsi.sock' mode='client'/> >>>> <target dev='sda' bus='scsi'/> >>>> </disk> >>>> >>>> - Cole >>> >> >> >> - Cole > - Cole

1 0