3960139963
xen-tools is installed OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=214
72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
Index: virt-manager-1.1.0/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/guest.py
|
|
+++ virt-manager-1.1.0/virtinst/guest.py
|
|
@@ -635,7 +635,7 @@ class Guest(XMLBuilder):
|
|
return
|
|
if self.os.is_container():
|
|
return
|
|
- if self.os.arch not in ["x86_64", "i686", "ppc64", "ia64", "s390x"]:
|
|
+ if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64", "s390x"]:
|
|
return
|
|
self.add_device(virtinst.VirtualGraphics(self.conn))
|
|
|
|
@@ -773,6 +773,8 @@ class Guest(XMLBuilder):
|
|
if self.conn.is_qemu():
|
|
if self.os.arch == "s390x":
|
|
preferred_emulator = "/usr/bin/qemu-system-s390x"
|
|
+ elif self.os.arch == "ppc64" or self.os.arch == "ppc64le":
|
|
+ preferred_emulator = "/usr/bin/qemu-system-ppc64"
|
|
else:
|
|
preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
|
elif self.conn.is_lxc():
|
|
@@ -883,7 +885,7 @@ class Guest(XMLBuilder):
|
|
if not self._lookup_osdict_key(key, False):
|
|
return False
|
|
|
|
- if self.os.is_x86() or self.os.is_s390x():
|
|
+ if self.os.is_x86() or self.os.is_s390x() or self.os.is_ppc64():
|
|
return True
|
|
if (self.os.is_arm_vexpress() and
|
|
self.os.dtb and
|
|
@@ -934,6 +936,8 @@ class Guest(XMLBuilder):
|
|
net_model = None
|
|
elif self._can_virtio("virtionet"):
|
|
net_model = "virtio"
|
|
+ elif self.os.is_pseries():
|
|
+ net_model = "spapr-vlan"
|
|
else:
|
|
net_model = self._lookup_osdict_key("netmodel", None)
|
|
|
|
Index: virt-manager-1.1.0/virtinst/osxml.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/osxml.py
|
|
+++ virt-manager-1.1.0/virtinst/osxml.py
|
|
@@ -60,6 +60,8 @@ class OSXML(XMLBuilder):
|
|
return self.is_ppc64 and self.machine == "pseries"
|
|
def is_s390x(self):
|
|
return self.arch == "s390x"
|
|
+ def is_ppc64(self):
|
|
+ return self.arch == "ppc64" or self.arch == "ppc64le"
|
|
|
|
_XML_ROOT_NAME = "os"
|
|
_XML_PROP_ORDER = ["arch", "os_type", "loader",
|
|
Index: virt-manager-1.1.0/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.1.0.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.1.0/virtinst/urlfetcher.py
|
|
@@ -945,10 +945,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
|