NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

libvirtobject: Unify status signals

Browse Source 
Dispatch them all from the actual object and not proxied through
the connection. Use the same signal name for all objects with the same
signature.
This commit is contained in:
Cole Robinson
2015-04-09 16:07:09 -04:00
parent a45fc36d06
commit 01bf07ba11
13 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
virtManager/connection.py
View File

@@ -52,17 +52,10 @@ class vmmConnection(vmmGObject):
"vm-removed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"net-added": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"net-removed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"net-started": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"net-stopped": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"pool-added": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"pool-removed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"pool-started": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"pool-stopped": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"pool-refreshed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"interface-added": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"interface-removed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"interface-started": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"interface-stopped": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"nodedev-added": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"nodedev-removed": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"resources-sampled": (GObject.SignalFlags.RUN_FIRST, None, []),
@@ -973,9 +966,6 @@ class vmmConnection(vmmGObject):
return pollhelpers.fetch_vms(self._backend, self._vms.copy(),
(lambda obj, key: vmmDomain(self, obj, key)))
def _obj_signal_proxy(self, obj, signal):
self.emit(signal, obj.get_connkey())
def schedule_priority_tick(self, **kwargs):
# args/kwargs are what is passed to def tick()
if "stats_update" not in kwargs:
@@ -1140,8 +1130,6 @@ class vmmConnection(vmmGObject):
obj.cleanup()
for connkey, obj in newNets.items():
logging.debug("network=%s added", obj.get_name())
obj.connect("started", self._obj_signal_proxy, "net-started")
obj.connect("stopped", self._obj_signal_proxy, "net-stopped")
self.emit("net-added", connkey)
# Update storage pool states
@@ -1151,10 +1139,6 @@ class vmmConnection(vmmGObject):
obj.cleanup()
for connkey, obj in newPools.items():
logging.debug("pool=%s added", obj.get_name())
obj.connect("started", self._obj_signal_proxy, "pool-started")
obj.connect("stopped", self._obj_signal_proxy, "pool-stopped")
obj.connect("refreshed", self._obj_signal_proxy,
"pool-refreshed")
self.emit("pool-added", connkey)
# Update interface states
@@ -1164,10 +1148,6 @@ class vmmConnection(vmmGObject):
obj.cleanup()
for name, obj in newInterfaces.items():
logging.debug("interface=%s added", obj.get_name())
obj.connect("started", self._obj_signal_proxy,
"interface-started")
obj.connect("stopped", self._obj_signal_proxy,
"interface-stopped")
self.emit("interface-added", name)
# Update nodedev list

2
virtManager/create.py
View File

@@ -1906,7 +1906,7 @@ class vmmCreate(vmmGObjectUI):
"VM creation.", poolname, exc_info=True)
def check_install_status(self, vm, ignore1, ignore2, virtinst_guest=None):
def check_install_status(self, vm, virtinst_guest):
if vm.is_crashed():
logging.debug("VM crashed, cancelling install plans.")
return True

2
virtManager/details.py
View File

@@ -1300,7 +1300,7 @@ class vmmDetails(vmmGObjectUI):
self.widget("details-vm-menu").get_submenu().change_run_text(text)
self.widget("control-run").set_label(strip_text)
def refresh_vm_state(self, ignore1=None, ignore2=None, ignore3=None):
def refresh_vm_state(self, ignore=None):
vm = self.vm
status = self.vm.status()

8
virtManager/domain.py
View File

@@ -209,7 +209,6 @@ class vmmDomain(vmmLibvirtObject):
backed by a virtinst.Guest object for new VM 'customize before install'
"""
__gsignals__ = {
"status-changed": (GObject.SignalFlags.RUN_FIRST, None, [int, int]),
"resources-sampled": (GObject.SignalFlags.RUN_FIRST, None, []),
"inspection-changed": (GObject.SignalFlags.RUN_FIRST, None, []),
"pre-startup": (GObject.SignalFlags.RUN_FIRST, None, [object]),
@@ -1321,7 +1320,7 @@ class vmmDomain(vmmLibvirtObject):
Attempt a manual reboot by invoking 'shutdown', then listen
for a state change and restart the VM
"""
def reboot_listener(vm, ignore1, ignore2, self):
def reboot_listener(vm, self):
if vm.is_crashed():
# Abandon reboot plans
self.reboot_listener = None
@@ -1347,7 +1346,7 @@ class vmmDomain(vmmLibvirtObject):
def add_reboot():
self.reboot_listener = self.connect_opt_out("status-changed",
reboot_listener, self)
reboot_listener, self)
self.idle_add(add_reboot)
def shutdown(self):
@@ -1748,7 +1747,6 @@ class vmmDomain(vmmLibvirtObject):
if status == self.lastStatus:
return
oldstatus = self.lastStatus
self.lastStatus = status
if self.domain_state_supported:
self._lastStatusReason = self._backend.state()[1]
@@ -1758,7 +1756,7 @@ class vmmDomain(vmmLibvirtObject):
# are operating with fresh XML
self.refresh_xml()
self.idle_emit("status-changed", oldstatus, status)
self.idle_emit("status-changed")
def inspection_data_updated(self):
self.idle_emit("inspection-changed")

25
virtManager/host.py
View File

@@ -131,13 +131,9 @@ class vmmHost(vmmGObjectUI):
self.conn.connect("net-added", self.repopulate_networks)
self.conn.connect("net-removed", self.repopulate_networks)
self.conn.connect("net-started", self.refresh_network)
self.conn.connect("net-stopped", self.refresh_network)
self.conn.connect("interface-added", self.repopulate_interfaces)
self.conn.connect("interface-removed", self.repopulate_interfaces)
self.conn.connect("interface-started", self.refresh_interface)
self.conn.connect("interface-stopped", self.refresh_interface)
self.conn.connect("state-changed", self.conn_state_changed)
self.conn.connect("resources-sampled", self.refresh_resources)
@@ -498,11 +494,11 @@ class vmmHost(vmmGObjectUI):
except KeyError:
return None
def refresh_network(self, src_ignore, connkey):
def refresh_network(self, net):
connkey = net.get_connkey()
uilist = self.widget("net-list")
sel = uilist.get_selection()
model, treeiter = sel.get_selected()
net = self.conn.get_net(connkey)
net.tick()
for row in uilist.get_model():
@@ -703,6 +699,11 @@ class vmmHost(vmmGObjectUI):
net_list.get_selection().unselect_all()
model.clear()
for net in self.conn.list_nets():
try:
net.disconnect_by_func(self.refresh_network)
except:
pass
net.connect("status-changed", self.refresh_network)
model.append([net.get_connkey(), net.get_name(), "network-idle",
Gtk.IconSize.LARGE_TOOLBAR,
bool(net.is_active())])
@@ -775,7 +776,7 @@ class vmmHost(vmmGObjectUI):
if cp is None:
return
self.refresh_interface(None, cp.get_name())
self.refresh_interface(cp)
def current_interface(self):
connkey = uiutil.get_list_selection(self.widget("interface-list"), 0)
@@ -915,13 +916,10 @@ class vmmHost(vmmGObjectUI):
self.widget("interface-child-box").set_visible(show_child)
self.populate_interface_children()
def refresh_interface(self, src, connkey):
ignore = src
def refresh_interface(self, iface):
iface_list = self.widget("interface-list")
sel = iface_list.get_selection()
model, treeiter = sel.get_selected()
iface = self.conn.get_interface(connkey)
name = iface.get_name()
iface.tick()
@@ -953,6 +951,11 @@ class vmmHost(vmmGObjectUI):
iface_list.get_selection().unselect_all()
model.clear()
for iface in self.conn.list_interfaces():
try:
iface.disconnect_by_func(self.refresh_interface)
except:
pass
iface.connect("status-changed", self.refresh_interface)
model.append([iface.get_connkey(), iface.get_name(),
"network-idle", Gtk.IconSize.LARGE_TOOLBAR,
bool(iface.is_active())])

8
virtManager/interface.py
View File

@@ -42,13 +42,13 @@ class vmmInterface(vmmLibvirtObject):
def _define(self, xml):
return self.conn.define_interface(xml)
def set_active(self, state):
def _set_active(self, state):
if state == self._active:
return
self.idle_emit(state and "started" or "stopped")
self._active = state
self.refresh_xml()
self._invalidate_xml()
self.idle_emit("status-changed")
def _backend_get_active(self):
ret = True
@@ -61,7 +61,7 @@ class vmmInterface(vmmLibvirtObject):
return bool(self._backend.isActive())
def tick(self):
self.set_active(self._backend_get_active())
self._set_active(self._backend_get_active())
def is_active(self):
return self._active

1
virtManager/libvirtobject.py
View File

@@ -27,6 +27,7 @@ from .baseclass import vmmGObject
class vmmLibvirtObject(vmmGObject):
__gsignals__ = {
"status-changed": (GObject.SignalFlags.RUN_FIRST, None, []),
"config-changed": (GObject.SignalFlags.RUN_FIRST, None, []),
"started": (GObject.SignalFlags.RUN_FIRST, None, []),
"stopped": (GObject.SignalFlags.RUN_FIRST, None, []),

4
virtManager/manager.py
View File

@@ -803,9 +803,7 @@ class vmmManager(vmmGObjectUI):
self.vm_row_updated(vm)
def vm_status_changed(self, vm, oldstatus, newstatus):
ignore = newstatus
ignore = oldstatus
def vm_status_changed(self, vm):
parent = self.rows[vm.conn.get_uri()].iter
vmlist = self.widget("vm-list")
model = vmlist.get_model()

5
virtManager/network.py
View File

@@ -78,9 +78,10 @@ class vmmNetwork(vmmLibvirtObject):
def _set_active(self, state):
if state == self._active:
return
self.refresh_xml()
self.idle_emit(state and "started" or "stopped")
self._active = state
self._invalidate_xml()
self.idle_emit("status-changed")
def force_update_status(self, from_event=False, log=True):
ignore = log

4
virtManager/serialcon.py
View File

@@ -411,8 +411,8 @@ class vmmSerialConsole(vmmGObject):
return False
def vm_status_changed(self, src_ignore, oldstatus_ignore, status):
if status in [libvirt.VIR_DOMAIN_RUNNING]:
def vm_status_changed(self, vm):
if vm.status() in [libvirt.VIR_DOMAIN_RUNNING]:
self.open_console()
else:
self.console.close()

26
virtManager/storagelist.py
View File

@@ -118,16 +118,6 @@ class vmmStorageList(vmmGObjectUI):
def _cleanup(self):
try:
self.conn.disconnect_by_func(self._conn_pool_count_changed)
self.conn.disconnect_by_func(self._conn_pool_count_changed)
self.conn.disconnect_by_func(self._conn_pool_changed)
self.conn.disconnect_by_func(self._conn_pool_changed)
self.conn.disconnect_by_func(self._conn_pool_changed)
self.conn.disconnect_by_func(self._conn_state_changed)
except:
pass
self.conn = None
if self._addpool:
@@ -238,9 +228,6 @@ class vmmStorageList(vmmGObjectUI):
self._populate_pools()
self.conn.connect("pool-added", self._conn_pool_count_changed)
self.conn.connect("pool-removed", self._conn_pool_count_changed)
self.conn.connect("pool-started", self._conn_pool_changed)
self.conn.connect("pool-stopped", self._conn_pool_changed)
self.conn.connect("pool-refreshed", self._conn_pool_changed)
self.conn.connect("state-changed", self._conn_state_changed)
self._conn_state_changed()
@@ -392,6 +379,14 @@ class vmmStorageList(vmmGObjectUI):
model.clear()
for pool in self.conn.list_pools():
try:
pool.disconnect_by_func(self._pool_changed)
pool.disconnect_by_func(self._pool_changed)
except:
pass
pool.connect("status-changed", self._pool_changed)
pool.connect("refreshed", self._pool_changed)
name = pool.get_name()
typ = StoragePool.get_pool_type_desc(pool.get_type())
label = "%s\n<span size='small'>%s</span>" % (name, typ)
@@ -576,9 +571,8 @@ class vmmStorageList(vmmGObjectUI):
self._set_storage_error_page(
_("Libvirt connection does not support storage management."))
def _conn_pool_changed(self, src, connkey):
ignore = src
self._update_pool_row(connkey)
def _pool_changed(self, pool):
self._update_pool_row(pool.get_connkey())
def _conn_pool_count_changed(self, src, connkey):
ignore = src

5
virtManager/storagepool.py
View File

@@ -140,9 +140,10 @@ class vmmStoragePool(vmmLibvirtObject):
def _set_active(self, state):
if state == self._active:
return
self.idle_emit(state and "started" or "stopped")
self._active = state
self.refresh_xml()
self._invalidate_xml()
self.idle_emit("status-changed")
def _kick_conn(self):
self.conn.schedule_priority_tick(pollpool=True)

2
virtManager/systray.py
View File

@@ -325,7 +325,7 @@ class vmmSystray(vmmGObject):
placeholder.set_sensitive(False)
vm_menu.add(placeholder)
def vm_state_changed(self, vm, ignore=None, ignore2=None):
def vm_state_changed(self, vm):
menu_item = self._get_vm_menu_item(vm)
if not menu_item:
return