56082a3f99
virt-manager-1.4.1.tar.bz2 virtinst-check-date-format.patch virtinst-no-usb-tablet-for-xenpv.patch * New VM wixard virt-bootstrap integration (Radostin Stoyanov) * New VM wizard support for virtuozzo containers (Mikhail Feoktistov) * network UI: add support to create SR-IOV VF pool (Lin Ma) * Nicer OS list in New VM wizard (Pino Toscano) * Better defaults for UEFI secureboot builds (Pavel Hrdina) * Fix defaults for aarch64 VMs if graphics are requested * virt-install: new –memdev option (Pavel Hrdina) * virt-install: add –disk logical/physical_block_size (Yuri Arabadji) * virt-install: add –features hyperv_reset=, hyperv_synic= (Venkat Datta N H) - Dropped the following patches contained in new tarball f5d709d9-lang-it-1.patch c66098f3-lang-it-2.patch 452a693e-lang-update.patch 6b5106ea-lang-it-ko-fix.patch 9c8ffe51-fix-multiple-warnings-1.patch cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch f341352c-remove-redundant-error-string.patch ff3b4dc5-dont-overwrite-install-bootorder.patch 2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch 93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch 7aee124d-fix-multiple-warnings-2.patch f38c56c9-add-support-for-SMM-feature.patch 24f9d053-add-support-for-loader-secure-attribute.patch 4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=356
109 lines
5.5 KiB
Diff
109 lines
5.5 KiB
Diff
Reference: bnc#866287
|
|
This patch is for when virt-manager is installed but not libvirt
|
|
This is not a normal situation on a suse distro. Split out required
|
|
libvirt packages (kvm vs xen). Only install those libvirt packages
|
|
for which the host is booted. This patch has a corresponding spec
|
|
file change (%define libvirt_kvm_packages and %define libvirt_xen_packages).
|
|
Index: virt-manager-1.4.2/setup.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/setup.py
|
|
+++ virt-manager-1.4.2/setup.py
|
|
@@ -308,8 +308,11 @@ class configure(distutils.core.Command):
|
|
("prefix=", None, "installation prefix"),
|
|
("qemu-user=", None,
|
|
"user libvirt uses to launch qemu processes (default=root)"),
|
|
- ("libvirt-package-names=", None,
|
|
- "list of libvirt distro packages virt-manager will check for on "
|
|
+ ("libvirt-kvm-package-names=", None,
|
|
+ "list of libvirt kvm distro packages virt-manager will check for on "
|
|
+ "first run. comma separated string (default=none)"),
|
|
+ ("libvirt-xen-package-names=", None,
|
|
+ "list of libvirt xen distro packages virt-manager will check for on "
|
|
"first run. comma separated string (default=none)"),
|
|
("kvm-package-names=", None,
|
|
"recommended kvm packages virt-manager will check for on first run "
|
|
@@ -335,7 +338,8 @@ class configure(distutils.core.Command):
|
|
def initialize_options(self):
|
|
self.prefix = sysprefix
|
|
self.qemu_user = None
|
|
- self.libvirt_package_names = None
|
|
+ self.libvirt_kvm_package_names = None
|
|
+ self.libvirt_xen_package_names = None
|
|
self.kvm_package_names = None
|
|
self.askpass_package_names = None
|
|
self.preferred_distros = None
|
|
@@ -350,8 +354,10 @@ class configure(distutils.core.Command):
|
|
template += "prefix = %s\n" % self.prefix
|
|
if self.qemu_user is not None:
|
|
template += "default_qemu_user = %s\n" % self.qemu_user
|
|
- if self.libvirt_package_names is not None:
|
|
- template += "libvirt_packages = %s\n" % self.libvirt_package_names
|
|
+ if self.libvirt_kvm_package_names is not None:
|
|
+ template += "libvirt_kvm_packages = %s\n" % self.libvirt_kvm_package_names
|
|
+ if self.libvirt_xen_package_names is not None:
|
|
+ template += "libvirt_xen_packages = %s\n" % self.libvirt_xen_package_names
|
|
if self.kvm_package_names is not None:
|
|
template += "hv_packages = %s\n" % self.kvm_package_names
|
|
if self.askpass_package_names is not None:
|
|
Index: virt-manager-1.4.2/virtcli/cliconfig.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtcli/cliconfig.py
|
|
+++ virt-manager-1.4.2/virtcli/cliconfig.py
|
|
@@ -83,7 +83,8 @@ class _CLIConfig(object):
|
|
_get_param("preferred_distros", ""))
|
|
self.hv_packages = _split_list(_get_param("hv_packages", ""))
|
|
self.askpass_package = _split_list(_get_param("askpass_packages", ""))
|
|
- self.libvirt_packages = _split_list(_get_param("libvirt_packages", ""))
|
|
+ self.libvirt_kvm_packages = _split_list(_get_param("libvirt_kvm_packages", ""))
|
|
+ self.libvirt_xen_packages = _split_list(_get_param("libvirt_xen_packages", ""))
|
|
self.default_graphics = _get_param("default_graphics", "spice")
|
|
self.default_hvs = _split_list(_get_param("default_hvs", ""))
|
|
|
|
Index: virt-manager-1.4.2/virtManager/config.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtManager/config.py
|
|
+++ virt-manager-1.4.2/virtManager/config.py
|
|
@@ -172,7 +172,8 @@ class vmmConfig(object):
|
|
self.default_qemu_user = CLIConfig.default_qemu_user
|
|
self.preferred_distros = CLIConfig.preferred_distros
|
|
self.hv_packages = CLIConfig.hv_packages
|
|
- self.libvirt_packages = CLIConfig.libvirt_packages
|
|
+ self.libvirt_kvm_packages = CLIConfig.libvirt_kvm_packages
|
|
+ self.libvirt_xen_packages = CLIConfig.libvirt_xen_packages
|
|
self.askpass_package = CLIConfig.askpass_package
|
|
self.default_graphics_from_config = CLIConfig.default_graphics
|
|
self.default_hvs = CLIConfig.default_hvs
|
|
Index: virt-manager-1.4.2/virtManager/engine.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtManager/engine.py
|
|
+++ virt-manager-1.4.2/virtManager/engine.py
|
|
@@ -226,22 +226,18 @@ class vmmEngine(vmmGObject):
|
|
|
|
ret = None
|
|
try:
|
|
- libvirt_packages = self.config.libvirt_packages
|
|
- packages = self.config.hv_packages + libvirt_packages
|
|
+ tryuri = vmmConnect.default_uri()
|
|
+ if tryuri and tryuri.startswith('xen'):
|
|
+ packages = self.config.libvirt_xen_packages
|
|
+ else:
|
|
+ packages = self.config.libvirt_kvm_packages + self.config.hv_packages
|
|
|
|
ret = packageutils.check_packagekit(manager, manager.err, packages)
|
|
except Exception:
|
|
logging.exception("Error talking to PackageKit")
|
|
|
|
- tryuri = None
|
|
- if ret:
|
|
- tryuri = "qemu:///system"
|
|
- elif not self.config.test_first_run:
|
|
- tryuri = vmmConnect.default_uri()
|
|
-
|
|
if tryuri is None:
|
|
- manager.set_startup_error(msg)
|
|
- return
|
|
+ tryuri = "qemu:///system"
|
|
|
|
warnmsg = _("The 'libvirtd' service will need to be started.\n\n"
|
|
"After that, virt-manager will connect to libvirt on\n"
|