|
 |
7a3408 |
From 4a5223042084155fafe5b54bd07fd0be106d123b Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <4a5223042084155fafe5b54bd07fd0be106d123b@dist-git>
|
|
|
7a3408 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Date: Fri, 11 Sep 2015 17:00:17 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: Introduce QEMU_CAPS_DEVICE_RTL8139
|
|
|
7a3408 |
|
|
|
7a3408 |
This capability can be used to detect whether or not the QEMU
|
|
|
7a3408 |
binary supports the rtl8139 network device.
|
|
|
7a3408 |
|
|
|
7a3408 |
(cherry picked from commit b8d545a8b88f03b1a4c30d272a4561d6adbfcd60)
|
|
|
7a3408 |
|
|
|
7a3408 |
Conflicts:
|
|
|
7a3408 |
src/qemu/qemu_capabilities.c
|
|
|
7a3408 |
src/qemu/qemu_capabilities.h
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
|
|
|
7a3408 |
tests/qemuhelptest.c
|
|
|
7a3408 |
|
|
|
7a3408 |
Conflicts are caused by the fact that some members are missing from
|
|
|
7a3408 |
the virQEMUCaps enumeration because the relevant commits have not
|
|
|
7a3408 |
been backported.
|
|
|
7a3408 |
|
|
|
7a3408 |
The value of QEMU_CAPS_DEVICE_RTL8139 has been changed from 196 to
|
|
|
7a3408 |
192 to avoid making the enumeration sparse.
|
|
|
7a3408 |
|
|
|
7a3408 |
The test program and data have been updated accordingly as well,
|
|
|
7a3408 |
removing any reference to capabilities that have not been backported.
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1254044
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_capabilities.c | 2 ++
|
|
|
7a3408 |
src/qemu/qemu_capabilities.h | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 +
|
|
|
7a3408 |
tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 +
|
|
|
7a3408 |
tests/qemuhelptest.c | 18 ++++++++++++------
|
|
|
7a3408 |
10 files changed, 22 insertions(+), 6 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
7a3408 |
index be5384f..69259f5 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
7a3408 |
@@ -288,6 +288,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
7a3408 |
|
|
|
7a3408 |
"vhost-user-multiqueue", /* 190 */
|
|
|
7a3408 |
"migration-event",
|
|
|
7a3408 |
+ "rtl8139",
|
|
|
7a3408 |
);
|
|
|
7a3408 |
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -1569,6 +1570,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
7a3408 |
{ "ivshmem", QEMU_CAPS_DEVICE_IVSHMEM },
|
|
|
7a3408 |
{ "pc-dimm", QEMU_CAPS_DEVICE_PC_DIMM },
|
|
|
7a3408 |
{ "pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL },
|
|
|
7a3408 |
+ { "rtl8139", QEMU_CAPS_DEVICE_RTL8139 },
|
|
|
7a3408 |
};
|
|
|
7a3408 |
|
|
|
7a3408 |
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
7a3408 |
index f77bd06..2762cec 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
7a3408 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
7a3408 |
@@ -231,6 +231,7 @@ typedef enum {
|
|
|
7a3408 |
QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */
|
|
|
7a3408 |
QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */
|
|
|
7a3408 |
QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139 = 192, /* -device rtl8139 */
|
|
|
7a3408 |
|
|
|
7a3408 |
QEMU_CAPS_LAST, /* this must always be the last item */
|
|
|
7a3408 |
} virQEMUCapsFlags;
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
|
|
|
7a3408 |
index 30239df..fd44748 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
|
|
|
7a3408 |
@@ -120,4 +120,5 @@
|
|
|
7a3408 |
<flag name='vmware-svga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
|
|
|
7a3408 |
index ea3d850..0730eab 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
|
|
|
7a3408 |
@@ -135,4 +135,5 @@
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
|
|
|
7a3408 |
index 2c19ddc..66bd901 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
|
|
|
7a3408 |
@@ -136,4 +136,5 @@
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
|
|
|
7a3408 |
index aadccd5..fb7a8b0 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
|
|
|
7a3408 |
@@ -145,4 +145,5 @@
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
|
|
|
7a3408 |
index 3e81cbf..250ef4e 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
|
|
|
7a3408 |
@@ -151,4 +151,5 @@
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
|
|
|
7a3408 |
index 84c357f..a8850b8 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
|
|
|
7a3408 |
@@ -151,4 +151,5 @@
|
|
|
7a3408 |
<flag name='qxl.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
|
|
|
7a3408 |
index b1ee8df..705ee65 100644
|
|
|
7a3408 |
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
|
|
|
7a3408 |
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
|
|
|
7a3408 |
@@ -167,4 +167,5 @@
|
|
|
7a3408 |
<flag name='qxl-vga.vgamem_mb'/>
|
|
|
7a3408 |
<flag name='pc-dimm'/>
|
|
|
7a3408 |
<flag name='pci-serial'/>
|
|
|
7a3408 |
+ <flag name='rtl8139'/>
|
|
|
7a3408 |
</qemuCaps>
|
|
|
7a3408 |
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
|
|
|
7a3408 |
index 507831c..a481693 100644
|
|
|
7a3408 |
--- a/tests/qemuhelptest.c
|
|
|
7a3408 |
+++ b/tests/qemuhelptest.c
|
|
|
7a3408 |
@@ -409,7 +409,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_SERIAL,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_NET,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
|
|
|
7a3408 |
QEMU_CAPS_VNC_COLON,
|
|
|
7a3408 |
QEMU_CAPS_NO_REBOOT,
|
|
|
7a3408 |
@@ -524,7 +525,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_STORAGE,
|
|
|
7a3408 |
QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_IVSHMEM);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_IVSHMEM,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
|
|
|
7a3408 |
QEMU_CAPS_VNC_COLON,
|
|
|
7a3408 |
QEMU_CAPS_NO_REBOOT,
|
|
|
7a3408 |
@@ -591,7 +593,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_SERIAL,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_NET,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
|
|
|
7a3408 |
QEMU_CAPS_VNC_COLON,
|
|
|
7a3408 |
QEMU_CAPS_NO_REBOOT,
|
|
|
7a3408 |
@@ -666,7 +669,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_CIRRUS_VGA,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_USB_STORAGE);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_USB_STORAGE,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST("qemu-1.0", 1000000, 0, 0,
|
|
|
7a3408 |
QEMU_CAPS_VNC_COLON,
|
|
|
7a3408 |
QEMU_CAPS_NO_REBOOT,
|
|
|
7a3408 |
@@ -753,7 +757,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_KBD,
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_STORAGE,
|
|
|
7a3408 |
QEMU_CAPS_SPLASH_TIMEOUT,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_IVSHMEM);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_IVSHMEM,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
|
|
|
7a3408 |
QEMU_CAPS_VNC_COLON,
|
|
|
7a3408 |
QEMU_CAPS_NO_REBOOT,
|
|
|
7a3408 |
@@ -853,7 +858,8 @@ mymain(void)
|
|
|
7a3408 |
QEMU_CAPS_DEVICE_USB_STORAGE,
|
|
|
7a3408 |
QEMU_CAPS_OBJECT_USB_AUDIO,
|
|
|
7a3408 |
QEMU_CAPS_SPLASH_TIMEOUT,
|
|
|
7a3408 |
- QEMU_CAPS_DEVICE_IVSHMEM);
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_IVSHMEM,
|
|
|
7a3408 |
+ QEMU_CAPS_DEVICE_RTL8139);
|
|
|
7a3408 |
DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
7a3408 |
QEMU_CAPS_LAST);
|
|
|
7a3408 |
DO_TEST_FULL("qemu-kvm-1.2.0", 1002000, 1, 0, VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.2
|
|
|
7a3408 |
|