mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu: Detect pr-manager-helper capability
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
eba6467fed
commit
b0cd8045f0
@ -1102,6 +1102,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|||||||
{ "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
|
{ "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
|
||||||
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
|
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
|
||||||
{ "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
|
{ "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
|
||||||
|
{ "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
|
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
|
||||||
|
@ -119,6 +119,7 @@
|
|||||||
<flag name='seccomp-blacklist'/>
|
<flag name='seccomp-blacklist'/>
|
||||||
<flag name='disk-write-cache'/>
|
<flag name='disk-write-cache'/>
|
||||||
<flag name='nbd-tls'/>
|
<flag name='nbd-tls'/>
|
||||||
|
<flag name='pr-manager-helper'/>
|
||||||
<version>2011000</version>
|
<version>2011000</version>
|
||||||
<kvmVersion>0</kvmVersion>
|
<kvmVersion>0</kvmVersion>
|
||||||
<microcodeVersion>342058</microcodeVersion>
|
<microcodeVersion>342058</microcodeVersion>
|
||||||
|
@ -158,6 +158,7 @@
|
|||||||
<flag name='query-cpus-fast'/>
|
<flag name='query-cpus-fast'/>
|
||||||
<flag name='disk-write-cache'/>
|
<flag name='disk-write-cache'/>
|
||||||
<flag name='nbd-tls'/>
|
<flag name='nbd-tls'/>
|
||||||
|
<flag name='pr-manager-helper'/>
|
||||||
<version>2011090</version>
|
<version>2011090</version>
|
||||||
<kvmVersion>0</kvmVersion>
|
<kvmVersion>0</kvmVersion>
|
||||||
<microcodeVersion>342346</microcodeVersion>
|
<microcodeVersion>342346</microcodeVersion>
|
||||||
|
@ -155,6 +155,7 @@
|
|||||||
<flag name='query-cpus-fast'/>
|
<flag name='query-cpus-fast'/>
|
||||||
<flag name='disk-write-cache'/>
|
<flag name='disk-write-cache'/>
|
||||||
<flag name='nbd-tls'/>
|
<flag name='nbd-tls'/>
|
||||||
|
<flag name='pr-manager-helper'/>
|
||||||
<version>2011090</version>
|
<version>2011090</version>
|
||||||
<kvmVersion>0</kvmVersion>
|
<kvmVersion>0</kvmVersion>
|
||||||
<microcodeVersion>419215</microcodeVersion>
|
<microcodeVersion>419215</microcodeVersion>
|
||||||
|
@ -120,6 +120,7 @@
|
|||||||
<flag name='query-cpus-fast'/>
|
<flag name='query-cpus-fast'/>
|
||||||
<flag name='disk-write-cache'/>
|
<flag name='disk-write-cache'/>
|
||||||
<flag name='nbd-tls'/>
|
<flag name='nbd-tls'/>
|
||||||
|
<flag name='pr-manager-helper'/>
|
||||||
<version>2011090</version>
|
<version>2011090</version>
|
||||||
<kvmVersion>0</kvmVersion>
|
<kvmVersion>0</kvmVersion>
|
||||||
<microcodeVersion>0</microcodeVersion>
|
<microcodeVersion>0</microcodeVersion>
|
||||||
|
@ -196,6 +196,7 @@
|
|||||||
<flag name='disk-write-cache'/>
|
<flag name='disk-write-cache'/>
|
||||||
<flag name='nbd-tls'/>
|
<flag name='nbd-tls'/>
|
||||||
<flag name='tpm-crb'/>
|
<flag name='tpm-crb'/>
|
||||||
|
<flag name='pr-manager-helper'/>
|
||||||
<version>2011090</version>
|
<version>2011090</version>
|
||||||
<kvmVersion>0</kvmVersion>
|
<kvmVersion>0</kvmVersion>
|
||||||
<microcodeVersion>390060</microcodeVersion>
|
<microcodeVersion>390060</microcodeVersion>
|
||||||
|
@ -5,14 +5,17 @@ USER=test \
|
|||||||
LOGNAME=test \
|
LOGNAME=test \
|
||||||
QEMU_AUDIO_DRV=none \
|
QEMU_AUDIO_DRV=none \
|
||||||
/usr/bin/qemu-system-i686 \
|
/usr/bin/qemu-system-i686 \
|
||||||
-name QEMUGuest1 \
|
-name guest=QEMUGuest1,debug-threads=on \
|
||||||
-S \
|
-S \
|
||||||
|
-object secret,id=masterKey0,format=raw,\
|
||||||
|
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||||
-object pr-manager-helper,id=pr-helper0,\
|
-object pr-manager-helper,id=pr-helper0,\
|
||||||
path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
|
path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
|
||||||
-object pr-manager-helper,id=pr-helper-scsi0-0-0-1,\
|
-object pr-manager-helper,id=pr-helper-scsi0-0-0-1,\
|
||||||
path=/path/to/qemu-pr-helper.sock \
|
path=/path/to/qemu-pr-helper.sock \
|
||||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
|
||||||
-m 214 \
|
-m 214 \
|
||||||
|
-realtime mlock=off \
|
||||||
-smp 8,sockets=8,cores=1,threads=1 \
|
-smp 8,sockets=8,cores=1,threads=1 \
|
||||||
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||||
-display none \
|
-display none \
|
||||||
@ -24,15 +27,18 @@ server,nowait \
|
|||||||
-rtc base=utc \
|
-rtc base=utc \
|
||||||
-no-shutdown \
|
-no-shutdown \
|
||||||
-no-acpi \
|
-no-acpi \
|
||||||
-boot c \
|
-boot strict=on \
|
||||||
|
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
|
||||||
-device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \
|
-device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \
|
||||||
-usb \
|
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,file.pr-manager=pr-helper0,format=raw,\
|
-drive file=/dev/HostVG/QEMUGuest1,file.pr-manager=pr-helper0,format=raw,\
|
||||||
if=none,id=drive-scsi0-0-0-0,boot=on \
|
if=none,id=drive-scsi0-0-0-0 \
|
||||||
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=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 \
|
drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
|
||||||
-drive file=/dev/HostVG/QEMUGuest2,file.pr-manager=pr-helper-scsi0-0-0-1,\
|
-drive file=/dev/HostVG/QEMUGuest2,file.pr-manager=pr-helper-scsi0-0-0-1,\
|
||||||
format=raw,if=none,id=drive-scsi0-0-0-1 \
|
format=raw,if=none,id=drive-scsi0-0-0-1 \
|
||||||
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\
|
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\
|
||||||
drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
|
drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
|
||||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
|
||||||
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||||
|
resourcecontrol=deny \
|
||||||
|
-msg timestamp=on
|
@ -2801,9 +2801,7 @@ mymain(void)
|
|||||||
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
|
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
|
||||||
QEMU_CAPS_ICH9_USB_EHCI1);
|
QEMU_CAPS_ICH9_USB_EHCI1);
|
||||||
|
|
||||||
DO_TEST("disk-virtio-scsi-reservations",
|
DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
|
||||||
QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI,
|
|
||||||
QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER);
|
|
||||||
|
|
||||||
/* Test disks with format probing enabled for legacy reasons.
|
/* Test disks with format probing enabled for legacy reasons.
|
||||||
* New tests should not go in this section. */
|
* New tests should not go in this section. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user