From 414f6bbd99f304ada6d84ff90506a69cdde918e2 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 17 Aug 2013 17:59:17 -0400
Subject: [PATCH] guest: Use virtio on plain qemu on x86

It's been available for a long long time, and unifies code paths.
---
 tests/cli-test-xml/compare/qemu-plain.xml | 1 +
 tests/xmlconfig-xml/install-f11-qemu.xml  | 5 +++--
 virtManager/addhardware.py                | 2 +-
 virtinst/guest.py                         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/cli-test-xml/compare/qemu-plain.xml b/tests/cli-test-xml/compare/qemu-plain.xml
index cbca8987d..73152ec1e 100644
--- a/tests/cli-test-xml/compare/qemu-plain.xml
+++ b/tests/cli-test-xml/compare/qemu-plain.xml
@@ -25,6 +25,7 @@
     <interface type="network">
       <source network="default"/>
       <mac address="00:11:22:33:44:55"/>
+      <model type="virtio"/>
     </interface>
     <input type="tablet" bus="usb"/>
     <graphics type="vnc" port="-1"/>
diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml
index e33f01b84..bad8705cf 100644
--- a/tests/xmlconfig-xml/install-f11-qemu.xml
+++ b/tests/xmlconfig-xml/install-f11-qemu.xml
@@ -26,12 +26,12 @@
     <disk type="file" device="disk">
       <driver name="qemu" type="raw"/>
       <source file="/tmp/test.img"/>
-      <target dev="hda" bus="ide"/>
+      <target dev="vda" bus="virtio"/>
     </disk>
     <disk type="block" device="disk">
       <driver name="qemu" type="raw"/>
       <source dev="/dev/loop0"/>
-      <target dev="hdb" bus="ide"/>
+      <target dev="vdb" bus="virtio"/>
     </disk>
     <disk type="block" device="cdrom">
       <target dev="hdc" bus="ide"/>
@@ -40,6 +40,7 @@
     <interface type="network">
       <source network="default"/>
       <mac address="22:22:33:44:55:66"/>
+      <model type="virtio"/>
     </interface>
     <input type="tablet" bus="usb"/>
     <graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index 981ede702..70270de98 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -542,7 +542,7 @@ class vmmAddHardware(vmmGObjectUI):
                         _("SCSI disk"))
                 add_dev("usb", virtinst.VirtualDisk.DEVICE_DISK,
                         _("USB disk"))
-        if self.vm.get_hv_type() in ["kvm", "test"]:
+        if self.vm.get_hv_type() in ["qemu", "kvm", "test"]:
             add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK,
                     _("SATA disk"))
             add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK,
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 0cfdc84ac..b78e9f2cb 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -686,7 +686,7 @@ class Guest(XMLBuilder):
     def _can_virtio(self, key):
         if not self.os.is_x86():
             return False
-        if not self.conn.is_qemu() or self.type != "kvm":
+        if not self.conn.is_qemu():
             return False
         if not self._lookup_osdict_key(key, False):
             return False