[Libosinfo] [libosinfo] Add QEMU-KVM 1.2.2 hypervisor data

[Daniel P. Berrange]

On Tue, Jan 22, 2013 at 04:47:43PM +0100, Christophe Fergeau wrote:
> ---
>  data/hypervisors/Makefile.am |  2 +-
>  data/hypervisors/kvm.xml.in  | 57 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 58 insertions(+), 1 deletion(-)
>  create mode 100644 data/hypervisors/kvm.xml.in
> 
> diff --git a/data/hypervisors/Makefile.am b/data/hypervisors/Makefile.am
> index 19ac267..2f7dd45 100644
> --- a/data/hypervisors/Makefile.am
> +++ b/data/hypervisors/Makefile.am
> @@ -1,6 +1,6 @@
>  
>  databasedir = $(pkgdatadir)/db/hypervisors/
> -database_in_files = rhel-xen.xml.in xen.xml.in
> +database_in_files = kvm.xml.in rhel-xen.xml.in xen.xml.in
>  
>  database_DATA = $(database_in_files:.xml.in=.xml)
>  
> diff --git a/data/hypervisors/kvm.xml.in b/data/hypervisors/kvm.xml.in
> new file mode 100644
> index 0000000..3653c46
> --- /dev/null
> +++ b/data/hypervisors/kvm.xml.in
> @@ -0,0 +1,57 @@
> +<!-- Official QEMU-KVM releases -->
> +<libosinfo version="0.0.1">
> +
> +  <platform id="http://qemu.org/kvm/1.2.2">
> +    <short-id>kvm-1.2.2</short-id>
> +    <_name>QEMU-KVM 1.2.2</_name>
> +    <_vendor>qemu.org</_vendor>
> +    <version>1.2.2</version>
> +
> +    <devices>
> +      <!-- block: LSI -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1000/0012"/>
> +      <!-- video: vga -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1234/1111"/>
> +      <!-- video: cirrus -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1013/00b8"/>
> +      <!-- video: vmvga -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/15ad/0710"/>
> +      <!-- video: qxl -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
> +      <!-- network: ne2k_pci-->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8029"/>
> +      <!-- network: pcnet -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
> +      <!-- network: rtl8139 -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/10ec/8139"/>
> +      <!-- network: e1000 -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e"/>
> +      <!-- audio: es1370 -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1274/5000"/>
> +      <!-- audio: AC97 -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2415"/>
> +      <!-- audio: ICH6 -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/2668"/>
> +      <!-- watchdog devices -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/25ab"/>
> +      <device id="isa://ib700"/>
> +      <!-- ps2: keyboard -->
> +      <device id="http://qemu.org/ps2/keyboard"/>
> +      <!-- ps2: mouse -->
> +      <device id="http://qemu.org/ps2/mouse"/>
> +      <!-- USB tablet -->
> +      <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
> +      <!-- virtio-net -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
> +      <!-- virtio-block -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
> +      <!-- virtio-balloon -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
> +      <!-- virtio-console -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
> +      <!-- virtio-9p -->
> +      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1009"/>
> +    </devices>
> +  </platform>

So nothing wrong with the data you've added here.

At some point we'll need to get a way to express different devices
per architecture, since not all qemu-system-XXXX emulators provide
the same device list. This isn't a new problem, so lets just pretend
only x86 exists for now.


In terms of QEMU vs QEMU-KVM, for all intents & purposes they support
the same devices. QEMU-KVM is the fork, so I'd say we should be adding
devices against <platform> entries for plain QEMU, and then the
<platform> entries for QEMU-KVM can be marked as "derives-from" or
"clones" QEMU.


FYI that device list is accurate back to at least QEMU 1.0.0, so I'd
just add the list against that relase, and then create <product>
entries with "upgrades" for every QEMU major/minor release since
then.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|