mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 02:51:16 +00:00
qemu: capabilities: Retire QEMU_CAPS_NO_ACPI
The capability is based on a platform check rather than what given qemu supports. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
dfc4a9c796
commit
53a8875f59
@ -172,7 +172,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|||||||
|
|
||||||
/* 75 */
|
/* 75 */
|
||||||
"ich9-ahci", /* QEMU_CAPS_ICH9_AHCI */
|
"ich9-ahci", /* QEMU_CAPS_ICH9_AHCI */
|
||||||
"no-acpi", /* QEMU_CAPS_NO_ACPI */
|
"no-acpi", /* X_QEMU_CAPS_NO_ACPI */
|
||||||
"fsdev-readonly", /* X_QEMU_CAPS_FSDEV_READONLY */
|
"fsdev-readonly", /* X_QEMU_CAPS_FSDEV_READONLY */
|
||||||
"virtio-blk-pci.scsi", /* QEMU_CAPS_VIRTIO_BLK_SCSI */
|
"virtio-blk-pci.scsi", /* QEMU_CAPS_VIRTIO_BLK_SCSI */
|
||||||
"blk-sg-io", /* X_QEMU_CAPS_VIRTIO_BLK_SG_IO */
|
"blk-sg-io", /* X_QEMU_CAPS_VIRTIO_BLK_SG_IO */
|
||||||
@ -5475,17 +5475,11 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
|
|||||||
switch (qemuCaps->arch) {
|
switch (qemuCaps->arch) {
|
||||||
case VIR_ARCH_I686:
|
case VIR_ARCH_I686:
|
||||||
case VIR_ARCH_X86_64:
|
case VIR_ARCH_X86_64:
|
||||||
/* ACPI only works on x86 and aarch64 */
|
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
|
|
||||||
|
|
||||||
/* HPET is x86 specific */
|
/* HPET is x86 specific */
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_ARCH_AARCH64:
|
case VIR_ARCH_AARCH64:
|
||||||
/* ACPI only works on x86 and aarch64 */
|
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
|
|
||||||
|
|
||||||
/* gic is arm specific */
|
/* gic is arm specific */
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
|
||||||
break;
|
break;
|
||||||
|
@ -150,7 +150,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|||||||
|
|
||||||
/* 75 */
|
/* 75 */
|
||||||
QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
|
QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
|
||||||
QEMU_CAPS_NO_ACPI, /* -no-acpi */
|
X_QEMU_CAPS_NO_ACPI, /* -no-acpi */
|
||||||
X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
|
X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */
|
||||||
QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
|
QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */
|
||||||
X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */
|
X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
<flag name='pci-ohci'/>
|
<flag name='pci-ohci'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
<flag name='pci-ohci'/>
|
<flag name='pci-ohci'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
<flag name='pci-ohci'/>
|
<flag name='pci-ohci'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
<flag name='pci-ohci'/>
|
<flag name='pci-ohci'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
<flag name='usb-redir'/>
|
<flag name='usb-redir'/>
|
||||||
<flag name='usb-hub'/>
|
<flag name='usb-hub'/>
|
||||||
<flag name='ich9-ahci'/>
|
<flag name='ich9-ahci'/>
|
||||||
<flag name='no-acpi'/>
|
|
||||||
<flag name='virtio-blk-pci.scsi'/>
|
<flag name='virtio-blk-pci.scsi'/>
|
||||||
<flag name='scsi-disk.channel'/>
|
<flag name='scsi-disk.channel'/>
|
||||||
<flag name='scsi-block'/>
|
<flag name='scsi-block'/>
|
||||||
|
Loading…
Reference in New Issue
Block a user