提交 d58c382e 编写于 作者: W Wen Congyang

check whether qemu supports multi function PCI device

qemu supports multi function PCI device at least version 0.13.0.
上级 006be75e
...@@ -119,6 +119,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, ...@@ -119,6 +119,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
"device-spicevmc", "device-spicevmc",
"virtio-tx-alg", "virtio-tx-alg",
"device-qxl-vga", "device-qxl-vga",
"pci-multifunction", /* 60 */
); );
struct qemu_feature_flags { struct qemu_feature_flags {
...@@ -1024,6 +1026,9 @@ qemuCapsComputeCmdFlags(const char *help, ...@@ -1024,6 +1026,9 @@ qemuCapsComputeCmdFlags(const char *help,
*/ */
if (version >= 13000) if (version >= 13000)
qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON); qemuCapsSet(flags, QEMU_CAPS_MONITOR_JSON);
if (version >= 13000)
qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION);
} }
/* We parse the output of 'qemu -help' to get the QEMU /* We parse the output of 'qemu -help' to get the QEMU
......
...@@ -95,6 +95,7 @@ enum qemuCapsFlags { ...@@ -95,6 +95,7 @@ enum qemuCapsFlags {
QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/
QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */
QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */ QEMU_CAPS_DEVICE_QXL_VGA = 59, /* Is the primary and vga campatible qxl device named qxl-vga? */
QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */
QEMU_CAPS_LAST, /* this must always be the last item */ QEMU_CAPS_LAST, /* this must always be the last item */
}; };
......
...@@ -430,7 +430,8 @@ mymain(void) ...@@ -430,7 +430,8 @@ mymain(void)
QEMU_CAPS_VGA_NONE, QEMU_CAPS_VGA_NONE,
QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_MIGRATE_QEMU_FD,
QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_DRIVE_AIO,
QEMU_CAPS_DEVICE_SPICEVMC); QEMU_CAPS_DEVICE_SPICEVMC,
QEMU_CAPS_PCI_MULTIFUNCTION);
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
QEMU_CAPS_VNC_COLON, QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT, QEMU_CAPS_NO_REBOOT,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册