From: Jiri Denemark Date: Thu, 28 Apr 2016 15:45:41 +0000 (+0200) Subject: qemucapabilitiestest: Rename *.caps to *.xml X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7aa86f635832f7d89f90fa46b4a9475193c906f9;p=libvirt.git qemucapabilitiestest: Rename *.caps to *.xml Signed-off-by: Jiri Denemark --- diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 1aa6bb1352..f7a3868ff2 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -103,7 +103,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, virQEMUCapsPtr qemuCaps = NULL; virDomainCapsLoaderPtr loader = &domCaps->os.loader; - if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.caps", + if (virAsprintf(&path, "%s/qemucapabilitiesdata/%s.%s.xml", abs_srcdir, name, virArchToString(arch)) < 0 || !(qemuCaps = qemuTestParseCapabilities(path))) goto cleanup; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps deleted file mode 100644 index 257a123896..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.caps +++ /dev/null @@ -1,159 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1002002 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml new file mode 100644 index 0000000000..257a123896 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml @@ -0,0 +1,159 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1002002 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps deleted file mode 100644 index 6f6a5b9b95..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.caps +++ /dev/null @@ -1,179 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1003001 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml new file mode 100644 index 0000000000..6f6a5b9b95 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml @@ -0,0 +1,179 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1003001 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps deleted file mode 100644 index 18550e29ba..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.caps +++ /dev/null @@ -1,181 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1004002 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml new file mode 100644 index 0000000000..18550e29ba --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml @@ -0,0 +1,181 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1004002 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps deleted file mode 100644 index 72f09f7a6b..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.caps +++ /dev/null @@ -1,190 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1005003 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml new file mode 100644 index 0000000000..72f09f7a6b --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml @@ -0,0 +1,190 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1005003 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps deleted file mode 100644 index c612c11ecc..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.caps +++ /dev/null @@ -1,200 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1006000 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml new file mode 100644 index 0000000000..c612c11ecc --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml @@ -0,0 +1,200 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1006000 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps deleted file mode 100644 index f4603c155f..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.caps +++ /dev/null @@ -1,202 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1006050 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml new file mode 100644 index 0000000000..f4603c155f --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml @@ -0,0 +1,202 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1006050 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps deleted file mode 100644 index 4663e192bc..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.caps +++ /dev/null @@ -1,225 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2001001 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml new file mode 100644 index 0000000000..4663e192bc --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml @@ -0,0 +1,225 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2001001 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps deleted file mode 100644 index a8df7e1c41..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.caps +++ /dev/null @@ -1,245 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2004000 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml new file mode 100644 index 0000000000..a8df7e1c41 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml @@ -0,0 +1,245 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2004000 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps deleted file mode 100644 index 216017377e..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.caps +++ /dev/null @@ -1,246 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2004000 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml new file mode 100644 index 0000000000..216017377e --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml @@ -0,0 +1,246 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2004000 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps deleted file mode 100644 index 9024d63882..0000000000 --- a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.caps +++ /dev/null @@ -1,251 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2005050 - 0 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml new file mode 100644 index 0000000000..9024d63882 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml @@ -0,0 +1,251 @@ + + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2005050 + 0 + + x86_64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 8b73a8910a..b8f931af57 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -100,7 +100,7 @@ testQemuCaps(const void *opaque) if (virAsprintf(&repliesFile, "%s/qemucapabilitiesdata/%s.%s.replies", abs_srcdir, data->base, data->archName) < 0 || - virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.caps", + virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", abs_srcdir, data->base, data->archName) < 0) goto cleanup;