diff --git a/601a82cb-fix-console_type-if-xen.patch b/601a82cb-fix-console_type-if-xen.patch new file mode 100644 index 00000000..ffc9bf3d --- /dev/null +++ b/601a82cb-fix-console_type-if-xen.patch @@ -0,0 +1,63 @@ +Subject: virt-install: Simplify --extra-args text install warnings +From: Cole Robinson crobinso@redhat.com Tue Sep 22 08:42:09 2015 -0400 +Date: Tue Sep 22 12:44:33 2015 -0400: +Git: 601a82cb87ebc055ba9dd52864317bd513613814 + +- Drop the warnings about incorrect console=, that's a little too fine + grained and was really only about virtio-console default confusion + which doesn't apply anymore +- Skip the check for xenpv which seems to always 'just work' +- Drop the opencoded arm check, use is_arm +- Fix an error when xen HVM is used (reported on virt-tools-list) + +diff --git a/virt-install b/virt-install +index ba9423e..d509256 100755 +--- a/virt-install ++++ b/virt-install +@@ -513,35 +513,20 @@ def _show_nographics_warnings(options, guest): + + serial_arg = "console=ttyS0" + serial_arm_arg = "console=ttyAMA0" +- virtio_arg = "console=hvc0" +- console_type = None +- if guest.conn.is_test() or guest.conn.is_qemu(): +- console_type = serial_arg +- if guest.os.arch.startswith("arm") or guest.os.arch == "aarch64": +- console_type = serial_arm_arg +- if guest.get_devices("console")[0].target_type == "virtio": +- console_type = virtio_arg +- +- if not options.extra_args or "console=" not in options.extra_args: +- logging.warn(_("No 'console' seen in --extra-args, a '%s' kernel " +- "argument is likely required to see text install output from " +- "the guest."), console_type or "console=") +- return ++ hvc_arg = "console=hvc0" + +- if console_type in options.extra_args: +- return +- if (serial_arg not in options.extra_args and +- virtio_arg not in options.extra_args): ++ console_type = serial_arg ++ if guest.os.is_arm(): ++ console_type = serial_arm_arg ++ if guest.get_devices("console")[0].target_type in ["virtio", "xen"]: ++ console_type = hvc_arg ++ ++ if console_type in (options.extra_args or ""): + return + +- has = (serial_arg in options.extra_args) and serial_arg or virtio_arg +- need = (serial_arg in options.extra_args) and virtio_arg or serial_arg +- logging.warn(_("'%s' found in --extra-args, but the device attached " +- "to the guest likely requires '%s'. You may not see text install " +- "output from the guest."), has, need) +- if has == serial_arg: +- logging.warn(_("To make '--extra-args %s' work, you can force a " +- "plain serial device with '--console pty'"), serial_arg) ++ logging.warn(_("Did not find '%(console_string)s' in --extra-args, " ++ "which is likely required to see text install output from the " ++ "guest."), {"console_string": console_type}) + + + def show_warnings(options, guest): diff --git a/virt-manager.changes b/virt-manager.changes index 657df6ef..4b6aabf9 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 22 11:07:01 MDT 2015 - carnold@suse.com + +- bsc#919420 - virt-manager: installation of vm on pp64le: Couldn't + find hvm kernel for SUSE tree. + virtinst-add-ppc64-arch-support.patch +- Upstream bug fix to console if running on Xen + 601a82cb-fix-console_type-if-xen.patch + ------------------------------------------------------------------- Wed Sep 16 10:01:56 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index fb86fcf7..fe407adf 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,7 @@ Patch10: eb92178e-virtinst-fix-storage-pool-lookup.patch Patch11: 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch Patch12: 360fe110-add-s390x-arch-support.patch Patch13: 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch +Patch14: 601a82cb-fix-console_type-if-xen.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -184,6 +185,7 @@ machine). %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 diff --git a/virtinst-add-default-rng-device.patch b/virtinst-add-default-rng-device.patch index 81359cbb..4e4dcf22 100644 --- a/virtinst-add-default-rng-device.patch +++ b/virtinst-add-default-rng-device.patch @@ -12,7 +12,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py class Guest(XMLBuilder): -@@ -670,6 +671,15 @@ class Guest(XMLBuilder): +@@ -671,6 +672,15 @@ class Guest(XMLBuilder): return self.add_device(VirtualGraphics(self.conn)) @@ -28,7 +28,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py def add_default_devices(self): self.add_default_graphics() self.add_default_video_device() -@@ -677,6 +687,7 @@ class Guest(XMLBuilder): +@@ -678,6 +688,7 @@ class Guest(XMLBuilder): self.add_default_console_device() self.add_default_usb_controller() self.add_default_channels() diff --git a/virtinst-s390x-disable-graphics.patch b/virtinst-s390x-disable-graphics.patch index f3cebadf..8339df45 100644 --- a/virtinst-s390x-disable-graphics.patch +++ b/virtinst-s390x-disable-graphics.patch @@ -16,7 +16,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY self.__os_object = None -@@ -619,11 +622,13 @@ class Guest(XMLBuilder): +@@ -620,11 +623,13 @@ class Guest(XMLBuilder): self.conn.check_support( self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)): dev.target_type = "virtio" @@ -31,7 +31,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py return if self.get_devices("video"): return -@@ -668,7 +673,7 @@ class Guest(XMLBuilder): +@@ -669,7 +674,7 @@ class Guest(XMLBuilder): return if self.os.is_container(): return @@ -40,7 +40,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py return self.add_device(VirtualGraphics(self.conn)) -@@ -996,7 +1001,7 @@ class Guest(XMLBuilder): +@@ -997,7 +1002,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True diff --git a/virtinst-set-cache-mode-unsafe-for-install.patch b/virtinst-set-cache-mode-unsafe-for-install.patch index b4142afe..009ad626 100644 --- a/virtinst-set-cache-mode-unsafe-for-install.patch +++ b/virtinst-set-cache-mode-unsafe-for-install.patch @@ -27,7 +27,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py self.bootloader = None if (not install and self.os.is_xenpv() and -@@ -371,7 +380,10 @@ class Guest(XMLBuilder): +@@ -372,7 +381,10 @@ class Guest(XMLBuilder): self.bootloader = "/usr/bin/pygrub" self.os.clear() diff --git a/virtinst-set-qemu-emulator.patch b/virtinst-set-qemu-emulator.patch index fff17e15..06d956ea 100644 --- a/virtinst-set-qemu-emulator.patch +++ b/virtinst-set-qemu-emulator.patch @@ -13,7 +13,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py import logging import urlgrabber.progress as progress -@@ -806,14 +807,29 @@ class Guest(XMLBuilder): +@@ -807,14 +808,29 @@ class Guest(XMLBuilder): self.emulator = None return