forked from rpms/libvirt
import libvirt-6.0.0-28.1.module+el8.3.0+10448+0c705bc6
This commit is contained in:
parent
30b580dcad
commit
6caad9cd0d
313
SOURCES/libvirt-qemu-Add-virtio-related-options-to-vsock.patch
Normal file
313
SOURCES/libvirt-qemu-Add-virtio-related-options-to-vsock.patch
Normal file
@ -0,0 +1,313 @@
|
||||
From 1b084c7ff54f1bb36c9e0dee3e1c86a250f3d6af Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <1b084c7ff54f1bb36c9e0dee3e1c86a250f3d6af@dist-git>
|
||||
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Date: Tue, 23 Mar 2021 10:25:46 +0100
|
||||
Subject: [PATCH] qemu: Add virtio related options to vsock
|
||||
|
||||
Add virtio related options iommu, ats and packed as driver element attributes
|
||||
to vsock devices. Ex:
|
||||
|
||||
<vsock model='virtio'>
|
||||
<cid auto='no' address='3'/>
|
||||
<driver iommu='on'/>
|
||||
</vsock>
|
||||
|
||||
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
(cherry picked from commit bd112c9e0f7523b90bf1362cf60deea7db05a32b)
|
||||
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1941820
|
||||
|
||||
Note: since the virtio option packed is not yet available in the code
|
||||
version it will also not be available with this backported patch.
|
||||
|
||||
Conflicts: docs/formatdomain.rst:
|
||||
converted changes into docs/formatdomain.html.in
|
||||
src/conf/domain_conf.c:
|
||||
resolved conflicts by moving the code into the correct methods
|
||||
src/conf/domain_validate.c:
|
||||
does not exist downstream. moved code to src/conf/domain_conf.c
|
||||
src/qemu/qemu_validate.c:
|
||||
does not exist downstream. can be neglected
|
||||
|
||||
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||||
Message-Id: <20210323092546.405902-2-thuth@redhat.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
docs/formatdomain.html.in | 5 ++-
|
||||
docs/schemas/domaincommon.rng | 5 +++
|
||||
src/conf/domain_conf.c | 27 ++++++++++++++
|
||||
src/conf/domain_conf.h | 1 +
|
||||
src/qemu/qemu_command.c | 4 ++
|
||||
.../vhost-vsock-ccw-iommu.s390x-latest.args | 37 +++++++++++++++++++
|
||||
.../vhost-vsock-ccw-iommu.xml | 37 +++++++++++++++++++
|
||||
tests/qemuxml2argvtest.c | 1 +
|
||||
.../vhost-vsock-ccw-iommu.s390x-latest.xml | 1 +
|
||||
tests/qemuxml2xmltest.c | 2 +
|
||||
10 files changed, 119 insertions(+), 1 deletion(-)
|
||||
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
|
||||
create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
|
||||
create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
|
||||
|
||||
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
||||
index 76799f5ffc..c4e4efcde2 100644
|
||||
--- a/docs/formatdomain.html.in
|
||||
+++ b/docs/formatdomain.html.in
|
||||
@@ -9131,7 +9131,10 @@ qemu-kvm -net nic,model=? /dev/null
|
||||
element specifies the CID assigned to the guest. If the attribute
|
||||
<code>auto</code> is set to <code>yes</code>, libvirt
|
||||
will assign a free CID automatically on domain startup.
|
||||
- <span class="since">Since 4.4.0</span></p>
|
||||
+ <span class="since">Since 4.4.0</span>
|
||||
+ The optional <code>driver</code> element allows to specify virtio options, see
|
||||
+ <a href="#elementsVirtio">Virtio-specific options</a> for more details.
|
||||
+ <span class="since">Since 7.1.0</span></p>
|
||||
|
||||
<pre>
|
||||
...
|
||||
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
||||
index 9fda5f17e0..4a42cb9b40 100644
|
||||
--- a/docs/schemas/domaincommon.rng
|
||||
+++ b/docs/schemas/domaincommon.rng
|
||||
@@ -4685,6 +4685,11 @@
|
||||
<optional>
|
||||
<ref name="alias"/>
|
||||
</optional>
|
||||
+ <optional>
|
||||
+ <element name="driver">
|
||||
+ <ref name="virtioOptions"/>
|
||||
+ </element>
|
||||
+ </optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
||||
index 60962ee7c1..4a4cff434b 100644
|
||||
--- a/src/conf/domain_conf.c
|
||||
+++ b/src/conf/domain_conf.c
|
||||
@@ -2392,6 +2392,7 @@ virDomainVsockDefFree(virDomainVsockDefPtr vsock)
|
||||
|
||||
virObjectUnref(vsock->privateData);
|
||||
virDomainDeviceInfoClear(&vsock->info);
|
||||
+ VIR_FREE(vsock->virtio);
|
||||
VIR_FREE(vsock);
|
||||
}
|
||||
|
||||
@@ -6504,6 +6505,15 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem)
|
||||
}
|
||||
|
||||
|
||||
+static bool
|
||||
+virDomainVsockIsVirtioModel(const virDomainVsockDef *vsock)
|
||||
+{
|
||||
+ return (vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO ||
|
||||
+ vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_TRANSITIONAL ||
|
||||
+ vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_NON_TRANSITIONAL);
|
||||
+}
|
||||
+
|
||||
+
|
||||
static int
|
||||
virDomainVsockDefValidate(const virDomainVsockDef *vsock)
|
||||
{
|
||||
@@ -6513,6 +6523,10 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ if (!virDomainVsockIsVirtioModel(vsock) &&
|
||||
+ virDomainCheckVirtioOptions(vsock->virtio) < 0)
|
||||
+ return -1;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -16721,6 +16735,11 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
|
||||
if (virDomainDeviceInfoParseXML(xmlopt, node, &vsock->info, flags) < 0)
|
||||
return NULL;
|
||||
|
||||
+ if (virDomainVirtioOptionsParseXML(virXPathNode("./driver", ctxt),
|
||||
+ &vsock->virtio) < 0)
|
||||
+ return NULL;
|
||||
+
|
||||
+
|
||||
return g_steal_pointer(&vsock);
|
||||
}
|
||||
|
||||
@@ -23401,6 +23420,10 @@ virDomainVsockDefCheckABIStability(virDomainVsockDefPtr src,
|
||||
return false;
|
||||
}
|
||||
|
||||
+ if (src->virtio && dst->virtio &&
|
||||
+ !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
|
||||
+ return false;
|
||||
+
|
||||
if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
|
||||
return false;
|
||||
|
||||
@@ -28410,6 +28433,7 @@ virDomainVsockDefFormat(virBufferPtr buf,
|
||||
g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
|
||||
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
|
||||
g_auto(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER;
|
||||
+ g_auto(virBuffer) drvAttrBuf = VIR_BUFFER_INITIALIZER;
|
||||
|
||||
if (vsock->model) {
|
||||
virBufferAsprintf(&attrBuf, " model='%s'",
|
||||
@@ -28427,6 +28451,9 @@ virDomainVsockDefFormat(virBufferPtr buf,
|
||||
if (virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0) < 0)
|
||||
return -1;
|
||||
|
||||
+ virDomainVirtioOptionsFormat(&drvAttrBuf, vsock->virtio);
|
||||
+
|
||||
+ virXMLFormatElement(&childBuf, "driver", &drvAttrBuf, NULL);
|
||||
virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf);
|
||||
|
||||
return 0;
|
||||
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
||||
index 118077edaa..3aed1fb22a 100644
|
||||
--- a/src/conf/domain_conf.h
|
||||
+++ b/src/conf/domain_conf.h
|
||||
@@ -2389,6 +2389,7 @@ struct _virDomainVsockDef {
|
||||
virTristateBool auto_cid;
|
||||
|
||||
virDomainDeviceInfo info;
|
||||
+ virDomainVirtioOptionsPtr virtio;
|
||||
};
|
||||
|
||||
struct _virDomainVirtioOptions {
|
||||
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
||||
index ed5f60e82e..11e59a67d2 100644
|
||||
--- a/src/qemu/qemu_command.c
|
||||
+++ b/src/qemu/qemu_command.c
|
||||
@@ -9799,6 +9799,10 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
|
||||
virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
|
||||
virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
|
||||
virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
|
||||
+
|
||||
+ if (qemuBuildVirtioOptionsStr(&buf, vsock->virtio, qemuCaps) < 0)
|
||||
+ return NULL;
|
||||
+
|
||||
if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0)
|
||||
return NULL;
|
||||
|
||||
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
|
||||
new file mode 100644
|
||||
index 0000000000..78eede78d3
|
||||
--- /dev/null
|
||||
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
|
||||
@@ -0,0 +1,37 @@
|
||||
+LC_ALL=C \
|
||||
+PATH=/bin \
|
||||
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
||||
+USER=test \
|
||||
+LOGNAME=test \
|
||||
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
||||
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
||||
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
||||
+QEMU_AUDIO_DRV=none \
|
||||
+/usr/bin/qemu-system-s390x \
|
||||
+-name guest=QEMUGuest1,debug-threads=on \
|
||||
+-S \
|
||||
+-object secret,id=masterKey0,format=raw,\
|
||||
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
+-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
||||
+-cpu qemu \
|
||||
+-m 214 \
|
||||
+-overcommit mem-lock=off \
|
||||
+-smp 1,sockets=1,cores=1,threads=1 \
|
||||
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||
+-display none \
|
||||
+-no-user-config \
|
||||
+-nodefaults \
|
||||
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
|
||||
+-mon chardev=charmonitor,id=monitor,mode=control \
|
||||
+-rtc base=utc \
|
||||
+-no-shutdown \
|
||||
+-boot strict=on \
|
||||
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
||||
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
|
||||
+id=virtio-disk0,bootindex=1 \
|
||||
+-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
|
||||
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||
+resourcecontrol=deny \
|
||||
+-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,iommu_platform=on,\
|
||||
+devno=fe.0.0002 \
|
||||
+-msg timestamp=on
|
||||
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
|
||||
new file mode 100644
|
||||
index 0000000000..dbfe082a6f
|
||||
--- /dev/null
|
||||
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.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='s390x' machine='s390-ccw-virtio'>hvm</type>
|
||||
+ <boot dev='hd'/>
|
||||
+ </os>
|
||||
+ <cpu mode='custom' match='exact' check='none'>
|
||||
+ <model fallback='forbid'>qemu</model>
|
||||
+ </cpu>
|
||||
+ <clock offset='utc'/>
|
||||
+ <on_poweroff>destroy</on_poweroff>
|
||||
+ <on_reboot>restart</on_reboot>
|
||||
+ <on_crash>destroy</on_crash>
|
||||
+ <devices>
|
||||
+ <emulator>/usr/bin/qemu-system-s390x</emulator>
|
||||
+ <disk type='block' device='disk'>
|
||||
+ <driver name='qemu' type='raw'/>
|
||||
+ <source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
+ <target dev='hda' bus='virtio'/>
|
||||
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
|
||||
+ </disk>
|
||||
+ <controller type='pci' index='0' model='pci-root'/>
|
||||
+ <memballoon model='virtio'>
|
||||
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
|
||||
+ </memballoon>
|
||||
+ <panic model='s390'/>
|
||||
+ <vsock model='virtio'>
|
||||
+ <cid auto='no' address='4'/>
|
||||
+ <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
|
||||
+ <driver iommu='on'/>
|
||||
+ </vsock>
|
||||
+ </devices>
|
||||
+</domain>
|
||||
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
||||
index ff92af606d..66df797ef2 100644
|
||||
--- a/tests/qemuxml2argvtest.c
|
||||
+++ b/tests/qemuxml2argvtest.c
|
||||
@@ -3054,6 +3054,7 @@ mymain(void)
|
||||
DO_TEST_CAPS_LATEST("vhost-vsock-auto");
|
||||
DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x");
|
||||
DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x");
|
||||
+ DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x");
|
||||
|
||||
DO_TEST_CAPS_VER("launch-security-sev", "2.12.0");
|
||||
|
||||
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
|
||||
new file mode 120000
|
||||
index 0000000000..78971a8ef9
|
||||
--- /dev/null
|
||||
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml
|
||||
@@ -0,0 +1 @@
|
||||
+../qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
|
||||
\ No newline at end of file
|
||||
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
||||
index c8218e423e..0e0097da1b 100644
|
||||
--- a/tests/qemuxml2xmltest.c
|
||||
+++ b/tests/qemuxml2xmltest.c
|
||||
@@ -1429,6 +1429,8 @@ mymain(void)
|
||||
QEMU_CAPS_CCW);
|
||||
DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK,
|
||||
QEMU_CAPS_CCW);
|
||||
+ DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x");
|
||||
+
|
||||
|
||||
DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory");
|
||||
DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages");
|
||||
--
|
||||
2.31.0
|
||||
|
@ -219,7 +219,7 @@
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 6.0.0
|
||||
Release: 28%{?dist}%{?extra_release}
|
||||
Release: 28.1%{?dist}%{?extra_release}
|
||||
License: LGPLv2+
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@ -669,6 +669,7 @@ Patch437: libvirt-virDevMapperGetTargets-Don-t-ignore-EBADF.patch
|
||||
Patch438: libvirt-virdevmapper-Don-t-cache-device-mapper-major.patch
|
||||
Patch439: libvirt-virdevmapper-Handle-kernel-without-device-mapper-support.patch
|
||||
Patch440: libvirt-virdevmapper-Ignore-all-errors-when-opening-dev-mapper-control.patch
|
||||
Patch441: libvirt-qemu-Add-virtio-related-options-to-vsock.patch
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
@ -2445,6 +2446,9 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 23 2021 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-28.1.el8
|
||||
- qemu: Add virtio related options to vsock (rhbz#1941820)
|
||||
|
||||
* Wed Aug 26 2020 Jiri Denemark <jdenemar@redhat.com> - 6.0.0-28
|
||||
- virdevmapper: Don't cache device-mapper major (rhbz#1860421)
|
||||
- virdevmapper: Handle kernel without device-mapper support (rhbz#1860421)
|
||||
|
Loading…
Reference in New Issue
Block a user