details: Remove runtime vcpu pinning list

I don't think anyone depended on this, and it's overkill for virt-manager.

3 files changed, 2 insertions, 160 deletions

diff --git a/ui/details.ui b/ui/details.ui
index 8de89c23..45256822 100644
--- a/ui/details.ui
+++ b/ui/details.ui
@@ -1518,6 +1518,7 @@
                           <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="valign">start</property>
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkFrame" id="CPUs">
@@ -2219,6 +2220,7 @@
                                               <object class="GtkAlignment" id="alignment24">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">False</property>
+                                                <property name="hexpand">False</property>
                                                 <child>
                                                   <placeholder/>
                                                 </child>
@@ -2334,43 +2336,6 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label29">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">R_untime pinning:</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">config-vcpu-list</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkScrolledWindow" id="scrolledwindow1">
-                                                <property name="height_request">100</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="shadow_type">in</property>
-                                                <child>
-                                                  <object class="GtkTreeView" id="config-vcpu-list">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <child internal-child="selection">
-                                                      <object class="GtkTreeSelection" id="treeview-selection4"/>
-                                                    </child>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
diff --git a/virtManager/details.py b/virtManager/details.py
index d2c24f89..919f79b5 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -820,35 +820,6 @@ class vmmDetails(vmmGObjectUI):
                 _("Libvirt did not detect NUMA capabilities."))
 
 
-        # [ VCPU #, Currently running on Phys CPU #, CPU Pinning list ]
-        vcpu_list = self.widget("config-vcpu-list")
-        vcpu_model = Gtk.ListStore(str, str, str)
-        vcpu_list.set_model(vcpu_model)
-
-        vcpuCol = Gtk.TreeViewColumn(_("VCPU"))
-        physCol = Gtk.TreeViewColumn(_("On CPU"))
-        pinCol  = Gtk.TreeViewColumn(_("Pinning"))
-
-        vcpu_list.append_column(vcpuCol)
-        vcpu_list.append_column(physCol)
-        vcpu_list.append_column(pinCol)
-
-        vcpu_text = Gtk.CellRendererText()
-        vcpuCol.pack_start(vcpu_text, True)
-        vcpuCol.add_attribute(vcpu_text, 'text', 0)
-        vcpuCol.set_sort_column_id(0)
-
-        phys_text = Gtk.CellRendererText()
-        physCol.pack_start(phys_text, True)
-        physCol.add_attribute(phys_text, 'text', 1)
-        physCol.set_sort_column_id(1)
-
-        pin_text = Gtk.CellRendererText()
-        pin_text.set_property("editable", True)
-        pin_text.connect("edited", self.config_vcpu_pin)
-        pinCol.pack_start(pin_text, True)
-        pinCol.add_attribute(pin_text, 'text', 2)
-
         # Boot device list
         boot_list = self.widget("config-boot-list")
         # model = [ XML boot type, display name, icon name, enabled ]
@@ -1343,7 +1314,6 @@ class vmmDetails(vmmGObjectUI):
 
         details = self.widget("details-pages")
         self.page_refresh(details.get_current_page())
-        self._refresh_runtime_pinning()
 
         errmsg = self.vm.snapshots_supported()
         cansnap = not bool(errmsg)
@@ -1973,9 +1943,7 @@ class vmmDetails(vmmGObjectUI):
 
         if self.edited(EDIT_CPUSET):
             cpuset = self.get_text("config-vcpupin")
-            print cpuset
             add_define(self.vm.define_cpuset, cpuset)
-            add_hotplug(self.config_vcpu_pin_cpuset, cpuset)
 
         if self.edited(EDIT_CPU):
             model, vendor = self.get_config_cpu_model()
@@ -2000,43 +1968,6 @@ class vmmDetails(vmmGObjectUI):
             self._cpu_copy_host = False
         return ret
 
-    def config_vcpu_pin(self, src_ignore, path, new_text):
-        vcpu_list = self.widget("config-vcpu-list")
-        vcpu_model = vcpu_list.get_model()
-        row = vcpu_model[path]
-        conn = self.vm.conn
-
-        try:
-            new_text = new_text.strip()
-            vcpu_num = int(row[0])
-            pinlist = virtinst.DomainNumatune.cpuset_str_to_tuple(
-                                                conn.get_backend(), new_text)
-        except Exception, e:
-            self.err.val_err(_("Error building pin list"), e)
-            return
-
-        try:
-            self.vm.pin_vcpu(vcpu_num, pinlist)
-        except Exception, e:
-            self.err.show_err(_("Error pinning vcpus"), e)
-            return
-
-        self._refresh_runtime_pinning()
-
-    def config_vcpu_pin_cpuset(self, cpuset):
-        conn = self.vm.conn
-        vcpu_list = self.widget("config-vcpu-list")
-        vcpu_model = vcpu_list.get_model()
-
-        if self.vm.vcpu_pinning() == cpuset:
-            return
-
-        pinlist = virtinst.DomainNumatune.cpuset_str_to_tuple(
-                                                conn.get_backend(), cpuset)
-        for row in vcpu_model:
-            vcpu_num = row[0]
-            self.vm.pin_vcpu(int(vcpu_num), pinlist)
-
     # Memory
     def config_memory_apply(self):
         df, da, add_define, hf, ha, add_hotplug = self.make_apply_data()
@@ -2588,51 +2519,6 @@ class vmmDetails(vmmGObjectUI):
         # Warn about overcommit
         warn = bool(self.config_get_vcpus() > host_active_count)
         self.widget("config-vcpus-warn-box").set_visible(warn)
-    def _refresh_cpu_pinning(self):
-        # Populate VCPU pinning
-        vcpupin  = self.vm.vcpu_pinning()
-        self.widget("config-vcpupin").set_text(vcpupin)
-
-    def _refresh_runtime_pinning(self):
-        conn = self.vm.conn
-        host_active_count = conn.host_active_processor_count()
-
-        vcpu_list = self.widget("config-vcpu-list")
-        vcpu_model = vcpu_list.get_model()
-        vcpu_model.clear()
-
-        reason = ""
-        if not self.vm.is_active():
-            reason = _("VCPU info only available for running domain.")
-        else:
-            try:
-                vcpu_info, vcpu_pinning = self.vm.vcpu_info()
-            except Exception, e:
-                reason = _("Error getting VCPU info: %s") % str(e)
-
-            if not self.vm.getvcpus_supported:
-                reason = _("Virtual machine does not support runtime "
-                           "VPCU info.")
-
-        vcpu_list.set_sensitive(not bool(reason))
-        vcpu_list.set_tooltip_text(reason or "")
-        if reason:
-            return
-
-        def build_cpuset_str(pin_info):
-            pinstr = ""
-            for i in range(host_active_count):
-                if i < len(pin_info) and pin_info[i]:
-                    pinstr += (",%s" % str(i))
-
-            return pinstr.strip(",")
-
-        for idx in range(len(vcpu_info)):
-            vcpu = str(vcpu_info[idx][0])
-            vcpucur = str(vcpu_info[idx][3])
-            vcpupin = build_cpuset_str(vcpu_pinning[idx])
-
-            vcpu_model.append([vcpu, vcpucur, vcpupin])
 
     def _refresh_cpu_config(self, cpu):
         feature_ui = self.widget("cpu-features")
@@ -2681,8 +2567,6 @@ class vmmDetails(vmmGObjectUI):
         cpu = self.vm.get_cpu_config()
 
         self._refresh_cpu_count()
-        self._refresh_cpu_pinning()
-        self._refresh_runtime_pinning()
         self._refresh_cpu_config(cpu)
 
     def refresh_config_memory(self):
diff --git a/virtManager/domain.py b/virtManager/domain.py
index e96849e9..a060b6df 100644
--- a/virtManager/domain.py
+++ b/virtManager/domain.py
@@ -941,13 +941,6 @@ class vmmDomain(vmmLibvirtObject):
     def _XMLDesc(self, flags):
         return self._backend.XMLDesc(flags)
 
-    def pin_vcpu(self, vcpu_num, pinlist):
-        self._backend.pinVcpu(vcpu_num, pinlist)
-    def vcpu_info(self):
-        if self.is_active() and self.getvcpus_supported:
-            return self._backend.vcpus()
-        return [[], []]
-
     def get_autostart(self):
         return self._backend.autostart()
     def set_autostart(self, val):