commit 5a49aa873715c75b3a046790fb4bd1c50462880f Author: Brendan Reilly Date: Wed Nov 15 10:16:33 2017 +0100 Add basic s390x support Add the s390x architecture to the list of supported ones. diff --git oz/Guest.py oz/Guest.py index 048c307..16a8b5a 100644 --- oz/Guest.py +++ oz/Guest.py @@ -131,7 +131,7 @@ class Guest(object): # for backwards compatibility self.name = self.tdl.name - if not self.tdl.arch in ["i386", "x86_64", "ppc64", "ppc64le", "aarch64", "armv7l"]: + if not self.tdl.arch in ["i386", "x86_64", "ppc64", "ppc64le", "aarch64", "armv7l", "s390x"]: raise oz.OzException.OzException("Unsupported guest arch " + self.tdl.arch) if os.uname()[4] in ["i386", "i586", "i686"] and self.tdl.arch == "x86_64": diff --git oz/TDL.py oz/TDL.py index 5f3f22b..f18c698 100644 --- oz/TDL.py +++ oz/TDL.py @@ -206,8 +206,8 @@ class TDL(object): self.arch = _xml_get_value(self.doc, '/template/os/arch', 'OS architecture') - if self.arch not in ["i386", "x86_64", "ppc64", "ppc64le", "aarch64", "armv7l"]: - raise oz.OzException.OzException("Architecture must be one of 'i386, x86_64, ppc64, ppc64le, armv7l, or aarch64'") + if self.arch not in ["i386", "x86_64", "ppc64", "ppc64le", "aarch64", "armv7l", "s390x"]: + raise oz.OzException.OzException("Architecture must be one of 'i386, x86_64, ppc64, ppc64le, armv7l, aarch64, or s390x'") self.key = _xml_get_value(self.doc, '/template/os/key', 'OS key', optional=True) diff --git oz/tdl.rng oz/tdl.rng index 500c0ed..dc29c9a 100644 --- oz/tdl.rng +++ oz/tdl.rng @@ -34,6 +34,7 @@ ppc64le aarch64 armv7l + s390x