From 677a13814af586c0770916cc31364a5dbaae6d92 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 14 Dec 2013 11:57:29 +0100 Subject: [RHEL-7.0 virt-manager PATCH] virt-manager: vmmCreateVolume uses the correct connection Set the connection used by vmmCreateVolume everytime the window is made visible. This fixes a case where volumes could be added to the wrong pool if the same vmmCreateVolume window was already used on a different connection. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1043150 Signed-off-by: Giuseppe Scrivano (cherry picked from commit b3457b9d3530a55df23ab7ca135e0ef777bbc53b) --- virtManager/createvol.py | 3 ++- virtManager/host.py | 2 +- virtManager/storagebrowse.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/virtManager/createvol.py b/virtManager/createvol.py index ec1a14d..d22ece9 100644 --- a/virtManager/createvol.py +++ b/virtManager/createvol.py @@ -99,7 +99,8 @@ class vmmCreateVolume(vmmGObjectUI): def set_modal(self, modal): self.topwin.set_modal(bool(modal)) - def set_parent_pool(self, pool): + def set_parent_pool(self, conn, pool): + self.conn = conn self.parent_pool = pool self.vol_class = Storage.StoragePool.get_volume_for_pool(self.parent_pool.get_type()) diff --git a/virtManager/host.py b/virtManager/host.py index 6d3ca88..092d5d1 100644 --- a/virtManager/host.py +++ b/virtManager/host.py @@ -780,7 +780,7 @@ class vmmHost(vmmGObjectUI): self.addvol = vmmCreateVolume(self.conn, pool) self.addvol.connect("vol-created", self.refresh_current_pool) else: - self.addvol.set_parent_pool(pool) + self.addvol.set_parent_pool(self.conn, pool) self.addvol.show(self.topwin) except Exception, e: self.err.show_err(_("Error launching volume wizard: %s") % str(e)) diff --git a/virtManager/storagebrowse.py b/virtManager/storagebrowse.py index 6f4d3c0..4c79baa 100644 --- a/virtManager/storagebrowse.py +++ b/virtManager/storagebrowse.py @@ -286,7 +286,7 @@ class vmmStorageBrowser(vmmGObjectUI): self.addvol = vmmCreateVolume(self.conn, pool) self.addvol.connect("vol-created", self.refresh_current_pool) else: - self.addvol.set_parent_pool(pool) + self.addvol.set_parent_pool(self.conn, pool) self.addvol.set_modal(True) self.addvol.set_name_hint(self.vm_name) self.addvol.show(self.topwin) -- 1.8.5.2