mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
qemu_command: add support to use virtio as secondary video device
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1369633 Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
ac987148a8
commit
fb8f3b1c22
@ -5641,7 +5641,8 @@ qemu-kvm -net nic,model=? /dev/null
|
|||||||
video device in domain xml is the primary one, but the optional
|
video device in domain xml is the primary one, but the optional
|
||||||
attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
|
attribute <code>primary</code> (<span class="since">since 1.0.2</span>)
|
||||||
with value 'yes' can be used to mark the primary in cases of multiple
|
with value 'yes' can be used to mark the primary in cases of multiple
|
||||||
video device. The non-primary must be type of "qxl".
|
video device. The non-primary must be type of "qxl" or
|
||||||
|
(<span class="since">since 2.4.0</span>) "virtio".
|
||||||
</p>
|
</p>
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
|
@ -2421,7 +2421,8 @@ qemuDomainDefValidateVideo(const virDomainDef *def)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!video->primary &&
|
if (!video->primary &&
|
||||||
video->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
|
video->type != VIR_DOMAIN_VIDEO_TYPE_QXL &&
|
||||||
|
video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
_("video type '%s' is only valid as primary "
|
_("video type '%s' is only valid as primary "
|
||||||
"video device"),
|
"video device"),
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
LC_ALL=C \
|
||||||
|
PATH=/bin \
|
||||||
|
HOME=/home/test \
|
||||||
|
USER=test \
|
||||||
|
LOGNAME=test \
|
||||||
|
QEMU_AUDIO_DRV=none \
|
||||||
|
/usr/bin/qemu \
|
||||||
|
-name QEMUGuest1 \
|
||||||
|
-S \
|
||||||
|
-M pc \
|
||||||
|
-m 1024 \
|
||||||
|
-smp 1,sockets=1,cores=1,threads=1 \
|
||||||
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||||
|
-nographic \
|
||||||
|
-nodefaults \
|
||||||
|
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
|
||||||
|
-no-acpi \
|
||||||
|
-boot c \
|
||||||
|
-usb \
|
||||||
|
-device virtio-gpu-pci,id=video0,bus=pci.0,addr=0x2 \
|
||||||
|
-device virtio-gpu-pci,id=video1,bus=pci.0,addr=0x4 \
|
||||||
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
@ -0,0 +1,27 @@
|
|||||||
|
<domain type='qemu'>
|
||||||
|
<name>QEMUGuest1</name>
|
||||||
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||||
|
<memory unit='KiB'>1048576</memory>
|
||||||
|
<currentMemory unit='KiB'>1048576</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os>
|
||||||
|
<type arch='x86_64' machine='pc'>hvm</type>
|
||||||
|
</os>
|
||||||
|
<clock offset='utc'/>
|
||||||
|
<on_poweroff>destroy</on_poweroff>
|
||||||
|
<on_reboot>restart</on_reboot>
|
||||||
|
<on_crash>destroy</on_crash>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu</emulator>
|
||||||
|
<controller type='pci' index='0' model='pci-root'/>
|
||||||
|
<input type='mouse' bus='ps2'/>
|
||||||
|
<input type='keyboard' bus='ps2'/>
|
||||||
|
<video>
|
||||||
|
<model type='virtio' heads='1' primary='yes'/>
|
||||||
|
</video>
|
||||||
|
<video>
|
||||||
|
<model type='virtio' heads='1'/>
|
||||||
|
</video>
|
||||||
|
<memballoon model='virtio'/>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
@ -1616,6 +1616,9 @@ mymain(void)
|
|||||||
QEMU_CAPS_SPICE,
|
QEMU_CAPS_SPICE,
|
||||||
QEMU_CAPS_SPICE_GL,
|
QEMU_CAPS_SPICE_GL,
|
||||||
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
||||||
|
DO_TEST("video-virtio-gpu-secondary",
|
||||||
|
QEMU_CAPS_DEVICE_VIRTIO_GPU,
|
||||||
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
||||||
DO_TEST("video-virtio-vga",
|
DO_TEST("video-virtio-vga",
|
||||||
QEMU_CAPS_DEVICE_VIRTIO_GPU,
|
QEMU_CAPS_DEVICE_VIRTIO_GPU,
|
||||||
QEMU_CAPS_DEVICE_VIRTIO_VGA,
|
QEMU_CAPS_DEVICE_VIRTIO_VGA,
|
||||||
|
@ -0,0 +1,35 @@
|
|||||||
|
<domain type='qemu'>
|
||||||
|
<name>QEMUGuest1</name>
|
||||||
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||||
|
<memory unit='KiB'>1048576</memory>
|
||||||
|
<currentMemory unit='KiB'>1048576</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os>
|
||||||
|
<type arch='x86_64' 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</emulator>
|
||||||
|
<controller type='pci' index='0' model='pci-root'/>
|
||||||
|
<controller type='usb' index='0'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<input type='mouse' bus='ps2'/>
|
||||||
|
<input type='keyboard' bus='ps2'/>
|
||||||
|
<video>
|
||||||
|
<model type='virtio' heads='1' primary='yes'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
||||||
|
</video>
|
||||||
|
<video>
|
||||||
|
<model type='virtio' heads='1'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
||||||
|
</video>
|
||||||
|
<memballoon model='virtio'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
||||||
|
</memballoon>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
@ -876,6 +876,7 @@ mymain(void)
|
|||||||
|
|
||||||
DO_TEST("video-qxl-heads", NONE);
|
DO_TEST("video-qxl-heads", NONE);
|
||||||
DO_TEST("video-qxl-noheads", NONE);
|
DO_TEST("video-qxl-noheads", NONE);
|
||||||
|
DO_TEST("video-virtio-gpu-secondary", NONE);
|
||||||
|
|
||||||
DO_TEST("intel-iommu",
|
DO_TEST("intel-iommu",
|
||||||
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
|
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
|
||||||
|
Loading…
Reference in New Issue
Block a user