rpms/virt-manager
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/virt-manager.git synced 2025-07-16 01:03:36 +00:00
Code Activity

Fix F21 URL installs (bz #1147720)

Browse Source 
Only add 2 usbredir devices by default (bz #1135488)
This commit is contained in:
Cole Robinson
2014-10-29 14:05:34 -04:00
parent 02d19903e2
commit f1443be186
19 changed files with 575 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
0001-gfxdetails-Show-port-number-for-active-autoport-VM-b.patch
View File

@@ -1,8 +1,7 @@
From 5307267536c7c1f7bf09bae81bff9aec3ee2622a Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 30 Mar 2014 17:34:26 -0400
Subject: [PATCH] gfxdetails: Show port number for active autoport VM (bz
1081614)
Subject: [PATCH virt-manager] gfxdetails: Show port number for active autoport
VM (bz 1081614)
(cherry picked from commit 7f802e287c21a6395a0e9f5435c1eab78b2ce6b5)
---

4
0002-connection-Hook-into-domain-balloon-event-bz-1081424.patch
View File

@@ -1,7 +1,7 @@
From 33a602c79792cfdbdc97be4e6c6c9acc04e4ba97 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 31 Mar 2014 12:43:49 -0400
Subject: [PATCH] connection: Hook into domain balloon event (bz 1081424)
Subject: [PATCH virt-manager] connection: Hook into domain balloon event (bz
1081424)
(cherry picked from commit adf3545671b155ca37c82bff0ab96d0c038ffee8)
---

5
0003-details-Fix-showing-vcpus-values-in-customize-dialog.patch
View File

@@ -1,8 +1,7 @@
From 842835b3120d5c0825fa30f7dcc9c4090454c7e2 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 3 Apr 2014 10:30:37 -0400
Subject: [PATCH] details: Fix showing vcpus values in 'customize' dialog (bz
1083903)
Subject: [PATCH virt-manager] details: Fix showing vcpus values in 'customize'
dialog (bz 1083903)
(cherry picked from commit ee6a541167b787a84cc5c7e553089cbd5ab9ada3)
---

3
0004-details-Fix-changing-graphics-type-bz-1083903.patch
View File

@@ -1,7 +1,6 @@
From e8e4ad674d537c8531eb665a87dc6d40e6e3dd25 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 3 Apr 2014 10:53:54 -0400
Subject: [PATCH] details: Fix changing graphics type (bz 1083903)
Subject: [PATCH virt-manager] details: Fix changing graphics type (bz 1083903)
And clean up the API usage to avoid these types of issues in the future.

4
0005-createpool-Clarify-iscsi-IQN-fields-bz-1084011.patch
View File

@@ -1,7 +1,7 @@
From e99370e30b845b4ca645c9ace040f80356264e9e Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 3 Apr 2014 11:19:03 -0400
Subject: [PATCH] createpool: Clarify iscsi IQN fields (bz 1084011)
Subject: [PATCH virt-manager] createpool: Clarify iscsi IQN fields (bz
1084011)
(cherry picked from commit 8fa2aad1d31f811bb09505595c6401bdf6b90d78)
---

3
0006-error-Don-t-log-redundant-details-bits.patch
View File

@@ -1,7 +1,6 @@
From 5b6694efd7686684272c2d662bde52386ea1dc4f Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 16 Apr 2014 12:12:07 -0400
Subject: [PATCH] error: Don't log redundant details bits
Subject: [PATCH virt-manager] error: Don't log redundant details bits
(cherry picked from commit 341a453d28e2b8dc97d22cd810d40bffac948af0)
---

3
0007-engine-More-work-to-fix-cascading-error-dialogs.patch
View File

@@ -1,7 +1,6 @@
From a9d30657b1865fa6efbced51e744b0450298e48a Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 16 Apr 2014 10:32:52 -0400
Subject: [PATCH] engine: More work to fix cascading error dialogs
Subject: [PATCH virt-manager] engine: More work to fix cascading error dialogs
If a remote network connection stalls, the tick queue becomes backed
up while we wait for the hung connection to continue. While this

5
0008-filesystem-Fix-target-validation-when-editing-device.patch
View File

@@ -1,8 +1,7 @@
From f3d8bec24a5f459d5aab199db309af5d3b5d3d54 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 21 Apr 2014 16:51:23 -0400
Subject: [PATCH] filesystem: Fix target validation when editing device (bz
1089422)
Subject: [PATCH virt-manager] filesystem: Fix target validation when editing
device (bz 1089422)
(cherry picked from commit e6a67fc7099ac39257108080c8cbcfcdc6371e56)
---

5
0009-details-Explicit-warn-that-format-doesn-t-change-ima.patch
View File

@@ -1,8 +1,7 @@
From b52f1f0eb36a347971cb380f13044b549a92b9c4 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 21 Apr 2014 17:04:33 -0400
Subject: [PATCH] details: Explicit warn that 'format' doesn't change image
format (bz 1089457)
Subject: [PATCH virt-manager] details: Explicit warn that 'format' doesn't
change image format (bz 1089457)
(cherry picked from commit 70da20682c9aba1e2bc738b19dfc6bb714d38496)
---

4
0010-snapshots-Fix-screenshot-with-qxl-spice-bz-1089780.patch
View File

@@ -1,7 +1,7 @@
From c8cb642b0f7069e0eb803d6e0c4d8a44df0c57d2 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 29 Apr 2014 13:26:26 -0400
Subject: [PATCH] snapshots: Fix screenshot with qxl+spice (bz 1089780)
Subject: [PATCH virt-manager] snapshots: Fix screenshot with qxl+spice (bz
1089780)
(cherry picked from commit 2272166844f84943342fc097af927a09737ee57f)
---

5
0011-Fix-using-storage-when-the-directory-name-contains-w.patch
View File

@@ -1,8 +1,7 @@
From ca6d90b3d6d759e407855dfd4ba869c4f85542d3 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 29 Apr 2014 14:09:14 -0400
Subject: [PATCH] Fix using storage when the directory name contains whitespace
(bz 1091384)
Subject: [PATCH virt-manager] Fix using storage when the directory name
contains whitespace (bz 1091384)
(cherry picked from commit feadd98fed045ec40d5d5cf8250c7b05517eb9c9)
---

5
0012-packageutils-Fix-install-when-one-package-is-already.patch
View File

@@ -1,8 +1,7 @@
From aa9a8aedfbbca635eb34f168b8e04ba9730584f5 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 29 Apr 2014 14:34:31 -0400
Subject: [PATCH] packageutils: Fix install when one package is already
installed (bz 1090181)
Subject: [PATCH virt-manager] packageutils: Fix install when one package is
already installed (bz 1090181)
(cherry picked from commit 15449eb12601ec1b88aa6d8ee52986ef5ab41ae2)
---

5
0013-connection-Report-error-if-things-fall-over-during-c.patch
View File

@@ -1,8 +1,7 @@
From f981509e84a99dccf99d8767d3754adf0eccecb9 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 4 Jul 2014 17:37:42 -0400
Subject: [PATCH] connection: Report error if things fall over during
connection bring up
Subject: [PATCH virt-manager] connection: Report error if things fall over
during connection bring up
(cherry picked from commit e12d7a6a8c21f0d8e0331fa06f53523258bdfaae)

4
0014-engine-Show-error-if-launching-delete-dialog-fails.patch
View File

@@ -1,7 +1,7 @@
From 6ac3a18d533897dbf12a8d8d300b71ed2f863c2e Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 30 Apr 2014 15:54:00 -0400
Subject: [PATCH] engine: Show error if launching delete dialog fails
Subject: [PATCH virt-manager] engine: Show error if launching delete dialog
fails
(cherry picked from commit f35438a01bbf3ba54b4e448d14e7981110a74f08)
---

5
0015-connection-Call-path_exists-before-getting-storage-v.patch
View File

@@ -1,8 +1,7 @@
From c3bd3589544bedd3f891800b01276523c2629d2c Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 30 Apr 2014 16:00:34 -0400
Subject: [PATCH] connection: Call path_exists before getting storage volume
(bz 1092739)
Subject: [PATCH virt-manager] connection: Call path_exists before getting
storage volume (bz 1092739)
path_exists will check to ensure the volume actually survives a pool
refresh, incase it was deleted behind libvirt's back. This makes the

4
0016-Custom-F20-fix-for-ubuntu-vmvga-default-bug-1129803.patch
View File

@@ -1,7 +1,7 @@
From cda87b1bafae20840ae71fa945ca0d303f16491d Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 8 Sep 2014 11:15:26 -0400
Subject: [PATCH] Custom F20 fix for ubuntu vmvga default (bug 1129803)
Subject: [PATCH virt-manager] Custom F20 fix for ubuntu vmvga default (bug
1129803)
---
virtinst/guest.py | 7 ++++---

255
0017-urlfetcher-Bunch-of-distro-detection-fixes.patch Normal file
View File

@@ -0,0 +1,255 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 6 Sep 2014 15:35:30 -0400
Subject: [PATCH virt-manager] urlfetcher: Bunch of distro detection fixes
And update test_urls to ensure it's passing
(cherry picked from commit 2e7d477156e9d0f6fb218fa19fc00d6229d33e85)
---
tests/test_urls.py | 57 +++++++++++++++++++++-------------------
virtinst/urlfetcher.py | 71 +++++++++++++++++++++++++-------------------------
2 files changed, 65 insertions(+), 63 deletions(-)
diff --git a/tests/test_urls.py b/tests/test_urls.py
index cea20b7..ebdc9b0 100644
--- a/tests/test_urls.py
+++ b/tests/test_urls.py
@@ -41,11 +41,11 @@ from virtinst.urlfetcher import MandrivaDistro
# Access to protected member, needed to unittest stuff
OLD_FEDORA_URL = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/%s/Fedora/%s/os/"
-DEVFEDORA_URL = "http://download.fedoraproject.org/pub/fedora/linux/development/%s/%s/os/"
-FEDORA_URL = "http://download.fedoraproject.org/pub/fedora/linux/releases/%s/Fedora/%s/os/"
+DEVFEDORA_URL = "http://dl.fedoraproject.org/pub/fedora/linux/development/%s/%s/os/"
+FEDORA_URL = "http://dl.fedoraproject.org/pub/fedora/linux/releases/%s/Fedora/%s/os/"
OLD_CENTOS_URL = "http://vault.centos.org/%s/os/%s"
-CENTOS_URL = "http://ftp.linux.ncsu.edu/pub/CentOS/%s/os/%s/"
+CENTOS_URL = "http://mirrors.mit.edu/centos/%s/os/%s/"
OLD_SCIENTIFIC_URL = "http://ftp.scientificlinux.org/linux/scientific/%s/%s/"
SCIENTIFIC_URL = "http://ftp.scientificlinux.org/linux/scientific/%s/%s/os"
@@ -60,7 +60,7 @@ OLD_DEBIAN_URL = "http://archive.debian.org/debian/dists/%s/main/installer-%s/"
DAILY_DEBIAN_URL = "http://d-i.debian.org/daily-images/%s/"
DEBIAN_URL = "http://ftp.us.debian.org/debian/dists/%s/main/installer-%s/"
-MANDRIVA_URL = "http://ftp.uwsg.indiana.edu/linux/mandrake/official/%s/%s/"
+MANDRIVA_URL = "ftp://mirror.cc.columbia.edu/pub/linux/mandriva/official/%s/%s"
urls = {}
@@ -108,14 +108,18 @@ _set_distro(FedoraDistro)
_add(OLD_FEDORA_URL % ("14", "x86_64"), "fedora14",
i686=OLD_FEDORA_URL % ("14", "i386"))
# 2 Latest releases
-_add(FEDORA_URL % ("18", "x86_64"), "fedora18")
_add(FEDORA_URL % ("19", "x86_64"), "fedora19")
+_add(FEDORA_URL % ("20", "x86_64"), "fedora20")
# Any Dev release
-_add(DEVFEDORA_URL % ("20", "x86_64"), "fedora20")
+_add(DEVFEDORA_URL % ("21", "x86_64"), "fedora20", name="fedora21")
+_add(
+"https://dl.fedoraproject.org/pub/alt/stage/21_Alpha_TC6/Server/x86_64/os/",
+"fedora20", name="fedora21-tc")
# Rawhide w/ i686 test
-_add(DEVFEDORA_URL % ("rawhide", "x86_64"), "fedora20",
- i686=DEVFEDORA_URL % ("rawhide", "i386"),
- name="fedora-rawhide")
+# XXX: Nowadays rawhide isn't a full install tree
+# _add(DEVFEDORA_URL % ("rawhide", "x86_64"), "fedora20",
+# i686=DEVFEDORA_URL % ("rawhide", "i386"),
+# name="fedora-rawhide")
_set_distro(CentOSDistro)
@@ -125,53 +129,52 @@ _add(OLD_CENTOS_URL % ("4.9", "x86_64"), name="centos-4.9")
# One old centos 5
_add(OLD_CENTOS_URL % ("5.0", "x86_64"), name="centos-5.0")
# Latest centos 5 w/ i686
-_add(CENTOS_URL % ("5", "x86_64"), "rhel5.4", name="centos-5-latest",
+_add(CENTOS_URL % ("5", "x86_64"), "rhel5.8", name="centos-5-latest",
i686=CENTOS_URL % ("5", "i386"))
# Latest centos 6 w/ i686
-_add(CENTOS_URL % ("6", "x86_64"), "rhel6", name="centos-6-latest",
+_add(CENTOS_URL % ("6", "x86_64"), "rhel6.5", name="centos-6-latest",
i686=CENTOS_URL % ("6", "i386"))
+# Latest centos 7, but no i686 as of 2014-09-06
+_add(CENTOS_URL % ("7", "x86_64"), "rhel7.0", name="centos-7-latest")
_set_distro(SLDistro)
-# Latest scientific 5
-_add(OLD_SCIENTIFIC_URL % ("55", "x86_64"), "rhel5.4", name="sl-5latest")
+# scientific 5
+_add(OLD_SCIENTIFIC_URL % ("55", "x86_64"), "rhel5.5", name="sl-5latest")
# Latest scientific 6
-_add(SCIENTIFIC_URL % ("6", "x86_64"), "rhel6", name="sl-6latest")
+_add(SCIENTIFIC_URL % ("6", "x86_64"), "rhel6.1", name="sl-6latest")
_set_distro(SuseDistro)
-# opensuse 10.0 uses different paths, so keep this around
-_add(OPENSUSE10, i686=OPENSUSE10, hasxen=False, hasbootiso=False,
- name="opensuse-10.0")
# Latest 10 series
-_add(OLD_OPENSUSE_URL % ("10.3"), hasbootiso=False, name="opensuse-10.3")
+_add(OLD_OPENSUSE_URL % ("10.3"), "opensuse10.3", hasbootiso=False)
# Latest 11 series
-_add(OLD_OPENSUSE_URL % ("11.4"), "opensuse11", hasbootiso=False)
+_add(OLD_OPENSUSE_URL % ("11.4"), "opensuse11.4", hasbootiso=False)
# Latest 12 series
# Only keep i686 for the latest opensuse
-_add(OPENSUSE_URL % ("12.3"), "opensuse12",
+_add(OPENSUSE_URL % ("12.3"), "opensuse12.3",
i686=OPENSUSE_URL % ("12.3"), hasbootiso=False, testshortcircuit=True)
_set_distro(DebianDistro)
# Debian releases rarely enough that we can just do every release since lenny
-_add(OLD_DEBIAN_URL % ("lenny", "amd64"), "debianlenny", hasxen=False,
+_add(OLD_DEBIAN_URL % ("lenny", "amd64"), "debian5", hasxen=False,
testshortcircuit=True)
-_add(DEBIAN_URL % ("squeeze", "amd64"), "debiansqueeze")
-_add(DEBIAN_URL % ("wheezy", "amd64"), "debianwheezy")
+_add(DEBIAN_URL % ("squeeze", "amd64"), "debian6")
+_add(DEBIAN_URL % ("wheezy", "amd64"), "debian7")
# And daily builds, since we specially handle that URL
-_add(DAILY_DEBIAN_URL % ("amd64"), "debianwheezy", name="debiandaily")
+_add(DAILY_DEBIAN_URL % ("amd64"), "debian7", name="debiandaily")
_set_distro(UbuntuDistro)
# One old ubuntu
-_add(OLD_UBUNTU_URL % ("hardy", "amd64"), "ubuntuhardy",
+_add(OLD_UBUNTU_URL % ("hardy", "amd64"), "ubuntu8.04",
i686=OLD_UBUNTU_URL % ("hardy", "i386"), hasxen=False,
testshortcircuit=True)
# Latest LTS
-_add(UBUNTU_URL % ("precise", "amd64"), "ubuntuprecise")
+_add(UBUNTU_URL % ("precise", "amd64"), "ubuntu12.04")
# Latest release
-_add(UBUNTU_URL % ("raring", "amd64"), "ubunturaring")
+_add(OLD_UBUNTU_URL % ("raring", "amd64"), "ubuntu13.04")
_set_distro(MandrivaDistro)
diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
index 0d9a066..af647a6 100644
--- a/virtinst/urlfetcher.py
+++ b/virtinst/urlfetcher.py
@@ -674,15 +674,21 @@ class FedoraDistro(RedHatDistro):
lateststr, latestnum = self._latestFedoraVariant()
ver = self.treeinfo.get("general", "version")
+ if not ver:
+ return False
+
if ver == "development" or ver == "rawhide":
- vernum = latestnum
+ self._version_number = latestnum
self.os_variant = lateststr
- elif ver:
- vernum = int(str(ver).split("-")[0])
- if vernum > latestnum:
- self.os_variant = lateststr
- else:
- self.os_variant = "fedora" + str(vernum)
+ return
+
+ if "_" in ver:
+ ver = ver.split("_")[0]
+ vernum = int(str(ver).split("-")[0])
+ if vernum > latestnum:
+ self.os_variant = lateststr
+ else:
+ self.os_variant = "fedora" + str(vernum)
self._version_number = vernum
return True
@@ -773,15 +779,14 @@ class CentOSDistro(RHELDistro):
urldistro = None
def isValidStore(self):
- if self._hasTreeinfo():
- m = re.match(".*CentOS.*", self.treeinfo.get("general", "family"))
- ret = (m is not None)
-
- if ret:
- self._variantFromVersion()
- return ret
+ if not self._hasTreeinfo():
+ return self.fetcher.hasFile("CentOS")
- return self.fetcher.hasFile("CentOS")
+ m = re.match(".*CentOS.*", self.treeinfo.get("general", "family"))
+ ret = (m is not None)
+ if ret:
+ self._variantFromVersion()
+ return ret
# Scientific Linux distro check
@@ -818,18 +823,9 @@ class SuseDistro(Distro):
if re.match(r'i[4-9]86', self.arch):
self.arch = 'i386'
- oldkern = "linux"
- oldinit = "initrd"
- if self.arch == "x86_64":
- oldkern += "64"
- oldinit += "64"
-
# Tested with Opensuse >= 10.2, 11, and sles 10
self._hvm_kernel_paths = [("boot/%s/loader/linux" % self.arch,
"boot/%s/loader/initrd" % self.arch)]
- # Tested with Opensuse 10.0
- self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
- "boot/loader/%s" % oldinit))
# Matches Opensuse > 10.2 and sles 10
self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
@@ -851,13 +847,12 @@ class SuseDistro(Distro):
def _detect_osdict_from_url(self):
root = "opensuse"
- our_os_vals = [n.name for n in osdict.list_os() if
- n.name.startswith(root)]
+ oses = [n for n in osdict.list_os() if n.name.startswith(root)]
- for name in our_os_vals:
- codename = name[len(root):]
- if re.search("/%s\.[1-9]/" % codename, self.uri):
- return name
+ for osobj in oses:
+ codename = osobj.name[len(root):]
+ if re.search("/%s/" % codename, self.uri):
+ return osobj.name
return self.os_variant
@@ -922,15 +917,19 @@ class DebianDistro(Distro):
def _detect_osdict_from_url(self):
root = self.name.lower()
- our_os_vals = [n.name for n in osdict.list_os() if
- n.name.startswith(root)]
+ oses = [n for n in osdict.list_os() if n.name.startswith(root)]
if self._prefix == "daily":
- return our_os_vals[0]
- for name in our_os_vals:
- codename = name[len(root):]
+ return oses[0].name
+
+ for osobj in oses:
+ # name looks like 'Debian Sarge'
+ if " " not in osobj.label:
+ continue
+
+ codename = osobj.label.lower().split()[1]
if ("/%s/" % codename) in self.uri:
- return name
+ return osobj.name
return self.os_variant

277
0018-guest-Limit-number-of-default-usb-redirdevs-to-2-bug.patch Normal file
View File

@@ -0,0 +1,277 @@
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 20 Sep 2014 20:16:31 -0400
Subject: [PATCH virt-manager] guest: Limit number of default usb redirdevs to
2 (bug 1135488)
If we use 4 devices here, we fill up all the emulated USB2 slots,
and directly assigned devices are forced to fall back to USB1
https://bugzilla.redhat.com/show_bug.cgi?id=1135488
(cherry picked from commit 3933ff101b880898c9e7a502efd641db9c4bf8a5)
Conflicts:
tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
virtinst/guest.py
---
tests/cli-test-xml/compare/virt-convert-ovf-compare.xml | 2 --
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml | 2 --
tests/cli-test-xml/compare/virt-install-kvm-machine.xml | 2 --
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml | 6 ------
tests/cli-test-xml/compare/virt-install-kvm-xenner.xml | 2 --
tests/cli-test-xml/compare/virt-install-location-iso.xml | 4 ----
tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml | 2 --
tests/cli-test-xml/compare/virt-install-qemu-plain.xml | 2 --
.../virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt | 2 --
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt | 2 --
.../libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2 | 2 --
tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt | 2 --
.../virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt | 2 --
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt | 2 --
.../libvirt_output/vmx2libvirt_test1.libvirt.disk_raw | 2 --
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt | 2 --
virtinst/guest.py | 5 ++++-
17 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
index a1d2f75..03431a9 100644
--- a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
@@ -66,7 +66,5 @@ Copying testfile to /tmp/testfile
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
index ffe7b59..8916e14 100644
--- a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
+++ b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
@@ -62,7 +62,5 @@ Running /usr/bin/qemu-img convert -O qcow2 fedora.vmdk /var/lib/libvirt/images/f
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-machine.xml b/tests/cli-test-xml/compare/virt-install-kvm-machine.xml
index ccd23ab..dfc7029 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-machine.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-machine.xml
@@ -56,7 +56,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
index 601c561..10fc485 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
@@ -55,8 +55,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@@ -115,8 +113,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@@ -175,7 +171,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-xenner.xml b/tests/cli-test-xml/compare/virt-install-kvm-xenner.xml
index 58f339a..364bdd1 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-xenner.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-xenner.xml
@@ -40,7 +40,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-location-iso.xml b/tests/cli-test-xml/compare/virt-install-location-iso.xml
index 21043b0..bb72569 100644
--- a/tests/cli-test-xml/compare/virt-install-location-iso.xml
+++ b/tests/cli-test-xml/compare/virt-install-location-iso.xml
@@ -60,8 +60,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@@ -123,7 +121,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
index 3303105..c7e5da5 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
@@ -42,7 +42,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
index d76ef7c..4177846 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml
@@ -59,7 +59,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
index 597a0c5..26128ab 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
@@ -58,8 +58,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
index 83c3f90..5b892f3 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
@@ -64,8 +64,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2 b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
index 1b50422..ae563e8 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
@@ -64,8 +64,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
index 9d28269..5d61795 100644
--- a/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
+++ b/tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
@@ -59,8 +59,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
index 9e2058f..68e9ee2 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
@@ -63,8 +63,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
index a6fc259..a82d279 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
@@ -61,8 +61,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
index 9c3d6e2..85381cb 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
@@ -61,8 +61,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
index 74f3541..7821337 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
@@ -62,8 +62,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
- <redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 615c79f..bd60965 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -932,7 +932,10 @@ class Guest(XMLBuilder):
if not self.conn.check_support(self.conn.SUPPORT_CONN_USBREDIR):
return
- for ignore in range(4):
+ # If we use 4 devices here, we fill up all the emulated USB2 slots,
+ # and directly assigned devices are forced to fall back to USB1
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1135488
+ for ignore in range(2):
dev = virtinst.VirtualRedirDevice(self.conn)
dev.bus = "usb"
dev.type = "spicevmc"

21
virt-manager.spec
View File

@@ -18,11 +18,6 @@
# End local config
%define _version 1.0.1
%define _release 4
# This macro is used for the continuous automated builds. It just
# allows an extra fragment based on the timestamp to be appended
# to the release. This distinguishes automated builds, from formal
@@ -30,8 +25,8 @@
%define _extra_release %{?dist:%{dist}}%{?extra_release:%{extra_release}}
Name: virt-manager
Version: %{_version}
Release: %{_release}%{_extra_release}
Version: 1.0.1
Release: 5%{_extra_release}
%define verrel %{version}-%{release}
Summary: Virtual Machine Manager
@@ -74,6 +69,10 @@ Patch0014: 0014-engine-Show-error-if-launching-delete-dialog-fails.patch
Patch0015: 0015-connection-Call-path_exists-before-getting-storage-v.patch
# Fix ubuntu video default (bz #1129803)
Patch0016: 0016-Custom-F20-fix-for-ubuntu-vmvga-default-bug-1129803.patch
# Fix F21 URL installs (bz #1147720)
Patch0017: 0017-urlfetcher-Bunch-of-distro-detection-fixes.patch
# Only add 2 usbredir devices by default (bz #1135488)
Patch0018: 0018-guest-Limit-number-of-default-usb-redirdevs-to-2-bug.patch
BuildArch: noarch
@@ -174,6 +173,10 @@ machine).
%patch0015 -p1
# Fix ubuntu video default (bz #1129803)
%patch0016 -p1
# Fix F21 URL installs (bz #1147720)
%patch0017 -p1
# Only add 2 usbredir devices by default (bz #1135488)
%patch0018 -p1
%build
%if %{qemu_user}
@@ -283,6 +286,10 @@ fi
%changelog
* Wed Oct 29 2014 Cole Robinson <crobinso@redhat.com> - 1.0.1-5
- Fix F21 URL installs (bz #1147720)
- Only add 2 usbredir devices by default (bz #1135488)
* Mon Sep 08 2014 Cole Robinson <crobinso@redhat.com> - 1.0.1-4
- Fix error reporting when checking libvirt version at conn startup (bz
#1074120)