9:05 a.m.
When GIC support was introduced (QEMU 2.6 timeframe) we needed
to make sure both GICv2 hardware and GICv3 hardware were handled
correctly, and that was achieved by having separate capabilities
data for each.
Now that we have capabilities data for several QEMU versions we
can stop storing data for GICv2 and GICv3 hardware separately,
and instead have GICv2 data for QEMU <= 2.10 and GICv3 data for
QEMU >= 2.12, without losing any coverage.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Heavily snipped. You get the idea.
.../qemu_2.6.0-gicv3-virt.aarch64.xml | 116 -
...irt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} | 0
tests/domaincapstest.c | 10 +-
.../caps_2.10.0-gicv3.aarch64.replies | 16495 -----------------
.../caps_2.10.0-gicv3.aarch64.xml | 310 -
...aarch64.replies => caps_2.10.0.aarch64.replies} | 0
...0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} | 0
.../caps_2.12.0-gicv2.aarch64.replies | 18551 -------------------
.../caps_2.12.0-gicv2.aarch64.xml | 322 -
...aarch64.replies => caps_2.12.0.aarch64.replies} | 0
...0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} | 0
.../caps_2.6.0-gicv3.aarch64.replies | 13035 -------------
.../caps_2.6.0-gicv3.aarch64.xml | 287 -
....aarch64.replies => caps_2.6.0.aarch64.replies} | 0
....0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} | 0
tests/qemucapabilitiestest.c | 9 +-
16 files changed, 6 insertions(+), 49129 deletions(-)
delete mode 100644 tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
rename tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml =>
qemu_2.6.0-virt.aarch64.xml} (100%)
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies =>
caps_2.10.0.aarch64.replies} (100%)
rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml =>
caps_2.10.0.aarch64.xml} (100%)
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.replies =>
caps_2.12.0.aarch64.replies} (100%)
rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.xml =>
caps_2.12.0.aarch64.xml} (100%)
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.replies =>
caps_2.6.0.aarch64.replies} (100%)
rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.xml =>
caps_2.6.0.aarch64.xml} (100%)
diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
deleted file mode 100644
index 700dc618b2..0000000000
--- a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<domainCapabilities>
- <path>/usr/bin/qemu-system-aarch64</path>
- <domain>kvm</domain>
- <machine>virt-2.6</machine>
- <arch>aarch64</arch>
[...]
diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
similarity index 100%
rename from tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
rename to tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index a950f9b79e..06e77fd586 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -472,19 +472,15 @@ mymain(void)
"/usr/bin/qemu-system-x86_64", NULL,
"x86_64", VIR_DOMAIN_VIRT_KVM);
- DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
+ DO_TEST_QEMU("2.6.0", "caps_2.6.0",
"/usr/bin/qemu-system-aarch64", NULL,
"aarch64", VIR_DOMAIN_VIRT_KVM);
- DO_TEST_QEMU("2.6.0-gicv2", "caps_2.6.0-gicv2",
- "/usr/bin/qemu-system-aarch64", "virt",
- "aarch64", VIR_DOMAIN_VIRT_KVM);
-
- DO_TEST_QEMU("2.6.0-gicv3", "caps_2.6.0-gicv3",
+ DO_TEST_QEMU("2.6.0", "caps_2.6.0",
"/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_KVM);
- DO_TEST_QEMU("2.12.0", "caps_2.12.0-gicv3",
+ DO_TEST_QEMU("2.12.0", "caps_2.12.0",
"/usr/bin/qemu-system-aarch64", "virt",
"aarch64", VIR_DOMAIN_VIRT_KVM);
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies
deleted file mode 100644
index 8843ae72bf..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies
+++ /dev/null
@@ -1,16495 +0,0 @@
-{
- "QMP": {
- "version": {
- "qemu": {
- "micro": 0,
- "minor": 10,
- "major": 2
- },
- "package": " (v2.10.0)"
- },
- "capabilities": [
- ]
- }
-}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
deleted file mode 100644
index 0f5f724c3e..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<qemuCaps>
- <qemuctime>0</qemuctime>
- <selfctime>0</selfctime>
- <selfvers>0</selfvers>
- <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
deleted file mode 100644
index 50bc6d3895..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
+++ /dev/null
@@ -1,18551 +0,0 @@
-{
- "QMP": {
- "version": {
- "qemu": {
- "micro": 90,
- "minor": 11,
- "major": 2
- },
- "package": "v2.12.0-rc0"
- },
- "capabilities": [
- "oob"
- ]
- }
-}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
deleted file mode 100644
index 333ee40d95..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
+++ /dev/null
@@ -1,322 +0,0 @@
-<qemuCaps>
- <qemuctime>0</qemuctime>
- <selfctime>0</selfctime>
- <selfvers>0</selfvers>
- <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
deleted file mode 100644
index 920b14d6f0..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
+++ /dev/null
@@ -1,13035 +0,0 @@
-{
- "QMP": {
- "version": {
- "qemu": {
- "micro": 0,
- "minor": 6,
- "major": 2
- },
- "package": ""
- },
- "capabilities": [
- ]
- }
-}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
deleted file mode 100644
index 880a49fc55..0000000000
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<qemuCaps>
- <qemuctime>0</qemuctime>
- <selfctime>0</selfctime>
- <selfvers>0</selfvers>
- <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 33609af45c..0d136cc8b5 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -178,12 +178,9 @@ mymain(void)
DO_TEST("x86_64", "caps_2.9.0");
DO_TEST("x86_64", "caps_2.10.0");
DO_TEST("x86_64", "caps_2.12.0");
- DO_TEST("aarch64", "caps_2.6.0-gicv2");
- DO_TEST("aarch64", "caps_2.6.0-gicv3");
- DO_TEST("aarch64", "caps_2.10.0-gicv2");
- DO_TEST("aarch64", "caps_2.10.0-gicv3");
- DO_TEST("aarch64", "caps_2.12.0-gicv2");
- DO_TEST("aarch64", "caps_2.12.0-gicv3");
+ DO_TEST("aarch64", "caps_2.6.0");
+ DO_TEST("aarch64", "caps_2.10.0");
+ DO_TEST("aarch64", "caps_2.12.0");
DO_TEST("ppc64", "caps_2.6.0");
DO_TEST("ppc64", "caps_2.9.0");
DO_TEST("ppc64", "caps_2.10.0");
--
2.14.3