|
 |
404507 |
From 22398ee5b022b7831477d79959d4990a849b7e55 Mon Sep 17 00:00:00 2001
|
|
|
404507 |
Message-Id: <22398ee5b022b7831477d79959d4990a849b7e55@dist-git>
|
|
|
404507 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
404507 |
Date: Wed, 15 Nov 2017 10:28:52 +0100
|
|
|
404507 |
Subject: [PATCH] tests: Rename ppc64le caps to ppc64
|
|
|
404507 |
|
|
|
404507 |
The architecture itself is called ppc64, and it can run both in big
|
|
|
404507 |
endian and little endian mode - the latter is known as ppc64le.
|
|
|
404507 |
|
|
|
404507 |
>From the (virtual) hardware point of view, ppc64 is a more accurate
|
|
|
404507 |
name so it should be used here.
|
|
|
404507 |
|
|
|
404507 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
404507 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
404507 |
(cherry picked from commit 61ea70341a668738a4fb524a65fa1a80705b2bab)
|
|
|
404507 |
|
|
|
404507 |
Conflicts:
|
|
|
404507 |
* tests/qemucapabilitiestest.c:
|
|
|
404507 |
caused by missing capabilities for QEMU 2.10.0 on aarch64
|
|
|
404507 |
|
|
|
404507 |
https://bugzilla.redhat.com/show_bug.cgi?id=1308743
|
|
|
404507 |
|
|
|
404507 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
404507 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
404507 |
---
|
|
|
404507 |
.../{qemu_2.6.0.ppc64le.xml => qemu_2.6.0.ppc64.xml} | 2 +-
|
|
|
404507 |
tests/domaincapstest.c | 2 +-
|
|
|
404507 |
.../{caps_2.6.0.ppc64le.replies => caps_2.6.0.ppc64.replies} | 0
|
|
|
404507 |
.../{caps_2.6.0.ppc64le.xml => caps_2.6.0.ppc64.xml} | 0
|
|
|
404507 |
.../{caps_2.9.0.ppc64le.replies => caps_2.9.0.ppc64.replies} | 0
|
|
|
404507 |
.../{caps_2.9.0.ppc64le.xml => caps_2.9.0.ppc64.xml} | 0
|
|
|
404507 |
tests/qemucapabilitiestest.c | 4 ++--
|
|
|
404507 |
7 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
404507 |
rename tests/domaincapsschemadata/{qemu_2.6.0.ppc64le.xml => qemu_2.6.0.ppc64.xml} (98%)
|
|
|
404507 |
rename tests/qemucapabilitiesdata/{caps_2.6.0.ppc64le.replies => caps_2.6.0.ppc64.replies} (100%)
|
|
|
404507 |
rename tests/qemucapabilitiesdata/{caps_2.6.0.ppc64le.xml => caps_2.6.0.ppc64.xml} (100%)
|
|
|
404507 |
rename tests/qemucapabilitiesdata/{caps_2.9.0.ppc64le.replies => caps_2.9.0.ppc64.replies} (100%)
|
|
|
404507 |
rename tests/qemucapabilitiesdata/{caps_2.9.0.ppc64le.xml => caps_2.9.0.ppc64.xml} (100%)
|
|
|
404507 |
|
|
|
404507 |
diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
|
|
|
404507 |
similarity index 98%
|
|
|
404507 |
rename from tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
|
|
|
404507 |
rename to tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
|
|
|
404507 |
index 5b986e52f7..98c72d36de 100644
|
|
|
404507 |
--- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
|
|
|
404507 |
+++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml
|
|
|
404507 |
@@ -2,7 +2,7 @@
|
|
|
404507 |
<path>/usr/bin/qemu-system-ppc64</path>
|
|
|
404507 |
<domain>kvm</domain>
|
|
|
404507 |
<machine>pseries-2.6</machine>
|
|
|
404507 |
- <arch>ppc64le</arch>
|
|
|
404507 |
+ <arch>ppc64</arch>
|
|
|
404507 |
<vcpu max='255'/>
|
|
|
404507 |
<os supported='yes'>
|
|
|
404507 |
<loader supported='yes'>
|
|
|
404507 |
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
|
|
|
404507 |
index 7aeac4507f..f3f623bb3d 100644
|
|
|
404507 |
--- a/tests/domaincapstest.c
|
|
|
404507 |
+++ b/tests/domaincapstest.c
|
|
|
404507 |
@@ -460,7 +460,7 @@ mymain(void)
|
|
|
404507 |
|
|
|
404507 |
DO_TEST_QEMU("2.6.0", "caps_2.6.0",
|
|
|
404507 |
"/usr/bin/qemu-system-ppc64", NULL,
|
|
|
404507 |
- "ppc64le", VIR_DOMAIN_VIRT_KVM);
|
|
|
404507 |
+ "ppc64", VIR_DOMAIN_VIRT_KVM);
|
|
|
404507 |
|
|
|
404507 |
DO_TEST_QEMU("2.8.0", "caps_2.8.0",
|
|
|
404507 |
"/usr/bin/qemu-system-x86_64", NULL,
|
|
|
404507 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
|
|
|
404507 |
similarity index 100%
|
|
|
404507 |
rename from tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
|
|
|
404507 |
rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
|
|
|
404507 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
|
|
|
404507 |
similarity index 100%
|
|
|
404507 |
rename from tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
404507 |
rename to tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
|
|
|
404507 |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
|
|
|
404507 |
similarity index 100%
|
|
|
404507 |
rename from tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies
|
|
|
404507 |
rename to tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
|
|
|
404507 |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
|
|
|
404507 |
similarity index 100%
|
|
|
404507 |
rename from tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
|
|
|
404507 |
rename to tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
|
|
|
404507 |
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
|
|
|
404507 |
index df3a9de516..9bb1ffca6a 100644
|
|
|
404507 |
--- a/tests/qemucapabilitiestest.c
|
|
|
404507 |
+++ b/tests/qemucapabilitiestest.c
|
|
|
404507 |
@@ -173,8 +173,8 @@ mymain(void)
|
|
|
404507 |
DO_TEST("x86_64", "caps_2.10.0");
|
|
|
404507 |
DO_TEST("aarch64", "caps_2.6.0-gicv2");
|
|
|
404507 |
DO_TEST("aarch64", "caps_2.6.0-gicv3");
|
|
|
404507 |
- DO_TEST("ppc64le", "caps_2.6.0");
|
|
|
404507 |
- DO_TEST("ppc64le", "caps_2.9.0");
|
|
|
404507 |
+ DO_TEST("ppc64", "caps_2.6.0");
|
|
|
404507 |
+ DO_TEST("ppc64", "caps_2.9.0");
|
|
|
404507 |
DO_TEST("s390x", "caps_2.7.0");
|
|
|
404507 |
DO_TEST("s390x", "caps_2.8.0");
|
|
|
404507 |
DO_TEST("s390x", "caps_2.9.0");
|
|
|
404507 |
--
|
|
|
404507 |
2.15.0
|
|
|
404507 |
|