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

- bsc#1126325 - L3: No way to set max_grant_frames for domUs via

Browse Source 
libvirt
  8d9743d6-virt-install-Add-support-for-xenbus-controller.patch
- bsc#1129176 - SLES 12 SP4 - kvm virt-install using ttyS0 leads to
  user process fault and interrupts installation (virt-manager) 
  5bc847eb-virt-install-Do-not-warn-about-consoles-on-s390x.patch

- bsc#1129309 - Missing .treeinfo file on the media for CaaSP
  virtinst-add-caasp-support.patch

- Add detection for Caasp 4.0
  virtinst-media-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=463
This commit is contained in:
Charles Arnold 2019-03-25 16:16:57 +00:00 committed by Git OBS Bridge
parent 98fc7cec79
commit 6471f89f17
7 changed files with 206 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
5bc847eb-virt-install-Do-not-warn-about-consoles-on-s390x.patch Normal file
View File

@ -0,0 +1,30 @@
Subject: virt-install: Do not warn about consoles on s390x
From: Christian Borntraeger borntraeger@de.ibm.com Thu Mar 14 09:50:11 2019 +0100
Date: Thu Mar 14 18:21:51 2019 +0100:
Git: 5bc847ebb032864bb20859c98660e85b5a0b50f2
s390x guests usually detect the sclp or virtio console. The current
warning might actually break setups. Let us disable the warning.
Reported-by: Andre Wild <wild1@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Index: virt-manager-2.1.0/virt-install
===================================================================
--- virt-manager-2.1.0.orig/virt-install
+++ virt-manager-2.1.0/virt-install
@@ -432,9 +432,9 @@ def _show_nographics_warnings(options, g
console_type = serial_arm_arg
if guest.devices.console[0].target_type in ["virtio", "xen"]:
console_type = hvc_arg
- if guest.os.is_ppc64() or guest.os.is_arm_machvirt():
- # Later arm/ppc kernels figure out console= automatically, so don't
- # warn about it.
+ if guest.os.is_ppc64() or guest.os.is_arm_machvirt() or guest.os.is_s390x():
+ # Later arm/ppc/s390x kernels figure out console= automatically, so
+ # don't warn about it.
return
for args in (options.extra_args or []):

113
8d9743d6-virt-install-Add-support-for-xenbus-controller.patch Normal file
View File

@ -0,0 +1,113 @@
Subject: virt-install: Add support for xenbus controller
From: Jim Fehlig jfehlig@suse.com Wed Mar 20 14:24:41 2019 -0600
Date: Thu Mar 21 14:15:40 2019 -0400:
Git: 8d9743d69f5a197d959995552bda380a44e583b4
libvirt commit 09eb1ae0 added support for a new 'xenbus' controller
type. Add support for the controller in virtinst, including support
for the maxGrantFrames attribute.
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Index: virt-manager-2.1.0/tests/cli-test-xml/compare/virt-install-many-devices.xml
===================================================================
--- virt-manager-2.1.0.orig/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ virt-manager-2.1.0/tests/cli-test-xml/compare/virt-install-many-devices.xml
@@ -184,6 +184,7 @@
<master startport="4"/>
<address type="pci" domain="0" bus="0" slot="4" function="2"/>
</controller>
+ <controller type="xenbus" index="0" maxGrantFrames="64"/>
<filesystem type="mount" accessmode="mapped">
<source dir="/source"/>
<target dir="/target"/>
Index: virt-manager-2.1.0/tests/cli-test-xml/compare/virt-install-xen-pv.xml
===================================================================
--- virt-manager-2.1.0.orig/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ virt-manager-2.1.0/tests/cli-test-xml/compare/virt-install-xen-pv.xml
@@ -22,6 +22,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
+ <controller type="xenbus" index="0" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
@@ -51,6 +52,7 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="xvda" bus="xen"/>
</disk>
+ <controller type="xenbus" index="0" maxGrantFrames="64"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
Index: virt-manager-2.1.0/tests/clitest.py
===================================================================
--- virt-manager-2.1.0.orig/tests/clitest.py
+++ virt-manager-2.1.0/tests/clitest.py
@@ -509,6 +509,7 @@ c.add_compare(""" \
--controller usb,model=ich9-uhci1,address=0:0:4.0,index=0,master=0,address.multifunction=on \
--controller usb,model=ich9-uhci2,address=0:0:4.1,index=0,master=2 \
--controller usb,model=ich9-uhci3,address=0:0:4.2,index=0,master=4 \
+--controller xenbus,maxGrantFrames=64 \
\
--input type=keyboard,bus=usb \
--input tablet \
@@ -824,7 +825,7 @@ c.add_compare("--init /usr/bin/httpd", "
c = vinst.add_category("xen", "--noautoconsole --connect " + utils.URIs.xen)
c.add_valid("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --graphics none") # Xen PV install headless
c.add_compare("--disk %(EXISTIMG1)s --import", "xen-default") # Xen default
-c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt", "xen-pv") # Xen PV
+c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --controller xenbus,maxGrantFrames=64", "xen-pv") # Xen PV
c.add_compare("--disk /iscsi-pool/diskvol1 --cdrom %(EXISTIMG1)s --livecd --hvm", "xen-hvm") # Xen HVM
Index: virt-manager-2.1.0/virtinst/cli.py
===================================================================
--- virt-manager-2.1.0.orig/virtinst/cli.py
+++ virt-manager-2.1.0/virtinst/cli.py
@@ -2430,6 +2430,7 @@ class ParserNetwork(VirtCLIParser):
cls.add_arg("driver_name", "driver_name")
cls.add_arg("driver_queues", "driver_queues")
+ cls.add_arg("maxGrantFrames", "maxGrantFrames")
cls.add_arg("rom_file", "rom_file")
cls.add_arg("rom_bar", "rom_bar", is_onoff=True)
Index: virt-manager-2.1.0/virtinst/devices/controller.py
===================================================================
--- virt-manager-2.1.0.orig/virtinst/devices/controller.py
+++ virt-manager-2.1.0/virtinst/devices/controller.py
@@ -19,6 +19,7 @@ class DeviceController(Device):
TYPE_USB = "usb"
TYPE_PCI = "pci"
TYPE_CCID = "ccid"
+ TYPE_XENBUS = "xenbus"
@staticmethod
def get_recommended_types(_guest):
@@ -38,6 +39,7 @@ class DeviceController(Device):
DeviceController.TYPE_USB: "USB",
DeviceController.TYPE_PCI: "PCI",
DeviceController.TYPE_CCID: "CCID",
+ DeviceController.TYPE_XENBUS: "xenbus",
}
if ctype not in pretty_mappings:
@@ -86,13 +88,14 @@ class DeviceController(Device):
return ctrl
- _XML_PROP_ORDER = ["type", "index", "model", "master_startport"]
+ _XML_PROP_ORDER = ["type", "index", "model", "master_startport", "maxGrantFrames"]
type = XMLProperty("./@type")
model = XMLProperty("./@model")
vectors = XMLProperty("./@vectors", is_int=True)
ports = XMLProperty("./@ports", is_int=True)
master_startport = XMLProperty("./master/@startport", is_int=True)
+ maxGrantFrames = XMLProperty("./@maxGrantFrames", is_int=True)
index = XMLProperty("./@index", is_int=True)

22
virt-manager.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Mar 25 05:29:39 MDT 2019 - carnold@suse.com
- bsc#1126325 - L3: No way to set max_grant_frames for domUs via
libvirt
8d9743d6-virt-install-Add-support-for-xenbus-controller.patch
- bsc#1129176 - SLES 12 SP4 - kvm virt-install using ttyS0 leads to
user process fault and interrupts installation (virt-manager)
5bc847eb-virt-install-Do-not-warn-about-consoles-on-s390x.patch
-------------------------------------------------------------------
Thu Mar 14 13:52:14 MDT 2019 - carnold@suse.com
- bsc#1129309 - Missing .treeinfo file on the media for CaaSP
virtinst-add-caasp-support.patch
-------------------------------------------------------------------
Wed Mar 13 15:40:14 MDT 2019 - carnold@suse.com
- Add detection for Caasp 4.0
virtinst-media-detection.patch
-------------------------------------------------------------------
Wed Feb 20 10:10:13 MST 2019 - carnold@suse.com

8
virt-manager.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -35,6 +35,8 @@ Source3: virt-manager-supportconfig
Patch1: f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch
Patch2: 1018ab44-inspection-handle-failures-in-application-listing.patch
Patch3: ae8a4f3d-engine-Fix-first-run-startup-error.patch
Patch4: 5bc847eb-virt-install-Do-not-warn-about-consoles-on-s390x.patch
Patch5: 8d9743d6-virt-install-Add-support-for-xenbus-controller.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@ -57,6 +59,7 @@ Patch125: virtinst-s390x-disable-graphics.patch
Patch126: virtinst-add-caasp-support.patch
Patch127: virtinst-add-sle15-detection-support.patch
Patch128: virtinst-add-pvh-support.patch
Patch129: virtinst-media-detection.patch
# Bug Fixes
Patch150: virtman-prevent-double-click-starting-vm-twice.patch
Patch151: virtman-increase-setKeepAlive-count.patch
@ -165,6 +168,8 @@ machine).
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
@ -187,6 +192,7 @@ machine).
%patch126 -p1
%patch127 -p1
%patch128 -p1
%patch129 -p1
# Bug Fixes
%patch150 -p1
%patch151 -p1

2
virtinst-add-caasp-support.patch
View File

@ -36,7 +36,7 @@ Index: virt-manager-2.1.0/virtinst/urldetect.py
+ matching_distros = ["caasp"]
+ _variant_prefix = "caasp"
+ _suse_regex = [".*SUSE Container as a Service Platform*", ".*SUSE CaaS Platform*"]
+ famregex = ".*SUSE Container as a Service Platform.*"
+ famregex = ".*(SUSE Container as a Service Platform|SUSE CaaS Platform).*"
+
+
class _OESDistro(_SuseDistro):

32
virtinst-media-detection.patch Normal file
View File

@ -0,0 +1,32 @@
When both the content file and .treeinfo file are missing from the media
look in the media.1/products and media.1/media files for information.
Caasp 4.0 has not content or .treeinfo file on the media
--- virt-manager-2.1.0/virtinst/urldetect.py.orig 2019-03-13 15:34:14.489019082 -0600
+++ virt-manager-2.1.0/virtinst/urldetect.py 2019-03-13 15:34:56.813552736 -0600
@@ -485,8 +485,23 @@ class _SuseDistro(_RHELDistro):
cache.checked_for_suse_content = True
content_str = cache.acquire_file_content("content")
if content_str is None:
- return False
-
+ products_str = cache.acquire_file_content("media.1/products")
+ if products_str:
+ products_str = products_str.replace('/', ' ,', 1)
+ products_str = "DISTRO " + products_str.replace('-', ' ')
+ media_str = cache.acquire_file_content("media.1/media")
+ if media_str:
+ media_arch = "x86_64"
+ if 'aarch64' in media_str:
+ media_arch = "aarch64"
+ elif 'ppc64le' in media_str:
+ media_arch = "ppc64le"
+ elif 's390x' in media_str:
+ media_arch = "s390x"
+ media_str = 'BASEARCHS ' + media_arch
+ if products_str is None and media_str is None:
+ return False
+ content_str = products_str + "\n" + media_str
try:
cache.suse_content = _SUSEContent(content_str)
except Exception as e:

2
virtinst-use-xenpae-kernel-for-32bit.patch
View File

@ -8,7 +8,7 @@ Index: virt-manager-2.1.0/virtinst/urldetect.py
===================================================================
--- virt-manager-2.1.0.orig/virtinst/urldetect.py
+++ virt-manager-2.1.0/virtinst/urldetect.py
@@ -515,9 +515,14 @@ class _SuseDistro(_RHELDistro):
@@ -530,9 +530,14 @@ class _SuseDistro(_RHELDistro):
if self.type == "xen":
# Matches Opensuse > 10.2 and sles 10