- bnc#898925 - virt-install errors out while installing SLES12

using --location
  virtinst-ppc64le.patch
  for ppc64 and ppc64le (bnc#894956)

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=197

virt-manager.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 29 10:29:34 MDT 2014 - carnold@suse.com
+
+- bnc#898925 - virt-install errors out while installing SLES12
+  using --location
+  virtinst-ppc64le.patch
+
 -------------------------------------------------------------------
 Fri Sep  5 12:10:30 CEST 2014 - ro@suse.de
 

virt-manager.spec

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

virtinst-ppc64le.patch

@@ -1,6 +1,8 @@
---- a/virtinst/guest.py
+Index: virt-manager-1.0.1/virtinst/guest.py
-+++ b/virtinst/guest.py
+===================================================================
-@@ -623,7 +623,7 @@
+--- virt-manager-1.0.1.orig/virtinst/guest.py
++++ virt-manager-1.0.1/virtinst/guest.py
+@@ -623,7 +623,7 @@ class Guest(XMLBuilder):
              return
          if self.os.is_container():
              return
@@ -9,7 +11,7 @@
              return
          self.add_device(virtinst.VirtualGraphics(self.conn))
  
-@@ -752,6 +752,8 @@
+@@ -752,6 +752,8 @@ class Guest(XMLBuilder):
          if self.conn.is_qemu():
              if self.os.arch == "s390x":
                  preferred_emulator = "/usr/bin/qemu-system-s390x"
@@ -18,7 +20,7 @@
              else:
                  preferred_emulator = "/usr/bin/qemu-system-x86_64"
          else:
-@@ -847,7 +849,7 @@
+@@ -847,7 +849,7 @@ class Guest(XMLBuilder):
          if not self._lookup_osdict_key(key, False):
              return False
  
@@ -27,7 +29,7 @@
              return True
          if (self.os.is_arm_vexpress() and
              self.os.dtb and
-@@ -898,6 +900,8 @@
+@@ -898,6 +900,8 @@ class Guest(XMLBuilder):
              net_model = None
          elif self._can_virtio("virtionet"):
              net_model = "virtio"
@@ -36,9 +38,11 @@
          else:
              net_model = self._lookup_osdict_key("netmodel", None)
  
---- a/virtinst/osxml.py
+Index: virt-manager-1.0.1/virtinst/osxml.py
-+++ b/virtinst/osxml.py
+===================================================================
-@@ -55,6 +55,8 @@
+--- virt-manager-1.0.1.orig/virtinst/osxml.py
++++ virt-manager-1.0.1/virtinst/osxml.py
+@@ -55,6 +55,8 @@ class OSXML(XMLBuilder):
          return self.is_ppc64 and self.machine == "pseries"
      def is_s390x(self):
          return self.arch == "s390x"
@@ -47,3 +51,21 @@
  
      _XML_ROOT_NAME = "os"
      _XML_PROP_ORDER = ["arch", "os_type", "loader",
+Index: virt-manager-1.0.1/virtinst/urlfetcher.py
+===================================================================
+--- virt-manager-1.0.1.orig/virtinst/urlfetcher.py
++++ virt-manager-1.0.1/virtinst/urlfetcher.py
+@@ -940,10 +940,11 @@ class SuseDistro(Distro):
+             oldkern += "64"
+             oldinit += "64"
+ 
+-        if self.arch == "s390x":
++        if self.arch == "s390x" or \
++           self.arch == "ppc64" or self.arch == "ppc64le":
+             self._hvm_kernel_paths = [ ("boot/%s/linux" % self.arch,
+                                         "boot/%s/initrd" % self.arch) ]
+-            # No Xen on s390x
++            # No Xen on s390x and ppc
+             self._xen_kernel_paths = []
+         else:
+             # Tested with Opensuse >= 10.2, 11, and sles 10