mirror of https://gitee.com/openkylin/libvirt.git
qemu: Introduce QEMU_CAPS_DEVICE_RTL8139
This capability can be used to detect whether or not the QEMU binary supports the rtl8139 network device.
This commit is contained in:
parent
8370023730
commit
b8d545a8b8
|
@ -291,7 +291,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|||
"gpex-pcihost",
|
||||
"ioh3420",
|
||||
"x3130-upstream",
|
||||
"xio3130-downstream",
|
||||
|
||||
"xio3130-downstream", /* 195 */
|
||||
"rtl8139",
|
||||
);
|
||||
|
||||
|
||||
|
@ -1576,6 +1578,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|||
{ "ioh3420", QEMU_CAPS_DEVICE_IOH3420 },
|
||||
{ "x3130-upstream", QEMU_CAPS_DEVICE_X3130_UPSTREAM },
|
||||
{ "xio3130-downstream", QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM },
|
||||
{ "rtl8139", QEMU_CAPS_DEVICE_RTL8139 },
|
||||
};
|
||||
|
||||
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
|
||||
|
|
|
@ -235,6 +235,7 @@ typedef enum {
|
|||
QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */
|
||||
QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */
|
||||
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */
|
||||
QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */
|
||||
|
||||
QEMU_CAPS_LAST, /* this must always be the last item */
|
||||
} virQEMUCapsFlags;
|
||||
|
|
|
@ -123,4 +123,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -138,4 +138,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -139,4 +139,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -148,4 +148,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -154,4 +154,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -154,4 +154,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -170,4 +170,5 @@
|
|||
<flag name='ioh3420'/>
|
||||
<flag name='x3130-upstream'/>
|
||||
<flag name='xio3130-downstream'/>
|
||||
<flag name='rtl8139'/>
|
||||
</qemuCaps>
|
||||
|
|
|
@ -409,7 +409,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_USB_SERIAL,
|
||||
QEMU_CAPS_DEVICE_USB_NET,
|
||||
QEMU_CAPS_DEVICE_USB_KBD,
|
||||
QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
|
||||
QEMU_CAPS_VNC_COLON,
|
||||
QEMU_CAPS_NO_REBOOT,
|
||||
|
@ -524,7 +525,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_USB_KBD,
|
||||
QEMU_CAPS_DEVICE_USB_STORAGE,
|
||||
QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
|
||||
QEMU_CAPS_DEVICE_IVSHMEM);
|
||||
QEMU_CAPS_DEVICE_IVSHMEM,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
|
||||
QEMU_CAPS_VNC_COLON,
|
||||
QEMU_CAPS_NO_REBOOT,
|
||||
|
@ -591,7 +593,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_USB_SERIAL,
|
||||
QEMU_CAPS_DEVICE_USB_NET,
|
||||
QEMU_CAPS_DEVICE_USB_KBD,
|
||||
QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
|
||||
QEMU_CAPS_VNC_COLON,
|
||||
QEMU_CAPS_NO_REBOOT,
|
||||
|
@ -666,7 +669,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_CIRRUS_VGA,
|
||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
||||
QEMU_CAPS_DEVICE_USB_KBD,
|
||||
QEMU_CAPS_DEVICE_USB_STORAGE);
|
||||
QEMU_CAPS_DEVICE_USB_STORAGE,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST("qemu-1.0", 1000000, 0, 0,
|
||||
QEMU_CAPS_VNC_COLON,
|
||||
QEMU_CAPS_NO_REBOOT,
|
||||
|
@ -756,7 +760,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_IVSHMEM,
|
||||
QEMU_CAPS_DEVICE_IOH3420,
|
||||
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
|
||||
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM);
|
||||
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
|
||||
QEMU_CAPS_VNC_COLON,
|
||||
QEMU_CAPS_NO_REBOOT,
|
||||
|
@ -859,7 +864,8 @@ mymain(void)
|
|||
QEMU_CAPS_DEVICE_IVSHMEM,
|
||||
QEMU_CAPS_DEVICE_IOH3420,
|
||||
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
|
||||
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM);
|
||||
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
|
||||
QEMU_CAPS_DEVICE_RTL8139);
|
||||
DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
QEMU_CAPS_LAST);
|
||||
DO_TEST_FULL("qemu-kvm-1.2.0", 1002000, 1, 0, VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
|
|
Loading…
Reference in New Issue