Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 e559bf38 编写于 作者: J Ján Tomko
浏览文件
操作

qemu: deprecate QEMU_CAPS_FSDEV 

Implied by QEMU >= 1.2.0.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 8b66c1bc
隐藏空白更改
内联 并排
Showing with 2 addition and 48 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ e559bf38
......@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
......
src/qemu/qemu_capabilities.h
浏览文件 @ e559bf38
......@@ -104,7 +104,7 @@ typedef enum {
X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
/* 40 */
QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
......
src/qemu/qemu_command.c
浏览文件 @ e559bf38
......@@ -2461,12 +2461,6 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd,
{
size_t i;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV) && def->nfss) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("filesystem passthrough not supported by this QEMU"));
return -1;
}
for (i = 0; i < def->nfss; i++) {
char *optstr;
virDomainFSDefPtr fs = def->fss[i];
......
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='enable-kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
浏览文件 @ e559bf38
......@@ -4,7 +4,6 @@
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='vga-none'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
浏览文件 @ e559bf38
......@@ -7,7 +7,6 @@
<flag name='no-hpet'/>
<flag name='no-kvm-pit'/>
<flag name='pci-configfd'/>
<flag name='fsdev'/>
<flag name='name-process'/>
<flag name='smbios-type'/>
<flag name='spice'/>
......
tests/qemuxml2argvtest.c
浏览文件 @ e559bf38
......@@ -1493,10 +1493,8 @@ mymain(void)
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
QEMU_CAPS_OBJECT_USB_AUDIO);
DO_TEST("fs9p",
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT);
DO_TEST("fs9p-ccw",
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
......@@ -2072,7 +2070,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2096,7 +2093,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2118,7 +2114,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2139,7 +2134,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2160,7 +2154,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2186,7 +2179,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -2771,7 +2763,7 @@ mymain(void)
DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYBOARD,
QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_VIRTIO_GPU_VIRGL,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
......
tests/qemuxml2xmltest.c
浏览文件 @ e559bf38
......@@ -740,7 +740,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -762,7 +761,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -784,7 +782,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -805,7 +802,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -826,7 +822,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......@@ -851,7 +846,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_TABLET,
QEMU_CAPS_VIRTIO_INPUT_HOST,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_FSDEV,
QEMU_CAPS_FSDEV_WRITEOUT,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或