提交 399d7044 编写于 作者: P Pavel Fedin 提交者: Martin Kletzander

qemu: Introduce QEMU_CAPS_MACH_VIRT_GIC_VERSION capability

Unfortunately qemu currently doesn't offer introspection for machine types,
so we have to rely on version number, similar to QEMU_CAPS_MACHINE_USB_OPT.
Signed-off-by: NPavel Fedin <p.fedin@samsung.com>
上级 4373043f
...@@ -298,6 +298,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, ...@@ -298,6 +298,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"rtl8139", "rtl8139",
"e1000", "e1000",
"virtio-net", "virtio-net",
"gic-version",
); );
...@@ -3404,6 +3405,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, ...@@ -3404,6 +3405,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
if (qemuCaps->version >= 2004000) if (qemuCaps->version >= 2004000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
/* Since 2.4.50 ARM virt machine supports gic-version option */
if (qemuCaps->version >= 2004050)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
goto cleanup; goto cleanup;
if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0)
......
...@@ -238,6 +238,7 @@ typedef enum { ...@@ -238,6 +238,7 @@ typedef enum {
QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */
QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */
QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */
QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */
QEMU_CAPS_LAST, /* this must always be the last item */ QEMU_CAPS_LAST, /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册