[PATCH 05/24] qemucapabilitiesdata: Separate version from architecture with a '_'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Parsing a version where components are separated by dots, while other
components are also separated by dots is a bit insane. Separate the
version by an underscore.

To achieve this we rename all the caps files and adjust the appropriate
places formatting the path.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 tests/domaincapstest.c                                 |  2 +-
 ....2.0.aarch64.replies => caps_4.2.0_aarch64.replies} |  0
 .../{caps_4.2.0.aarch64.xml => caps_4.2.0_aarch64.xml} |  0
 ...ps_4.2.0.ppc64.replies => caps_4.2.0_ppc64.replies} |  0
 .../{caps_4.2.0.ppc64.xml => caps_4.2.0_ppc64.xml}     |  0
 ...ps_4.2.0.s390x.replies => caps_4.2.0_s390x.replies} |  0
 .../{caps_4.2.0.s390x.xml => caps_4.2.0_s390x.xml}     |  0
 ..._4.2.0.x86_64.replies => caps_4.2.0_x86_64.replies} |  0
 .../{caps_4.2.0.x86_64.xml => caps_4.2.0_x86_64.xml}   |  0
 ....0.0.aarch64.replies => caps_5.0.0_aarch64.replies} |  0
 .../{caps_5.0.0.aarch64.xml => caps_5.0.0_aarch64.xml} |  0
 ...ps_5.0.0.ppc64.replies => caps_5.0.0_ppc64.replies} |  0
 .../{caps_5.0.0.ppc64.xml => caps_5.0.0_ppc64.xml}     |  0
 ....0.0.riscv64.replies => caps_5.0.0_riscv64.replies} |  0
 .../{caps_5.0.0.riscv64.xml => caps_5.0.0_riscv64.xml} |  0
 ..._5.0.0.x86_64.replies => caps_5.0.0_x86_64.replies} |  0
 .../{caps_5.0.0.x86_64.xml => caps_5.0.0_x86_64.xml}   |  0
 ...ps_5.1.0.sparc.replies => caps_5.1.0_sparc.replies} |  0
 .../{caps_5.1.0.sparc.xml => caps_5.1.0_sparc.xml}     |  0
 ..._5.1.0.x86_64.replies => caps_5.1.0_x86_64.replies} |  0
 .../{caps_5.1.0.x86_64.xml => caps_5.1.0_x86_64.xml}   |  0
 ....2.0.aarch64.replies => caps_5.2.0_aarch64.replies} |  0
 .../{caps_5.2.0.aarch64.xml => caps_5.2.0_aarch64.xml} |  0
 ...ps_5.2.0.ppc64.replies => caps_5.2.0_ppc64.replies} |  0
 .../{caps_5.2.0.ppc64.xml => caps_5.2.0_ppc64.xml}     |  0
 ....2.0.riscv64.replies => caps_5.2.0_riscv64.replies} |  0
 .../{caps_5.2.0.riscv64.xml => caps_5.2.0_riscv64.xml} |  0
 ...ps_5.2.0.s390x.replies => caps_5.2.0_s390x.replies} |  0
 .../{caps_5.2.0.s390x.xml => caps_5.2.0_s390x.xml}     |  0
 ..._5.2.0.x86_64.replies => caps_5.2.0_x86_64.replies} |  0
 .../{caps_5.2.0.x86_64.xml => caps_5.2.0_x86_64.xml}   |  0
 ....0.0.aarch64.replies => caps_6.0.0_aarch64.replies} |  0
 .../{caps_6.0.0.aarch64.xml => caps_6.0.0_aarch64.xml} |  0
 ...ps_6.0.0.s390x.replies => caps_6.0.0_s390x.replies} |  0
 .../{caps_6.0.0.s390x.xml => caps_6.0.0_s390x.xml}     |  0
 ..._6.0.0.x86_64.replies => caps_6.0.0_x86_64.replies} |  0
 .../{caps_6.0.0.x86_64.xml => caps_6.0.0_x86_64.xml}   |  0
 ..._6.1.0.x86_64.replies => caps_6.1.0_x86_64.replies} |  0
 .../{caps_6.1.0.x86_64.xml => caps_6.1.0_x86_64.xml}   |  0
 ....2.0.aarch64.replies => caps_6.2.0_aarch64.replies} |  0
 .../{caps_6.2.0.aarch64.xml => caps_6.2.0_aarch64.xml} |  0
 ...ps_6.2.0.ppc64.replies => caps_6.2.0_ppc64.replies} |  0
 .../{caps_6.2.0.ppc64.xml => caps_6.2.0_ppc64.xml}     |  0
 ..._6.2.0.x86_64.replies => caps_6.2.0_x86_64.replies} |  0
 .../{caps_6.2.0.x86_64.xml => caps_6.2.0_x86_64.xml}   |  0
 ....0.0.aarch64.replies => caps_7.0.0_aarch64.replies} |  0
 .../{caps_7.0.0.aarch64.xml => caps_7.0.0_aarch64.xml} |  0
 ...ps_7.0.0.ppc64.replies => caps_7.0.0_ppc64.replies} |  0
 .../{caps_7.0.0.ppc64.xml => caps_7.0.0_ppc64.xml}     |  0
 ..._7.0.0.x86_64.replies => caps_7.0.0_x86_64.replies} |  0
 .../{caps_7.0.0.x86_64.xml => caps_7.0.0_x86_64.xml}   |  0
 ...ps_7.1.0.ppc64.replies => caps_7.1.0_ppc64.replies} |  0
 .../{caps_7.1.0.ppc64.xml => caps_7.1.0_ppc64.xml}     |  0
 ..._7.1.0.x86_64.replies => caps_7.1.0_x86_64.replies} |  0
 .../{caps_7.1.0.x86_64.xml => caps_7.1.0_x86_64.xml}   |  0
 .../{caps_7.2.0.ppc.replies => caps_7.2.0_ppc.replies} |  0
 .../{caps_7.2.0.ppc.xml => caps_7.2.0_ppc.xml}         |  0
 ..._7.2.0.x86_64.replies => caps_7.2.0_x86_64.replies} |  0
 .../{caps_7.2.0.x86_64.xml => caps_7.2.0_x86_64.xml}   |  0
 ....0.0.riscv64.replies => caps_8.0.0_riscv64.replies} |  0
 .../{caps_8.0.0.riscv64.xml => caps_8.0.0_riscv64.xml} |  0
 ..._8.0.0.x86_64.replies => caps_8.0.0_x86_64.replies} |  0
 .../{caps_8.0.0.x86_64.xml => caps_8.0.0_x86_64.xml}   |  0
 tests/qemucapabilitiesnumbering.c                      |  2 +-
 tests/qemucapabilitiestest.c                           |  6 +++---
 tests/qemucaps2xmltest.c                               |  2 +-
 tests/testutilsqemu.c                                  | 10 +++++-----
 67 files changed, 11 insertions(+), 11 deletions(-)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.replies => caps_4.2.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.xml => caps_4.2.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.replies => caps_4.2.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.xml => caps_4.2.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.replies => caps_4.2.0_s390x.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.xml => caps_4.2.0_s390x.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.replies => caps_4.2.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.xml => caps_4.2.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies => caps_5.0.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.xml => caps_5.0.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.replies => caps_5.0.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.xml => caps_5.0.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.replies => caps_5.0.0_riscv64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.xml => caps_5.0.0_riscv64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.replies => caps_5.0.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.xml => caps_5.0.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.replies => caps_5.1.0_sparc.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.xml => caps_5.1.0_sparc.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.replies => caps_5.1.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.xml => caps_5.1.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.replies => caps_5.2.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.xml => caps_5.2.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.replies => caps_5.2.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.xml => caps_5.2.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.replies => caps_5.2.0_riscv64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.xml => caps_5.2.0_riscv64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.replies => caps_5.2.0_s390x.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.xml => caps_5.2.0_s390x.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.replies => caps_5.2.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.xml => caps_5.2.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.replies => caps_6.0.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.xml => caps_6.0.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.replies => caps_6.0.0_s390x.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.xml => caps_6.0.0_s390x.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.replies => caps_6.0.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.xml => caps_6.0.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.replies => caps_6.1.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.xml => caps_6.1.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.replies => caps_6.2.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.xml => caps_6.2.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.replies => caps_6.2.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.xml => caps_6.2.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.replies => caps_6.2.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.xml => caps_6.2.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.replies => caps_7.0.0_aarch64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.xml => caps_7.0.0_aarch64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.replies => caps_7.0.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.xml => caps_7.0.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.replies => caps_7.0.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.xml => caps_7.0.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.replies => caps_7.1.0_ppc64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.xml => caps_7.1.0_ppc64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.replies => caps_7.1.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.xml => caps_7.1.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.replies => caps_7.2.0_ppc.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.xml => caps_7.2.0_ppc.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.replies => caps_7.2.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.xml => caps_7.2.0_x86_64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.replies => caps_8.0.0_riscv64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.xml => caps_8.0.0_riscv64.xml} (100%)
 rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.replies => caps_8.0.0_x86_64.replies} (100%)
 rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.xml => caps_8.0.0_x86_64.xml} (100%)

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 90693aac68..fbbed40c96 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -81,7 +81,7 @@ fillQemuCaps(virDomainCaps *domCaps,
     if (fakeHostCPU(domCaps->arch) < 0)
         return -1;

-    path = g_strdup_printf("%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch);
+    path = g_strdup_printf("%s/%s_%s.xml", TEST_QEMU_CAPS_PATH, name, arch);
     if (!(qemuCaps = qemuTestParseCapabilitiesArch(domCaps->arch, path)))
         return -1;

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
rename to tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
rename to tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
rename to tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
rename to tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies
rename to tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
rename to tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
rename to tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
rename to tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
rename to tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
rename to tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.1.0.ppc64.replies
rename to tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
rename to tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.ppc.replies b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.2.0.ppc.replies
rename to tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml
rename to tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_8.0.0.riscv64.replies
rename to tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml
rename to tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies
rename to tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
similarity index 100%
rename from tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml
rename to tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
diff --git a/tests/qemucapabilitiesnumbering.c b/tests/qemucapabilitiesnumbering.c
index aae21893c2..6814011351 100644
--- a/tests/qemucapabilitiesnumbering.c
+++ b/tests/qemucapabilitiesnumbering.c
@@ -224,7 +224,7 @@ iterateCapsFile(const char *inputDir,
                 const char *suffix,
                 void *opaque G_GNUC_UNUSED)
 {
-    g_autofree char *repliesFile = g_strdup_printf("%s/%s_%s.%s.%s", inputDir, prefix, version, archName, suffix);
+    g_autofree char *repliesFile = g_strdup_printf("%s/%s_%s_%s.%s", inputDir, prefix, version, archName, suffix);

     return virTestRun(repliesFile, testCapsFile, repliesFile);
 }
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 5be37a8380..8c86095e1c 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -78,10 +78,10 @@ testQemuCaps(const void *opaque)
     unsigned int fakeMicrocodeVersion = 0;
     const char *p;

-    repliesFile = g_strdup_printf("%s/%s_%s.%s.%s",
+    repliesFile = g_strdup_printf("%s/%s_%s_%s.%s",
                                   data->inputDir, data->prefix, data->version,
                                   data->archName, data->suffix);
-    capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
+    capsFile = g_strdup_printf("%s/%s_%s_%s.xml",
                                data->outputDir, data->prefix, data->version,
                                data->archName);

@@ -142,7 +142,7 @@ testQemuCapsCopy(const void *opaque)
     g_autoptr(virQEMUCaps) copy = NULL;
     g_autofree char *actual = NULL;

-    capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
+    capsFile = g_strdup_printf("%s/%s_%s_%s.xml",
                                data->outputDir, data->prefix, data->version,
                                data->archName);

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index badbce986e..2c40dcb114 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -124,7 +124,7 @@ testQemuCapsXML(const void *opaque)

     xmlFile = g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->archName);

-    capsFile = g_strdup_printf("%s/%s_%s.%s.%s",
+    capsFile = g_strdup_printf("%s/%s_%s_%s.%s",
                                data->inputDir, data->prefix, data->version,
                                data->archName, data->suffix);

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 41727cfd1a..8c2cb6aa45 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -832,15 +832,15 @@ testQemuCapsIterate(const char *suffix,
             return -1;
         }

-        /* Find the last dot */
-        if (!(archName = strrchr(tmp, '.'))) {
+        /* Find the underscore separating version from arch */
+        if (!(archName = strchr(version, '_'))) {
             VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name);
             return -1;
         }

         /* The version number and the architecture name are separated by
-         * a dot: overwriting that dot with \0 results in both being usable
-         * as independent, null-terminated strings */
+         * a underscore: overwriting that underscore with \0 results in both
+         * being usable as independent, null-terminated strings */
         archName[0] = '\0';
         archName++;

@@ -1011,7 +1011,7 @@ testQemuInfoInitArgs(struct testQemuInfo *info)

             stripmachinealiases = true;
         } else {
-            capsfile = g_strdup_printf("%s/caps_%s.%s.xml",
+            capsfile = g_strdup_printf("%s/caps_%s_%s.xml",
                                        TEST_QEMU_CAPS_PATH,
                                        info->args.capsver,
                                        info->args.capsarch);
-- 
2.39.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux