This capability can be used to detect whether or not the QEMU binary supports the e1000 network device. --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemuhelptest.c | 18 ++++++++++++------ 10 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 61b0ad5..a875727 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -294,6 +294,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "xio3130-downstream", /* 195 */ "rtl8139", + "e1000", ); @@ -1579,6 +1580,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "x3130-upstream", QEMU_CAPS_DEVICE_X3130_UPSTREAM }, { "xio3130-downstream", QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM }, { "rtl8139", QEMU_CAPS_DEVICE_RTL8139 }, + { "e1000", QEMU_CAPS_DEVICE_E1000 }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 168ba39..76490cb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -236,6 +236,7 @@ typedef enum { 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_DEVICE_E1000 = 197, /* -device e1000 */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 5b0f6b6..d083d18 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -124,4 +124,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index c5aad4d..3fdfdca 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -139,4 +139,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index f671063..b9bb82f 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -140,4 +140,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 3f795f5..7364cd4 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -149,4 +149,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 6d84910..8753b28 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -155,4 +155,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 8983733..5234cca 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -155,4 +155,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 28f19a0..580ad30 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -171,4 +171,5 @@ <flag name='x3130-upstream'/> <flag name='xio3130-downstream'/> <flag name='rtl8139'/> + <flag name='e1000'/> </qemuCaps> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 9016611..53908cf 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -410,7 +410,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -526,7 +527,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_DEVICE_IVSHMEM, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -594,7 +596,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -670,7 +673,8 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -761,7 +765,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -865,7 +870,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_RTL8139); + QEMU_CAPS_DEVICE_RTL8139, + QEMU_CAPS_DEVICE_E1000); 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, -- 2.4.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list