[Libosinfo] [PATCH 26/39] data: split kvm into one file per platform

Daniel P. Berrange berrange at redhat.com
Mon Sep 28 15:51:44 UTC 2015


Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                  |  1 +
 data/platforms/Makefile.am                    |  7 ++-
 data/platforms/kvm.xml.in                     | 63 ---------------------------
 data/platforms/qemu-kvm/Makefile.am           |  1 +
 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in   | 10 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in | 11 +++++
 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in | 11 +++++
 po/POTFILES.in                                |  7 ++-
 11 files changed, 79 insertions(+), 65 deletions(-)
 delete mode 100644 data/platforms/kvm.xml.in
 create mode 100644 data/platforms/qemu-kvm/Makefile.am
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
 create mode 100644 data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in

diff --git a/configure.ac b/configure.ac
index 3e3968b..ce65160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,7 @@ AC_CONFIG_FILES([
 	data/datamaps/Makefile
 	data/devices/Makefile
 	data/platforms/Makefile
+	data/platforms/qemu-kvm/Makefile
 	data/install-scripts/Makefile
 	data/oses/Makefile
 	data/oses/altlinux/Makefile
diff --git a/data/platforms/Makefile.am b/data/platforms/Makefile.am
index 4b84d3e..6bbb126 100644
--- a/data/platforms/Makefile.am
+++ b/data/platforms/Makefile.am
@@ -1,6 +1,11 @@
 
+SUBDIRS = \
+	qemu-kvm \
+	$(NULL)
+
 databasedir = $(pkgdatadir)/db/hypervisors/
-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
+database_in_files = \
+	qemu.xml.in rhel-xen.xml.in xen.xml.in
 
 database_DATA = $(database_in_files:.xml.in=.xml)
 
diff --git a/data/platforms/kvm.xml.in b/data/platforms/kvm.xml.in
deleted file mode 100644
index 3833943..0000000
--- a/data/platforms/kvm.xml.in
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<libosinfo version="0.0.1">
-
-  <platform id="http://linux-kvm.org/1.0">
-    <short-id>qemu-kvm-1.0</short-id>
-    <_name>QEMU-KVM 1.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.0</version>
-    <release-date>2011-12-04</release-date>
-    <derives-from id="http://qemu.org/1.0"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.0.1">
-    <short-id>qemu-kvm-1.0.1</short-id>
-    <_name>QEMU-KVM 1.0.1</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.0.1</version>
-    <release-date>2012-04-17</release-date>
-    <upgrades id="http://linux-kvm.org/1.0"/>
-    <derives-from id="http://qemu.org/1.0.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.0">
-    <short-id>qemu-kvm-1.1.0</short-id>
-    <_name>QEMU-KVM 1.1.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.0</version>
-    <release-date>2012-07-02</release-date>
-    <upgrades id="http://linux-kvm.org/1.0.1"/>
-    <derives-from id="http://qemu.org/1.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.1">
-    <short-id>qemu-kvm-1.1.1</short-id>
-    <_name>QEMU-KVM 1.1.1</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.1</version>
-    <release-date>2012-08-27</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.0"/>
-    <derives-from id="http://qemu.org/1.1.1"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.1.2">
-    <short-id>qemu-kvm-1.1.2</short-id>
-    <_name>QEMU-KVM 1.1.2</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.1.2</version>
-    <release-date>2012-09-10</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.1"/>
-    <derives-from id="http://qemu.org/1.1.2"/>
-  </platform>
-
-  <platform id="http://linux-kvm.org/1.2.0">
-    <short-id>qemu-kvm-1.2.0</short-id>
-    <_name>QEMU-KVM 1.2.0</_name>
-    <_vendor>linux-kvm.org</_vendor>
-    <version>1.2.0</version>
-    <release-date>2012-09-10</release-date>
-    <upgrades id="http://linux-kvm.org/1.1.1-1"/>
-    <derives-from id="http://qemu.org/1.2.0"/>
-  </platform>
-
-</libosinfo>
diff --git a/data/platforms/qemu-kvm/Makefile.am b/data/platforms/qemu-kvm/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/platforms/qemu-kvm/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
new file mode 100644
index 0000000..a49abbc
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.0.1">
+    <short-id>qemu-kvm-1.0.1</short-id>
+    <_name>QEMU-KVM 1.0.1</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.0.1</version>
+    <release-date>2012-04-17</release-date>
+    <upgrades id="http://linux-kvm.org/1.0"/>
+    <derives-from id="http://qemu.org/1.0.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
new file mode 100644
index 0000000..fbfadad
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
@@ -0,0 +1,10 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.0">
+    <short-id>qemu-kvm-1.0</short-id>
+    <_name>QEMU-KVM 1.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.0</version>
+    <release-date>2011-12-04</release-date>
+    <derives-from id="http://qemu.org/1.0"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
new file mode 100644
index 0000000..ed21a5f
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.0">
+    <short-id>qemu-kvm-1.1.0</short-id>
+    <_name>QEMU-KVM 1.1.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.0</version>
+    <release-date>2012-07-02</release-date>
+    <upgrades id="http://linux-kvm.org/1.0.1"/>
+    <derives-from id="http://qemu.org/1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
new file mode 100644
index 0000000..3582ff1
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.1">
+    <short-id>qemu-kvm-1.1.1</short-id>
+    <_name>QEMU-KVM 1.1.1</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.1</version>
+    <release-date>2012-08-27</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.0"/>
+    <derives-from id="http://qemu.org/1.1.1"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
new file mode 100644
index 0000000..c5fea92
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.1.2">
+    <short-id>qemu-kvm-1.1.2</short-id>
+    <_name>QEMU-KVM 1.1.2</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.1.2</version>
+    <release-date>2012-09-10</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.1"/>
+    <derives-from id="http://qemu.org/1.1.2"/>
+  </platform>
+</libosinfo>
diff --git a/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in b/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
new file mode 100644
index 0000000..cfe87c5
--- /dev/null
+++ b/data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
@@ -0,0 +1,11 @@
+<libosinfo version="0.0.1">
+  <platform id="http://linux-kvm.org/1.2.0">
+    <short-id>qemu-kvm-1.2.0</short-id>
+    <_name>QEMU-KVM 1.2.0</_name>
+    <_vendor>linux-kvm.org</_vendor>
+    <version>1.2.0</version>
+    <release-date>2012-09-10</release-date>
+    <upgrades id="http://linux-kvm.org/1.1.1-1"/>
+    <derives-from id="http://qemu.org/1.2.0"/>
+  </platform>
+</libosinfo>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e7ed628..927c2d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -332,7 +332,12 @@ data/devices/qemu-ps2.xml.in
 data/devices/qemu-pci.xml.in
 data/devices/virtio-pci.xml.in
 data/devices/qemu-usb.xml.in
-data/platforms/kvm.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.0.1.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.0.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.0.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.1.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.1.2.xml.in
+data/platforms/qemu-kvm/qemu-kvm-1.2.0.xml.in
 data/platforms/qemu.xml.in
 data/platforms/rhel-xen.xml.in
 data/platforms/xen.xml.in
-- 
2.4.3




More information about the Libosinfo mailing list