mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
qemu: deprecate QEMU_CAPS_DTB
Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
parent
766d5c1b5a
commit
2089a801ba
@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
|
||||
static void
|
||||
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
|
||||
{
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE);
|
||||
|
@ -233,7 +233,7 @@ typedef enum {
|
||||
QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */
|
||||
QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */
|
||||
QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */
|
||||
QEMU_CAPS_DTB, /* -dtb file */
|
||||
X_QEMU_CAPS_DTB, /* -dtb file */
|
||||
QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */
|
||||
|
||||
/* 135 */
|
||||
|
@ -6348,15 +6348,8 @@ qemuBuildBootCommandLine(virCommandPtr cmd,
|
||||
virCommandAddArgList(cmd, "-initrd", def->os.initrd, NULL);
|
||||
if (def->os.cmdline)
|
||||
virCommandAddArgList(cmd, "-append", def->os.cmdline, NULL);
|
||||
if (def->os.dtb) {
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DTB)) {
|
||||
virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
|
||||
} else {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("dtb is not supported with this QEMU binary"));
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
if (def->os.dtb)
|
||||
virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL);
|
||||
if (def->os.slic_table) {
|
||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||
virCommandAddArg(cmd, "-acpitable");
|
||||
|
@ -67,7 +67,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -52,7 +52,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -51,7 +51,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -52,7 +52,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -51,7 +51,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -66,7 +66,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -54,7 +54,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -51,7 +51,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -50,7 +50,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -35,7 +35,6 @@
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='virtio-ccw'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
<flag name='machine-usb-opt'/>
|
||||
|
@ -68,7 +68,6 @@
|
||||
<flag name='virtio-rng'/>
|
||||
<flag name='rng-random'/>
|
||||
<flag name='rng-egd'/>
|
||||
<flag name='dtb'/>
|
||||
<flag name='megasas'/>
|
||||
<flag name='ipv6-migration'/>
|
||||
<flag name='machine-opt'/>
|
||||
|
@ -1459,7 +1459,7 @@ mymain(void)
|
||||
DO_TEST("balloon-ccw-deflate",
|
||||
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
|
||||
DO_TEST("balloon-mmio-deflate",
|
||||
QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
|
||||
DO_TEST("balloon-device-deflate-off",
|
||||
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE);
|
||||
@ -1939,8 +1939,7 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE_SCLPCONSOLE);
|
||||
|
||||
DO_TEST("ppc-dtb",
|
||||
QEMU_CAPS_KVM,
|
||||
QEMU_CAPS_DTB);
|
||||
QEMU_CAPS_KVM);
|
||||
DO_TEST("ppce500-serial",
|
||||
QEMU_CAPS_KVM);
|
||||
|
||||
@ -2308,22 +2307,17 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE_QXL,
|
||||
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
|
||||
|
||||
DO_TEST("arm-vexpressa9-nodevs",
|
||||
QEMU_CAPS_DTB);
|
||||
DO_TEST("arm-vexpressa9-basic",
|
||||
QEMU_CAPS_DTB);
|
||||
DO_TEST("arm-vexpressa9-nodevs", NONE);
|
||||
DO_TEST("arm-vexpressa9-basic", NONE);
|
||||
DO_TEST("arm-vexpressa9-virtio",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
||||
DO_TEST("arm-virt-virtio",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_PL011,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
||||
|
||||
DO_TEST("aarch64-virt-virtio",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_PL011,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
||||
@ -2333,7 +2327,6 @@ mymain(void)
|
||||
but virtio-mmio is always used unless PCI addresses are manually
|
||||
specified. */
|
||||
DO_TEST("aarch64-virtio-pci-default",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
||||
@ -2343,7 +2336,6 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE_PL011,
|
||||
QEMU_CAPS_VIRTIO_SCSI);
|
||||
DO_TEST("aarch64-virt-2.6-virtio-pci-default",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
||||
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
@ -2353,7 +2345,6 @@ mymain(void)
|
||||
/* Example of using virtio-pci with no explicit PCI controller
|
||||
but with manual PCI addresses */
|
||||
DO_TEST("aarch64-virtio-pci-manual-addresses",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
||||
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
@ -2372,7 +2363,6 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
||||
QEMU_CAPS_VNC);
|
||||
DO_TEST("aarch64-aavmf-virtio-mmio",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
||||
DO_TEST("aarch64-virt-default-nic",
|
||||
|
@ -1022,11 +1022,9 @@ mymain(void)
|
||||
DO_TEST("smbios-multiple-type2", NONE);
|
||||
|
||||
DO_TEST("aarch64-aavmf-virtio-mmio",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
||||
DO_TEST("aarch64-virtio-pci-default",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
||||
@ -1035,7 +1033,6 @@ mymain(void)
|
||||
QEMU_CAPS_DEVICE_IOH3420,
|
||||
QEMU_CAPS_VIRTIO_SCSI);
|
||||
DO_TEST("aarch64-virtio-pci-manual-addresses",
|
||||
QEMU_CAPS_DTB,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
||||
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
|
Loading…
Reference in New Issue
Block a user