rpms/virt-manager
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebased to version 1.4.1

Browse Source 
storage/nodedev event API support (Jovanka Gulicoska)
UI options for enabling spice GL (Marc-André Lureau)
Add default virtio-rng /dev/urandom for supported guest OS
Cloning and rename support for UEFI VMs (Pavel Hrdina)
libguestfs inspection UI improvements (Pino Toscano)
virt-install: Add --qemu-commandline
virt-install: Add --network vhostuser (Chen Hanxiao)
virt-install: Add --sysinfo (Charles Arnold)
This commit is contained in:
Cole Robinson 2017-03-13 21:16:11 -04:00
parent 48c5f397b7
commit 3afed40c5f
9 changed files with 18 additions and 182774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182484
0001-Update-translations-and-fix-it.po-problems.patch
View File

File diff suppressed because it is too large Load Diff

83
0002-osdict-Fix-incorrect-usage-of-virtio-input.patch
View File

@ -1,83 +0,0 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 29 Jul 2016 13:17:36 -0400
Subject: [PATCH virt-manager] osdict: Fix incorrect usage of virtio input
Regression reported with latest libosinfo, when the OS reports
virtio-input support:
http://www.redhat.com/archives/virt-tools-list/2016-July/msg00109.html
Really our code presently only cares about the USB tablet, so adjust
our libosinfo lookup to explicitly check for it
(cherry picked from commit 1d2cd306773064258f5d02c980b09a683ae77798)
---
virtinst/guest.py | 11 +++++------
virtinst/osdict.py | 28 ++++++++++++----------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 6a42536..9df4a1c 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -1031,15 +1031,14 @@ class Guest(XMLBuilder):
return False
return all([c.model == "none" for c in controllers])
- input_type = self._os_object.default_inputtype()
- input_bus = self._os_object.default_inputbus()
+ input_type = "mouse"
+ input_bus = "ps2"
if self.os.is_xenpv():
input_type = VirtualInputDevice.TYPE_MOUSE
input_bus = VirtualInputDevice.BUS_XEN
- elif _usb_disabled() and input_bus == "usb":
- input_bus = "ps2"
- if input_type == "tablet":
- input_type = "mouse"
+ elif self._os_object.supports_usbtablet() and not _usb_disabled():
+ input_type = "tablet"
+ input_bus = "usb"
for inp in self.get_devices("input"):
if (inp.type == inp.TYPE_DEFAULT and
diff --git a/virtinst/osdict.py b/virtinst/osdict.py
index e8c1487..bfc435b 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -457,23 +457,19 @@ class _OsVariant(object):
return devname
return None
- def default_inputtype(self):
- if self._os:
- fltr = libosinfo.Filter()
- fltr.add_constraint("class", "input")
- devs = self._os.get_all_devices(fltr)
- if devs.get_length():
- return devs.get_nth(0).get_name()
- return "mouse"
+ def supports_usbtablet(self):
+ if not self._os:
+ return False
- def default_inputbus(self):
- if self._os:
- fltr = libosinfo.Filter()
- fltr.add_constraint("class", "input")
- devs = self._os.get_all_devices(fltr)
- if devs.get_length():
- return devs.get_nth(0).get_bus_type()
- return "ps2"
+ fltr = libosinfo.Filter()
+ fltr.add_constraint("class", "input")
+ fltr.add_constraint("name", "tablet")
+ devs = self._os.get_all_devices(fltr)
+ for idx in range(devs.get_length()):
+ dev = devs.get_nth(idx)
+ if devs.get_nth(idx).get_bus_type() == "usb":
+ return True
+ return False
def supports_virtiodisk(self):
if self._os:

29
0003-virt-install-Fix-error-checking-extra_args.patch
View File

@ -1,29 +0,0 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 2 Nov 2016 10:27:14 -0400
Subject: [PATCH virt-manager] virt-install: Fix error checking extra_args
Later bits in the code that want to warn based on extra_args content
don't handle the None case. Be consistent and convert it to a list
everywhere.
Mentioned at https://bugzilla.redhat.com/show_bug.cgi?id=1376547#c9
(cherry picked from commit 7962672c713cf6d35e770f0d00068dee707b6ec9)
---
virt-install | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/virt-install b/virt-install
index 817f4b3..5a4080f 100755
--- a/virt-install
+++ b/virt-install
@@ -595,7 +595,8 @@ def build_guest_instance(conn, options):
convert_old_os_options(options)
# non-xml install options
- guest.installer.extraargs = options.extra_args or []
+ options.extra_args = options.extra_args or []
+ guest.installer.extraargs = options.extra_args
guest.installer.initrd_injections = options.initrd_inject
guest.autostart = options.autostart

30
0004-virtinst-fix-bad-version-check-regression-from-55327.patch
View File

@ -1,30 +0,0 @@
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 9 Nov 2016 11:21:32 +0400
Subject: [PATCH virt-manager] virtinst: fix bad version check regression from
55327c81b7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
(cherry picked from commit b4858842f9e2f4f39ca81ad596fb777d11537a0f)
---
virtinst/support.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/virtinst/support.py b/virtinst/support.py
index 9516d83..0a57fb8 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -312,9 +312,9 @@ SUPPORT_CONN_MEM_STATS_PERIOD = _make(
function="virDomain.setMemoryStatsPeriod",
version="1.1.1", hv_version={"qemu": 0})
SUPPORT_CONN_SPICE_GL = _make(version="1.3.3",
- hv_version={"qemu": "2.7.92", "test": 0})
+ hv_version={"qemu": "2.6.0", "test": 0})
SUPPORT_CONN_VIDEO_VIRTIO_ACCEL3D = _make(version="1.3.0",
- hv_version={"qemu": "2.7.0", "test": 0})
+ hv_version={"qemu": "2.5.0", "test": 0})
SUPPORT_CONN_GRAPHICS_LISTEN_NONE = _make(version="2.0.0")

27
0005-osdict-Don-t-return-virtio1.0-net-as-a-valid-device-.patch
View File

@ -1,27 +0,0 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 13 Dec 2016 12:58:14 -0500
Subject: [PATCH virt-manager] osdict: Don't return virtio1.0-net as a valid
device name (bug 1399083)
We can't depend on libosinfo device names being valid libvirt network
model names, so use a whitelist
https://bugzilla.redhat.com/show_bug.cgi?id=1399083
(cherry picked from commit 617b92710f50015c5df5f9db15d25de18867957d)
---
virtinst/osdict.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/osdict.py b/virtinst/osdict.py
index bfc435b..7e4ead2 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -453,7 +453,7 @@ class _OsVariant(object):
devs = self._os.get_all_devices(fltr)
for idx in range(devs.get_length()):
devname = devs.get_nth(idx).get_name()
- if devname != "virtio-net":
+ if devname in ["pcnet", "ne2k_pci", "rtl8139", "e1000"]:
return devname
return None

49
0006-manager-Fix-window-size-tracking-on-wayland-bug-1375.patch
View File

@ -1,49 +0,0 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 13 Dec 2016 13:27:06 -0500
Subject: [PATCH virt-manager] manager: Fix window size tracking on wayland
(bug 1375175)
The method we were using is a common implementation bug,
explained here: https://wiki.gnome.org/HowDoI/SaveWindowState
https://bugzilla.redhat.com/show_bug.cgi?id=1375175
(cherry picked from commit 107aa2b1345f45384086c00c904e4786001e4827)
---
virtManager/details.py | 4 ++--
virtManager/manager.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/virtManager/details.py b/virtManager/details.py
index b2f451d..38491d4 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -1016,10 +1016,10 @@ class vmmDetails(vmmGObjectUI):
# Window state listeners #
##########################
- def window_resized(self, ignore, event):
+ def window_resized(self, ignore, ignore2):
if not self.is_visible():
return
- self._window_size = (event.width, event.height)
+ self._window_size = self.topwin.get_size()
def popup_addhw_menu(self, widget, event):
ignore = widget
diff --git a/virtManager/manager.py b/virtManager/manager.py
index d70f4c4..31fe457 100644
--- a/virtManager/manager.py
+++ b/virtManager/manager.py
@@ -458,10 +458,10 @@ class vmmManager(vmmGObjectUI):
# Action listeners #
####################
- def window_resized(self, ignore, event):
+ def window_resized(self, ignore, ignore2):
if not self.is_visible():
return
- self._window_size = (event.width, event.height)
+ self._window_size = self.topwin.get_size()
def exit_app(self, src_ignore=None, src2_ignore=None):
self.emit("action-exit-app")

37
0007-console-Fix-resize-to-VM-on-wayland-bug-1397598.patch
View File

@ -1,37 +0,0 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 13 Dec 2016 13:31:17 -0500
Subject: [PATCH virt-manager] console: Fix resize to VM on wayland (bug
1397598)
Yet another issue with not using window.get_size() and instead using
its size allocation directly, which differ on wayland due to client
side decorations.
https://bugzilla.redhat.com/show_bug.cgi?id=1397598
(cherry picked from commit 88bfdf4926e1223e75468e138d28a1f3756e3cc6)
---
virtManager/console.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/virtManager/console.py b/virtManager/console.py
index 1d33115..326671c 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -455,14 +455,14 @@ class vmmConsolePages(vmmGObjectUI):
if not self._viewer.console_get_desktop_resolution():
return
- topwin_alloc = self.topwin.get_allocation()
+ top_w, top_h = self.topwin.get_size()
viewer_alloc = self.widget("console-gfx-scroll").get_allocation()
desktop_w, desktop_h = self._viewer.console_get_desktop_resolution()
self.topwin.unmaximize()
self.topwin.resize(
- desktop_w + (topwin_alloc.width - viewer_alloc.width),
- desktop_h + (topwin_alloc.height - viewer_alloc.height))
+ desktop_w + (top_w - viewer_alloc.width),
+ desktop_h + (top_h - viewer_alloc.height))
################

2
sources
View File

@ -1 +1 @@
3cb69f1d108ae6d16bab2fce7ec639ea virt-manager-1.4.0.tar.gz SHA512 (virt-manager-1.4.1.tar.gz) = ea4cdc16d7adecdb85431fdfbe7305518917b7d66342375b6773462d33d5647c2a4d3f054c08cd44d7c4e7785da92e38b18881a422083e82303b5a3dbd7b4cdd

51
virt-manager.spec
View File

@ -19,8 +19,8 @@
# End local config # End local config
Name: virt-manager Name: virt-manager
Version: 1.4.0 Version: 1.4.1
Release: 6%{?dist} Release: 1%{?dist}
%global verrel %{version}-%{release} %global verrel %{version}-%{release}
Summary: Desktop tool for managing virtual machines via libvirt Summary: Desktop tool for managing virtual machines via libvirt
@ -30,27 +30,11 @@ BuildArch: noarch
URL: http://virt-manager.org/ URL: http://virt-manager.org/
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
# Fix italian translation from breaking the app (bz #1350185)
Patch0001: 0001-Update-translations-and-fix-it.po-problems.patch
# Fix fedora24 installs from incorrectly using virtio-input (bz #1391522)
Patch0002: 0002-osdict-Fix-incorrect-usage-of-virtio-input.patch
# Fix error checking extra_args for console argument
Patch0003: 0003-virt-install-Fix-error-checking-extra_args.patch
# Fix version check for spice GL support
Patch0004: 0004-virtinst-fix-bad-version-check-regression-from-55327.patch
# Don't return virtio1.0-net as a valid device name (bz #1399083)
Patch0005: 0005-osdict-Don-t-return-virtio1.0-net-as-a-valid-device-.patch
# Fix window size tracking on wayland (bz #1375175)
Patch0006: 0006-manager-Fix-window-size-tracking-on-wayland-bug-1375.patch
# Fix 'resize to VM' on wayland (bz #1397598)
Patch0007: 0007-console-Fix-resize-to-VM-on-wayland-bug-1397598.patch
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Requires: pygobject3 Requires: pygobject3
Requires: gtk3 Requires: gtk3
Requires: libvirt-glib >= 0.0.9 Requires: libvirt-glib >= 0.0.9
Requires: libxml2-python
Requires: dconf Requires: dconf
Requires: dbus-x11 Requires: dbus-x11
@ -106,6 +90,8 @@ virt-install related tools.
Summary: Utilities for installing virtual machines Summary: Utilities for installing virtual machines
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
# For 'virsh console'
Requires: libvirt-client
Provides: virt-install Provides: virt-install
Provides: virt-clone Provides: virt-clone
@ -122,21 +108,6 @@ machine).
%prep %prep
%setup -q %setup -q
# Fix italian translation from breaking the app (bz #1350185)
%patch0001 -p1
# Fix fedora24 installs from incorrectly using virtio-input (bz #1391522)
%patch0002 -p1
# Fix error checking extra_args for console argument
%patch0003 -p1
# Fix version check for spice GL support
%patch0004 -p1
# Don't return virtio1.0-net as a valid device name (bz #1399083)
%patch0005 -p1
# Fix window size tracking on wayland (bz #1375175)
%patch0006 -p1
# Fix 'resize to VM' on wayland (bz #1397598)
%patch0007 -p1
%build %build
%if %{qemu_user} %if %{qemu_user}
@ -216,7 +187,7 @@ fi
%files %files
%doc README COPYING NEWS %doc README.md COPYING NEWS.md
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
@ -257,7 +228,19 @@ fi
%{_bindir}/virt-convert %{_bindir}/virt-convert
%{_bindir}/virt-xml %{_bindir}/virt-xml
%changelog %changelog
* Mon Mar 13 2017 Cole Robinson <crobinso@redhat.com> - 1.4.1-1
- Rebased to version 1.4.1
- storage/nodedev event API support (Jovanka Gulicoska)
- UI options for enabling spice GL (Marc-André Lureau)
- Add default virtio-rng /dev/urandom for supported guest OS
- Cloning and rename support for UEFI VMs (Pavel Hrdina)
- libguestfs inspection UI improvements (Pino Toscano)
- virt-install: Add --qemu-commandline
- virt-install: Add --network vhostuser (Chen Hanxiao)
- virt-install: Add --sysinfo (Charles Arnold)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-6 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild