[Libosinfo] [PATCH osinfo-db v4 5/5] os: Add q35/ich9/e1000e to rhel6

[Cole Robinson]

rhel6 does support q35, it just has some issues when combined with
virtio, as rhel6 doesn't support virtio1.0

https://ladipro.wordpress.com/2016/10/17/virtio1-0-and-windows-guests/

However that decision should be left up to apps and not mandated by
osinfo metadata.

Add this annotation for rhel6 to ensure apps aren't naively depending
solely on the presence of qemu-x86-q35 in the device list, and instead
checking for specific virtio support as well

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
See the virt-manager patch for usage:

https://github.com/crobinso/virt-manager/commit/3d34ca2ee926ef45ddb85edeb41e34ceb91c6d2d

The logic is:

def supports_q35():
    if has_virtio_net and not has_virtio1_net:
        return False
    return has_q35

virtio_net/virtio1_net here is basically a proxy for
virtio/virtio1 support as a whole. This will match rhel7,
but not rhel6 which lacks virtio1 support, but will also
match all windows OS. I don't know how this logic will apply
to gnome-boxes though which uses virtio for windows, but
via autoinstall scripts, I'm not really sure how that all
fits together

 data/os/redhat.com/rhel-6.0.xml.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/os/redhat.com/rhel-6.0.xml.in b/data/os/redhat.com/rhel-6.0.xml.in
index 673891a..9c93efe 100644
--- a/data/os/redhat.com/rhel-6.0.xml.in
+++ b/data/os/redhat.com/rhel-6.0.xml.in
@@ -18,6 +18,12 @@
       <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
       <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
       <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+
+      <!-- q35 works, but has known deficiencies with virtio.
+           Generally apps should check for q35+virtio1.0 -->
+      <device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 -->
+      <device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e -->
+      <device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda -->
     </devices>
 
     <media arch="i686">
-- 
2.19.0