f42ba1daac
533d708d-fix-showing-vcpus-values.patch 533d7602-fix-changing-graphics-type.patch 533d7be7-clarify-iscsi-IQN-fields.patch - Dropped virtman-init-vm-processor-topology.patch in favor of upstream 533d708d-fix-showing-vcpus-values.patch - bnc#869024 - Build0198: Only option to create a virtual machine is "import existing disk image" virtman-add-s390x-arch-support.patch - bnc#871642 - virt-manager wants to install libvirt-daemon-xen even when it is installed xen.spec - Xen: Virt-install won't reboot VM after install of SLE HVM guest because of libxl exception. virtinst-keep-cdrom-media-attached.patch - Fate#315125: add NOCOW flag virtinst-vol-default-nocow.patch - Upstream bug fixes 53375bad-raise-value-error-when-no-ipaddr-set.patch 53388de2-show-port-number-for-active-autoport-VM.patch 53397ae0-check-ip-address-format.patch 53399b45-hook-into-domain-balloon-event.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=162
109 lines
4.3 KiB
Diff
109 lines
4.3 KiB
Diff
Subject: connection: Hook into domain balloon event (bz 1081424)
|
|
From: Cole Robinson crobinso@redhat.com Mon Mar 31 12:43:49 2014 -0400
|
|
Date: Mon Mar 31 12:43:49 2014 -0400:
|
|
Git: adf3545671b155ca37c82bff0ab96d0c038ffee8
|
|
|
|
|
|
diff --git a/virtManager/connection.py b/virtManager/connection.py
|
|
index bc8a81f..27d5bd9 100644
|
|
--- a/virtManager/connection.py
|
|
+++ b/virtManager/connection.py
|
|
@@ -99,9 +99,9 @@ class vmmConnection(vmmGObject):
|
|
self._nodedev_capable = None
|
|
|
|
self.using_domain_events = False
|
|
- self._domain_cb_id = None
|
|
+ self._domain_cb_ids = []
|
|
self.using_network_events = False
|
|
- self._network_cb_id = None
|
|
+ self._network_cb_ids = []
|
|
|
|
self._xml_flags = {}
|
|
|
|
@@ -840,6 +840,16 @@ class vmmConnection(vmmGObject):
|
|
# event driven setup is hard, so we end up doing more polling than
|
|
# necessary on most events.
|
|
|
|
+ def _domain_xml_misc_event(self, conn, domain, *args):
|
|
+ # Just trigger a domain XML refresh for hotplug type events
|
|
+ ignore = conn
|
|
+ ignore = args
|
|
+
|
|
+ obj = self.vms.get(domain.UUIDString(), None)
|
|
+ if not obj:
|
|
+ return
|
|
+ self.idle_add(obj.refresh_xml, True)
|
|
+
|
|
def _domain_lifecycle_event(self, conn, domain, event, reason, userdata):
|
|
ignore = conn
|
|
ignore = reason
|
|
@@ -872,19 +882,41 @@ class vmmConnection(vmmGObject):
|
|
|
|
def _add_conn_events(self):
|
|
try:
|
|
- self._domain_cb_id = self.get_backend().domainEventRegisterAny(
|
|
+ self._domain_cb_ids.append(
|
|
+ self.get_backend().domainEventRegisterAny(
|
|
None, libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE,
|
|
- self._domain_lifecycle_event, None)
|
|
+ self._domain_lifecycle_event, None))
|
|
self.using_domain_events = True
|
|
logging.debug("Using domain events")
|
|
except Exception, e:
|
|
self.using_domain_events = False
|
|
logging.debug("Error registering domain events: %s", e)
|
|
|
|
+ def _add_domain_xml_event(eventid, typestr):
|
|
+ if not self.using_domain_events:
|
|
+ return
|
|
+ try:
|
|
+ self._domain_cb_ids.append(
|
|
+ self.get_backend().domainEventRegisterAny(
|
|
+ None, eventid, self._domain_xml_misc_event, None))
|
|
+ except Exception, e:
|
|
+ logging.debug("Error registering domain %s event: %s",
|
|
+ typestr, e)
|
|
+
|
|
+ _add_domain_xml_event(
|
|
+ getattr(libvirt, "VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE", 13),
|
|
+ "balloon")
|
|
+ _add_domain_xml_event(
|
|
+ getattr(libvirt, "VIR_DOMAIN_EVENT_ID_TRAY_CHANGE", 10), "tray")
|
|
+ _add_domain_xml_event(
|
|
+ getattr(libvirt, "VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED", 15),
|
|
+ "device removed")
|
|
+
|
|
try:
|
|
eventid = getattr(libvirt, "VIR_NETWORK_EVENT_ID_LIFECYCLE", 0)
|
|
- self._network_cb_id = self.get_backend().networkEventRegisterAny(
|
|
- None, eventid, self._network_lifecycle_event, None)
|
|
+ self._network_cb_ids.append(
|
|
+ self.get_backend().networkEventRegisterAny(
|
|
+ None, eventid, self._network_lifecycle_event, None))
|
|
self.using_network_events = True
|
|
logging.debug("Using network events")
|
|
except Exception, e:
|
|
@@ -936,15 +968,13 @@ class vmmConnection(vmmGObject):
|
|
|
|
try:
|
|
if not self._backend.is_closed():
|
|
- if self._domain_cb_id is not None:
|
|
- self._backend.domainEventDeregisterAny(
|
|
- self._domain_cb_id)
|
|
- self._domain_cb_id = None
|
|
-
|
|
- if self._network_cb_id is not None:
|
|
- self._backend.networkEventDeregisterAny(
|
|
- self._network_cb_id)
|
|
- self._network_cb_id = None
|
|
+ for eid in self._domain_cb_ids:
|
|
+ self._backend.domainEventDeregisterAny(eid)
|
|
+ self._domain_cb_ids = []
|
|
+
|
|
+ for eid in self._network_cb_ids:
|
|
+ self._backend.networkEventDeregisterAny(eid)
|
|
+ self._network_cb_ids = []
|
|
except:
|
|
logging.debug("Failed to deregister events in conn cleanup",
|
|
exc_info=True)
|