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

- Content file on media changed again. Update suse detection code.

Browse Source 
virtinst-detect-suse-distros.patch

- bnc#874772 - virt-manager: Unable to complete install: 'xmlDesc
  in virDomainCreateXML must not be NULL'
  virtinst-pvgrub2-bootloader.patch
- KVM: Use /usr/bin/qemu-system-x86_64 as the default emulator
  virtinst-set-qemu-emulator.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=168
This commit is contained in:
Charles Arnold 2014-04-28 22:47:42 +00:00 committed by Git OBS Bridge
parent 4648861824
commit 24c47c97a8
5 changed files with 85 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virt-manager.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Apr 28 15:21:58 MDT 2014 - carnold@suse.com
- Content file on media changed again. Update suse detection code.
virtinst-detect-suse-distros.patch
-------------------------------------------------------------------
Thu Apr 24 16:52:58 MDT 2014 - carnold@suse.com
- bnc#874772 - virt-manager: Unable to complete install: 'xmlDesc
in virDomainCreateXML must not be NULL'
virtinst-pvgrub2-bootloader.patch
- KVM: Use /usr/bin/qemu-system-x86_64 as the default emulator
virtinst-set-qemu-emulator.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 22 09:31:58 MDT 2014 - carnold@suse.com Tue Apr 22 09:31:58 MDT 2014 - carnold@suse.com

1
virt-manager.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define with_guestfs 0 %define with_guestfs 0
%define askpass_package "openssh-askpass" %define askpass_package "openssh-askpass"
%define qemu_user "qemu" %define qemu_user "qemu"

30
virtinst-detect-suse-distros.patch
View File

@ -2,7 +2,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
=================================================================== ===================================================================
--- virt-manager-1.0.1.orig/virtinst/urlfetcher.py --- virt-manager-1.0.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.0.1/virtinst/urlfetcher.py +++ virt-manager-1.0.1/virtinst/urlfetcher.py
@@ -303,6 +303,81 @@ def _distroFromTreeinfo(fetcher, arch, v @@ -303,6 +303,85 @@ def _distroFromTreeinfo(fetcher, arch, v
return ob return ob
@ -33,19 +33,24 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
+ for line in lines: + for line in lines:
+ if line.startswith("LABEL "): + if line.startswith("LABEL "):
+ distribution = line.split(' ', 1) + distribution = line.split(' ', 1)
+ if line.startswith("VERSION "): + elif line.startswith("DISTRO "):
+ distro_distro = line.rsplit(',', 1)
+ elif line.startswith("VERSION "):
+ distro_version = line.split(' ', 1) + distro_version = line.split(' ', 1)
+ if line.startswith("SUMMARY "): + elif line.startswith("SUMMARY "):
+ distro_summary = line.split(' ', 1) + distro_summary = line.split(' ', 1)
+ if line.startswith("BASEARCHS "): + elif line.startswith("BASEARCHS "):
+ distro_arch = line.split(' ', 1) + distro_arch = line.split(' ', 1)
+ if line.startswith("DEFAULTBASE "): + elif line.startswith("DEFAULTBASE "):
+ distro_arch = line.split(' ', 1) + distro_arch = line.split(' ', 1)
+ if distribution and distro_version and distro_arch: + if distribution and distro_version and distro_arch:
+ break + break
+ +
+ if not distribution and distro_summary: + if not distribution:
+ distribution = distro_summary + if distro_summary:
+ distribution = distro_summary
+ elif distro_distro:
+ distribution = distro_distro
+ if distro_arch: + if distro_arch:
+ arch = distro_arch[1].strip() + arch = distro_arch[1].strip()
+ else: + else:
@ -56,6 +61,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
+ elif cbuf.find("s390x") != -1: + elif cbuf.find("s390x") != -1:
+ arch = "s390x" + arch = "s390x"
+ +
+ dclass = GenericDistro
+ if distribution: + if distribution:
+ if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \ + if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
+ re.match(".*SUSE SLES*", distribution[1]): + re.match(".*SUSE SLES*", distribution[1]):
@ -70,8 +76,6 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
+ dclass = OpensuseDistro + dclass = OpensuseDistro
+ if distro_version is None: + if distro_version is None:
+ distro_version = ['VERSION', '13.1'] + distro_version = ['VERSION', '13.1']
+ else:
+ dclass = GenericDistro
+ +
+ ob = dclass(fetcher, arch, vmtype) + ob = dclass(fetcher, arch, vmtype)
+ if dclass != GenericDistro: + if dclass != GenericDistro:
@ -84,7 +88,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
def getDistroStore(guest, fetcher): def getDistroStore(guest, fetcher):
stores = [] stores = []
@@ -319,6 +394,10 @@ def getDistroStore(guest, fetcher): @@ -319,6 +398,10 @@ def getDistroStore(guest, fetcher):
if dist: if dist:
return dist return dist
@ -95,7 +99,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
# FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os
# dictionary, so would look like 'fedora9' or 'rhel5', so this needs # dictionary, so would look like 'fedora9' or 'rhel5', so this needs
# to be a bit more intelligent # to be a bit more intelligent
@@ -815,12 +894,11 @@ class SLDistro(RHELDistro): @@ -815,12 +898,11 @@ class SLDistro(RHELDistro):
class SuseDistro(Distro): class SuseDistro(Distro):
name = "SUSE" name = "SUSE"
@ -109,7 +113,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
Distro.__init__(self, *args, **kwargs) Distro.__init__(self, *args, **kwargs)
if re.match(r'i[4-9]86', self.arch): if re.match(r'i[4-9]86', self.arch):
self.arch = 'i386' self.arch = 'i386'
@@ -831,22 +909,44 @@ class SuseDistro(Distro): @@ -831,22 +913,44 @@ class SuseDistro(Distro):
oldkern += "64" oldkern += "64"
oldinit += "64" oldinit += "64"
@ -164,7 +168,7 @@ Index: virt-manager-1.0.1/virtinst/urlfetcher.py
return True return True
def _get_method_arg(self): def _get_method_arg(self):
@@ -867,6 +967,27 @@ class SuseDistro(Distro): @@ -867,6 +971,27 @@ class SuseDistro(Distro):
return name return name
return self.os_variant return self.os_variant

57
virtinst-pvgrub2-bootloader.patch
View File

@ -2,31 +2,46 @@ Index: virt-manager-1.0.1/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-1.0.1.orig/virtinst/guest.py --- virt-manager-1.0.1.orig/virtinst/guest.py
+++ virt-manager-1.0.1/virtinst/guest.py +++ virt-manager-1.0.1/virtinst/guest.py
@@ -331,7 +331,16 @@ class Guest(XMLBuilder): @@ -348,8 +348,18 @@ class Guest(XMLBuilder):
this.)
@type disk_boot: C{bool}
"""
- osblob_install = install and not disk_boot
+ boot_pvgrub2 = False
+ if install == False and self.os.is_xenpv():
+ os_ver = self._get_os_variant()
+ if os_ver == "sles12" or os_ver == "sled12":
+ boot_pvgrub2 = True
+ self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ self.installer._install_initrd = None
+ self.installer.extraargs = None
+ logging.info("Using grub.xen to boot guest")
+ osblob_install = (install or boot_pvgrub2) and not disk_boot
if osblob_install and not self.installer.has_install_phase():
return None
@@ -348,7 +357,8 @@ class Guest(XMLBuilder):
if (not install and if (not install and
self.os.is_xenpv() and self.os.is_xenpv() and
not self.os.kernel): not self.os.kernel):
- self.bootloader = "/usr/bin/pygrub" - self.bootloader = "/usr/bin/pygrub"
+ if boot_pvgrub2 is False: - self.os.clear()
+ os_ver = self._get_os_variant()
+ if os_ver == "sles12" or os_ver == "sled12":
+ self.installer._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ self.installer._install_initrd = None
+ self.installer.extraargs = None
+ # alter_bootconfig won't update the osxml unless it thinks
+ # we are in an install phase. Add force_update param to call
+ self.installer.alter_bootconfig(self, True, self.os, True)
+ logging.info("Using grub.xen to boot guest")
+ else:
+ self.bootloader = "/usr/bin/pygrub" + self.bootloader = "/usr/bin/pygrub"
self.os.clear() + self.os.clear()
return self.get_xml_config() return self.get_xml_config()
Index: virt-manager-1.0.1/virtinst/installer.py
===================================================================
--- virt-manager-1.0.1.orig/virtinst/installer.py
+++ virt-manager-1.0.1/virtinst/installer.py
@@ -111,7 +111,7 @@ class Installer(object):
dev.validate()
return dev
- def alter_bootconfig(self, guest, isinstall, bootconfig):
+ def alter_bootconfig(self, guest, isinstall, bootconfig, force_update=False):
"""
Generate the portion of the guest xml that determines boot devices
and parameters. (typically the <os></os> block)
@@ -122,7 +122,7 @@ class Installer(object):
'post-install' phase.
@type isinstall: C{bool}
"""
- if isinstall and not self.has_install_phase():
+ if isinstall and not force_update and not self.has_install_phase():
return
bootorder = self._build_boot_order(isinstall, guest)

23
virtinst-set-qemu-emulator.patch
View File

@ -10,20 +10,29 @@ Index: virt-manager-1.0.1/virtinst/guest.py
import logging import logging
import urlgrabber.progress as progress import urlgrabber.progress as progress
@@ -724,12 +725,13 @@ class Guest(XMLBuilder): @@ -724,14 +725,19 @@ class Guest(XMLBuilder):
self.emulator = None self.emulator = None
return return
- if self.emulator: - if self.emulator:
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386" + if self.conn.is_qemu():
+ preferred_emulator = "/usr/bin/qemu-system-x86_64"
+ else:
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
+ if self.emulator and self.emulator == preferred_emulator: + if self.emulator and self.emulator == preferred_emulator:
return return
if self.os.is_hvm() and self.type == "xen": - if self.os.is_hvm() and self.type == "xen":
- if self.conn.caps.host.cpu.arch == "x86_64": - if self.conn.caps.host.cpu.arch == "x86_64":
- self.emulator = "/usr/lib64/xen/bin/qemu-dm" - self.emulator = "/usr/lib64/xen/bin/qemu-dm"
+ if os.path.exists(preferred_emulator): - else:
+ self.emulator = preferred_emulator - self.emulator = "/usr/lib/xen/bin/qemu-dm"
else: + if os.path.exists(preferred_emulator):
self.emulator = "/usr/lib/xen/bin/qemu-dm" + self.emulator = preferred_emulator
+ elif self.os.is_hvm() and self.type == "xen":
+ self.emulator = "/usr/lib/xen/bin/qemu-dm"
+ else:
+ self.emulator = "/usr/bin/qemu-kvm"
def _set_cpu_defaults(self):
self.cpu.set_topology_defaults(self.vcpus)