From 68ddb9d8858d153ee5ae0e21af4d8097d082ac50 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 8 Aug 2013 19:40:58 -0400
Subject: [PATCH] capabilities: Drop workarounds for long gone libvirt bugs

These were both fixed 4-5 years ago
---
 tests/capabilities-xml/capabilities-xen.xml |  2 +-
 virtinst/CapabilitiesParser.py              | 33 ---------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/tests/capabilities-xml/capabilities-xen.xml b/tests/capabilities-xml/capabilities-xen.xml
index fdfb00d54..f24fdf0f9 100644
--- a/tests/capabilities-xml/capabilities-xen.xml
+++ b/tests/capabilities-xml/capabilities-xen.xml
@@ -34,7 +34,7 @@
     <arch name="i686">
       <wordsize>32</wordsize>
       <domain type="xen"></domain>
-      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+      <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
       <machine>pc</machine>
       <machine>isapc</machine>
       <loader>/usr/lib/xen/boot/hvmloader</loader>
diff --git a/virtinst/CapabilitiesParser.py b/virtinst/CapabilitiesParser.py
index 2886ff93a..a2523b254 100644
--- a/virtinst/CapabilitiesParser.py
+++ b/virtinst/CapabilitiesParser.py
@@ -509,7 +509,6 @@ class Capabilities(object):
         util.parse_node_helper(self.xml, "capabilities",
                                self.parseXML,
                                RuntimeError)
-        self._fixBrokenEmulator()
 
     def _is_xen(self):
         for g in self.guests:
@@ -644,31 +643,6 @@ class Capabilities(object):
                    (a is None or g.arch == a):
                     return g
 
-    # 32-bit HVM emulator path, on a 64-bit host is wrong due
-    # to bug in libvirt capabilities. We fix by copying the
-    # 64-bit emualtor path
-    def _fixBrokenEmulator(self):
-        if self.host.arch != "x86_64":
-            return
-
-        fixEmulator = None
-        for g in self.guests:
-            if g.os_type != "hvm" or g.arch != "x86_64":
-                continue
-            for d in g.domains:
-                if d.emulator is not None and d.emulator.find("lib64") != -1:
-                    fixEmulator = d.emulator
-
-        if not fixEmulator:
-            return
-
-        for g in self.guests:
-            if g.os_type != "hvm" or g.arch != "i686":
-                continue
-            for d in g.domains:
-                if d.emulator is not None and d.emulator.find("lib64") == -1:
-                    d.emulator = fixEmulator
-
     def parseXML(self, node):
         child = node.children
         while child:
@@ -676,15 +650,8 @@ class Capabilities(object):
                 self.host = Host(child)
             elif child.name == "guest":
                 self.guests.append(Guest(child))
-            if child.name == "topology":
-                self._topology = Topology(child)
             child = child.next
 
-        # Libvirt < 0.4.1 placed topology info at the capabilities level
-        # rather than the host level. This is just for back compat
-        if self.host.topology is None:
-            self.host.topology = self._topology
-
     def get_cpu_values(self, arch):
         if not self._cpu_values:
             self._cpu_values = CPUValues()