[Libosinfo] [PATCH osinfo-db v4 4/5] os: Add q35/ich9/e1000e alongside virtio1.0 <device>

[Cole Robinson]

q35 is from 2007, so older OS versions definitely support it,
however combining q35 with virtio1.0 is the optimal config

https://ladipro.wordpress.com/2016/10/17/virtio1-0-and-windows-guests/
Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 data/os/debian.org/debian-9.xml.in         | 3 +++
 data/os/fedoraproject.org/fedora-23.xml.in | 5 ++++-
 data/os/opensuse.org/opensuse-42.2.xml.in  | 3 +++
 data/os/redhat.com/rhel-7.2.xml.in         | 3 +++
 data/os/suse.com/sled-12.2.xml.in          | 3 +++
 data/os/suse.com/sles-12.2.xml.in          | 3 +++
 data/os/ubuntu.com/ubuntu-17.04.xml.in     | 3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index d90ceb9..a43beb2 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -23,6 +23,9 @@
       <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <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>
 
     <resources arch="all">
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 2711620..9a3ce13 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -37,7 +37,10 @@
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
       <!-- virtio-1.0-gpu kmod is present, but mesa is not functional so
-	   pretend its just not available until F24 to avoid bug reports -->
+           pretend its just not available until F24 to avoid bug reports -->
+      <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>
 
     <!-- Workstation -->
diff --git a/data/os/opensuse.org/opensuse-42.2.xml.in b/data/os/opensuse.org/opensuse-42.2.xml.in
index 2e77055..47c4121 100644
--- a/data/os/opensuse.org/opensuse-42.2.xml.in
+++ b/data/os/opensuse.org/opensuse-42.2.xml.in
@@ -24,6 +24,9 @@
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
       <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
+      <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="x86_64">
diff --git a/data/os/redhat.com/rhel-7.2.xml.in b/data/os/redhat.com/rhel-7.2.xml.in
index 5c8db2b..7cdae3b 100644
--- a/data/os/redhat.com/rhel-7.2.xml.in
+++ b/data/os/redhat.com/rhel-7.2.xml.in
@@ -23,6 +23,9 @@
       <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <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="x86_64">
diff --git a/data/os/suse.com/sled-12.2.xml.in b/data/os/suse.com/sled-12.2.xml.in
index 67d2b17..58c1383 100644
--- a/data/os/suse.com/sled-12.2.xml.in
+++ b/data/os/suse.com/sled-12.2.xml.in
@@ -23,6 +23,9 @@
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
       <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
+      <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="x86_64">
diff --git a/data/os/suse.com/sles-12.2.xml.in b/data/os/suse.com/sles-12.2.xml.in
index dccc443..27cd292 100644
--- a/data/os/suse.com/sles-12.2.xml.in
+++ b/data/os/suse.com/sles-12.2.xml.in
@@ -23,6 +23,9 @@
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
       <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
+      <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="x86_64">
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index 28e9784..63bffd6 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -25,6 +25,9 @@
       <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
       <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
       <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+      <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>
 
     <resources arch="all">
-- 
2.19.0