pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 324440 from Virtualization

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/324440
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=124
This commit is contained in:
Dominique Leuenberger 2015-08-21 05:41:35 +00:00 committed by Git OBS Bridge
commit 8741a3bcdc
7 changed files with 183 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
4970615f-fix-qemu-vs-lxc-detection.patch Normal file
View File

@ -0,0 +1,20 @@
Subject: addconnection: Fix qemu:///session vs. lxc:/// detection
From: Cole Robinson crobinso@redhat.com Sun Aug 9 12:27:20 2015 -0400
Date: Sun Aug 9 12:27:20 2015 -0400:
Git: 4970615f4870cc5394a46ff6a049ac937b3043d6
diff --git a/virtManager/connect.py b/virtManager/connect.py
index b977fea..7493d14 100644
--- a/virtManager/connect.py
+++ b/virtManager/connect.py
@@ -327,7 +327,8 @@ class vmmConnect(vmmGObjectUI):
self.populate_uri()
def hypervisor_changed(self, src):
- is_session = (src.get_active() == HV_QEMU_SESSION)
+ hv = uiutil.get_list_selection(self.widget("hypervisor"))
+ is_session = (hv == HV_QEMU_SESSION)
uiutil.set_grid_row_visible(
self.widget("session-warning-box"), is_session)
uiutil.set_grid_row_visible(

29
a9b303fb-fix-copy-host-cpu-definition.patch Normal file
View File

@ -0,0 +1,29 @@
Subject: virtinst.cpu: fix copy host cpu definition
From: Pavel Hrdina phrdina@redhat.com Tue Jul 14 15:53:25 2015 +0200
Date: Tue Jul 14 11:53:02 2015 -0400:
Git: a9b303fb141df5b2d2051c6b4ed489dbb09952f8
Commit cac4ac14 updated cpu features to use XMLBuilder and this change
removes the 'Features' class. There is no longer any '.names()'
method to return names, so just cycle through all features and use a
name attribute instead.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1240938
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
diff --git a/virtinst/cpu.py b/virtinst/cpu.py
index b12fd30..fb17bb7 100644
--- a/virtinst/cpu.py
+++ b/virtinst/cpu.py
@@ -104,8 +104,8 @@ class CPU(XMLBuilder):
for feature in self.features:
self.remove_feature(feature)
- for name in cpu.features.names():
- self.add_feature(name)
+ for feature in cpu.features:
+ self.add_feature(feature.name)
def vcpus_from_topology(self):
"""

41
aebebbf8-report-an-error-for-pxe-install-without-network.patch Normal file
View File

@ -0,0 +1,41 @@
Subject: virt-install: report an error for pxe install without network
From: Pavel Hrdina phrdina@redhat.com Thu Aug 6 14:43:00 2015 +0200
Date: Thu Aug 6 14:56:30 2015 +0200:
Git: aebebbf879ff33af38f858aebc01a5de1cafb1a7
Fix a regression where we used to report an error message if user
specified pxe installation without any network (--nonetworks or
--network none).
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1250382
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Index: virt-manager-1.2.1/tests/clitest.py
===================================================================
--- virt-manager-1.2.1.orig/tests/clitest.py
+++ virt-manager-1.2.1/tests/clitest.py
@@ -742,8 +742,8 @@ c.add_valid("--mac 22:22:33:44:55:AF")
c.add_valid("--bridge mybr0 --mac 22:22:33:44:55:AF") # Old bridge w/ mac
c.add_valid("--network bridge:mybr0,model=e1000") # --network bridge:
c.add_valid("--network network:default --mac RANDOM") # VirtualNetwork with a random macaddr
-c.add_valid("--nonetworks") # no networks
c.add_valid("--vnc --keymap=local") # --keymap local
+c.add_invalid("--nonetworks") # no networks
c.add_invalid("--graphics vnc --vnclisten 1.2.3.4") # mixing old and new
c.add_invalid("--network=FOO") # Nonexistent network
c.add_invalid("--mac 1234") # Invalid mac
Index: virt-manager-1.2.1/virt-install
===================================================================
--- virt-manager-1.2.1.orig/virt-install
+++ virt-manager-1.2.1/virt-install
@@ -226,6 +226,9 @@ def convert_old_networks(options):
fail(_("Cannot use --nonetworks with --network"))
options.network = ["none"]
+ if options.pxe and options.network and "none" in options.network:
+ fail(_("Can't use --pxe without any network"))
+
macs = virtinst.util.listify(options.mac)
networks = virtinst.util.listify(options.network)
bridges = virtinst.util.listify(options.bridge)

29
f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch Normal file
View File

@ -0,0 +1,29 @@
Subject: details: don't display error if machine is missing in XML
From: Pavel Hrdina phrdina@redhat.com Fri Jul 31 14:28:00 2015 +0200
Date: Wed Aug 5 13:32:04 2015 +0200:
Git: f81358b02d58b709529a35268cbaf8ce098d803a
Commint 0ddec919 updated the details page. Now the detail page of
existing domain cannot update the 'machine' value, only prints that
value. If we cannot get the machine from domain XML, don't pass a None,
but "Unknown" instead. This can happen if you are connecting with
virt-manager to really old libvirt, the machine value is present in
domain XML since libvirt v0.9.5.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1238981
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
diff --git a/virtManager/details.py b/virtManager/details.py
index 718f50a..8507bd0 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -2457,7 +2457,7 @@ class vmmDetails(vmmGObjectUI):
self.widget("overview-firmware-label").set_text(firmware)
# Machine settings
- machtype = self.vm.get_machtype()
+ machtype = self.vm.get_machtype() or _("Unknown")
if self.widget("machine-type").is_visible():
uiutil.set_list_selection(
self.widget("machine-type"), machtype)

27
virt-manager.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Aug 12 15:22:52 MDT 2015 - carnold@suse.com
- bsc#941464 - virt-convert attempts to create storage pool images
even if it already exists
virtinst-fix-storage-pool-lookup.patch
-------------------------------------------------------------------
Mon Aug 10 11:58:32 MDT 2015 - carnold@suse.com
- Drop the following patches for bsc#938942 as they are not needed.
virtman-reset-image-filename-based-on-format.patch
virtman-allow-other-disk-formats.patch
- Upstream bug fixes
a9b303fb-fix-copy-host-cpu-definition.patch
f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch
aebebbf8-report-an-error-for-pxe-install-without-network.patch
4970615f-fix-qemu-vs-lxc-detection.patch
-------------------------------------------------------------------
Thu Jul 23 09:39:26 MDT 2015 - carnold@suse.com
- bsc#938942 - Can't create a vmguest with raw format image with
virt-manager at first installation (option disable)
virtman-reset-image-filename-based-on-format.patch
virtman-allow-other-disk-formats.patch
-------------------------------------------------------------------
Wed Jul 8 11:29:25 MDT 2015 - carnold@suse.com

14
virt-manager.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package virt-manager
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define with_guestfs 0
%define askpass_package "openssh-askpass"
%define qemu_user "qemu"
@ -40,6 +41,10 @@ Patch1: 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch
Patch2: fc93e154-fix-udp-tcp-host-vs-mode-UI.patch
Patch3: 34db1af7-fix-adding-iscsi-pools.patch
Patch4: 76bad650-fix-virt-xml-define-and-update.patch
Patch5: a9b303fb-fix-copy-host-cpu-definition.patch
Patch6: f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch
Patch7: aebebbf8-report-an-error-for-pxe-install-without-network.patch
Patch8: 4970615f-fix-qemu-vs-lxc-detection.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@ -80,6 +85,7 @@ Patch160: virtinst-xen-drive-type.patch
Patch161: virtinst-xenbus-disk-index-fix.patch
Patch162: virtinst-refresh_before_fetch_pool.patch
Patch163: virtinst-replace-unar-with-other-archivers.patch
Patch164: virtinst-fix-storage-pool-lookup.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -88,7 +94,6 @@ Requires: avahi
Requires: dbus-1-x11
Requires: dconf
Requires: gtk3
Requires: libosinfo >= 0.2.10
Requires: python-gconf
Requires: virt-manager-common = %{verrel}
Requires: vm-install >= 0.5.6
@ -165,6 +170,10 @@ machine).
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
@ -205,6 +214,7 @@ machine).
%patch161 -p1
%patch162 -p1
%patch163 -p1
%patch164 -p1
%build
%if %{qemu_user}

25
virtinst-fix-storage-pool-lookup.patch Normal file
View File

@ -0,0 +1,25 @@
References: bsc#941464
virt-convert fails when the storage pool is already present but
is not called 'default'.
If the 'default' pool has been removed but another pool uses the
default location of /var/lib/libvirt/images virt-convert will fail
to find the pool and attempt to create another one with the same
path. This causes the conversion to fail.
Index: virt-manager-1.2.1/virtinst/storage.py
===================================================================
--- virt-manager-1.2.1.orig/virtinst/storage.py
+++ virt-manager-1.2.1/virtinst/storage.py
@@ -209,10 +209,11 @@ class StoragePool(_StorageObject):
try:
pool = conn.storagePoolLookupByName(name)
except libvirt.libvirtError:
+ pool = StoragePool.lookup_pool_by_path(conn, path)
pass
if pool:
- return
+ return StoragePool(conn, parsexml=pool.XMLDesc(0))
try:
logging.debug("Attempting to build default pool with target '%s'",