From ae7ebc220b153048e0db72763958630ac401e341 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 1 Sep 2013 19:21:21 -0400
Subject: [PATCH] details: Properly limit machine type list by guests arch/type

---
 ui/vmm-details.ui      |  4 ++--
 virtManager/details.py | 44 +++++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/ui/vmm-details.ui b/ui/vmm-details.ui
index 8ad0246e4..ea2e7261a 100644
--- a/ui/vmm-details.ui
+++ b/ui/vmm-details.ui
@@ -1372,7 +1372,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="label81">
+                                          <object class="GtkLabel" id="overview-machine-label">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
@@ -1388,7 +1388,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox30">
+                                          <object class="GtkHBox" id="overview-machine-box">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="spacing">6</property>
diff --git a/virtManager/details.py b/virtManager/details.py
index bd07ca56b..eabc8d7e9 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -789,29 +789,37 @@ class vmmDetails(vmmGObjectUI):
 
         arch = self.vm.get_arch()
         caps = self.vm.conn.caps
-        machines = []
 
-        if len(caps.guests) > 0:
-            for guest in caps.guests:
-                if len(guest.domains) > 0:
-                    for domain in guest.domains:
-                        machines = list(set(machines + domain.machines))
+        # Machine type
+        machtype_combo = self.widget("machine-type-combo")
+        machtype_model = Gtk.ListStore(str)
+        machtype_combo.set_model(machtype_model)
+        text = Gtk.CellRendererText()
+        machtype_combo.pack_start(text, True)
+        machtype_combo.add_attribute(text, 'text', 0)
+        machtype_model.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 
         if arch in ["i686", "x86_64"]:
-            self.widget("label81").hide()
-            self.widget("hbox30").hide()
+            self.widget("overview-machine-label").hide()
+            self.widget("overview-machine-box").hide()
         else:
-            machtype_combo = self.widget("machine-type-combo")
-            machtype_model = Gtk.ListStore(str)
-            machtype_combo.set_model(machtype_model)
-            text = Gtk.CellRendererText()
-            machtype_combo.pack_start(text, True)
-            machtype_combo.add_attribute(text, 'text', 0)
-            machtype_model.set_sort_column_id(0, Gtk.SortType.ASCENDING)
+            machines = []
 
-            if len(machines) > 0:
-                for machine in machines:
-                    machtype_model.append([machine])
+            try:
+                ignore, domain = caps.guest_lookup(
+                    os_type=self.vm.get_abi_type(),
+                    arch=self.vm.get_arch(),
+                    typ=self.vm.get_hv_type(),
+                    machine=self.vm.get_machtype())
+
+                machines = domain.machines[:]
+            except:
+                logging.exception("Error determining machine list")
+
+            for machine in machines:
+                if machine == "none":
+                    continue
+                machtype_model.append([machine])
 
         # Security info tooltips
         self.widget("security-static-info").set_tooltip_text(