xend: remove ia64 from xend sources

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index f16932cedac787a91764dce9f2dec1e414ca955e..a26383bca0d0e9938b535f050ec7c6abbf752f2b 100644 (file)
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -132,16 +132,6 @@ class XendNode:
                       'stepping' : cpuinfo[number]['stepping'],
                       'flags'    : cpuinfo[number]['flags'],
                     })
-            elif arch.type == "ia64":
-                self.cpus[u].update(
-                    { 'host'     : self.uuid,
-                      'features' : cpu_features,
-                      'speed'    : int(float(cpuinfo[number]['cpu MHz'])),
-                      'vendor'   : cpuinfo[number]['vendor'],
-                      'modelname': cpuinfo[number]['family'],
-                      'stepping' : cpuinfo[number]['model'],
-                      'flags'    : cpuinfo[number]['features'],
-                    })
             else:
                 self.cpus[u].update(
                     { 'host'     : self.uuid,

diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py
index 6d789d9f7e6e44b4b27e9fcf5c7da09dc259ca38..2af55e8e217a9ba4e88dcc415852da568ca5d608 100644 (file)
--- a/tools/python/xen/xend/arch.py
+++ b/tools/python/xen/xend/arch.py
@@ -27,6 +27,5 @@ _types = {
     "x86_64": "x86",
     "amd64": "x86",
     "i86pc": "x86",
-    "ia64": "ia64",
 }
 type = _types.get(os.uname()[4], "unknown")

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 832c16896bf0e52a4c1cb3af1633e34494c06e0c..54334ae4be0a8ee6931b34ccf3d36971160c207b 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -729,8 +729,6 @@ class LinuxImageHandler(ImageHandler):
         log.debug("features       = %s", self.vm.getFeatures())
         log.debug("flags          = %d", self.flags)
         log.debug("superpages     = %d", self.superpages)
-        if arch.type == "ia64":
-            log.debug("vhpt          = %d", self.vhpt)
 
         return xc.linux_build(domid          = self.vm.getDomid(),
                               memsize        = mem_mb,
@@ -982,56 +980,6 @@ class HVMImageHandler(ImageHandler):
         return rc
 
 
-class IA64_HVM_ImageHandler(HVMImageHandler):
-
-    def configure(self, vmConfig):
-        HVMImageHandler.configure(self, vmConfig)
-        self.vhpt = int(vmConfig['platform'].get('vhpt',  0))
-        self.vramsize = int(vmConfig['platform'].get('videoram',4)) * 1024
-
-    def buildDomain(self):
-        xc.nvram_init(self.vm.getName(), self.vm.getDomid())
-        xc.hvm_set_param(self.vm.getDomid(), HVM_PARAM_VHPT_SIZE, self.vhpt)
-        if self.guest_os_type is not None:
-            xc.set_os_type(self.guest_os_type.lower(), self.vm.getDomid())
-        return HVMImageHandler.buildDomain(self)
-
-    def getRequiredAvailableMemory(self, mem_kb):
-        page_kb = 16
-        # ROM size for guest firmware, io page, xenstore page
-        # buffer io page, buffer pio page and memmap info page
-        extra_pages = 1024 + 5
-        mem_kb += extra_pages * page_kb
-        mem_kb += self.vramsize
-        return mem_kb
-
-    def getRequiredInitialReservation(self):
-        return self.vm.getMemoryTarget()
-
-    def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb):
-        # Explicit shadow memory is not a concept 
-        return 0
-
-    def getDeviceModelArgs(self, restore = False):
-        args = HVMImageHandler.getDeviceModelArgs(self, restore)
-        args = args + ([ "-m", "%s" %
-                         (self.getRequiredInitialReservation() / 1024) ])
-        return args
-
-    def setCpuid(self):
-        # Guest CPUID configuration is not implemented yet.
-        return
-
-class IA64_Linux_ImageHandler(LinuxImageHandler):
-
-    def configure(self, vmConfig):
-        LinuxImageHandler.configure(self, vmConfig)
-        self.vhpt = int(vmConfig['platform'].get('vhpt',  0))
-
-    def setCpuid(self):
-        # Guest CPUID configuration is not implemented yet.
-        return
-
 class X86_HVM_ImageHandler(HVMImageHandler):
 
     def configure(self, vmConfig):
@@ -1079,10 +1027,6 @@ class X86_Linux_ImageHandler(LinuxImageHandler):
         return rc
 
 _handlers = {
-    "ia64": {
-        "linux": IA64_Linux_ImageHandler,
-        "hvm": IA64_HVM_ImageHandler,
-    },
     "x86": {
         "linux": X86_Linux_ImageHandler,
         "hvm": X86_HVM_ImageHandler,

diff --git a/tools/python/xen/xend/server/pciif.py b/tools/python/xen/xend/server/pciif.py
index 27c1b75cfcf2695740e57bde557d2ee04c4d7322..165953f15fc9ed9dd6f0125315d18cb7855c36a2 100644 (file)
--- a/tools/python/xen/xend/server/pciif.py
+++ b/tools/python/xen/xend/server/pciif.py
@@ -412,7 +412,7 @@ class PciController(DevController):
                                     ' the same guest with %s'
                                 raise VmError(err_msg % (f, dev.name))
             elif dev.dev_type == DEV_TYPE_PCI:
-                if dev.bus == 0 or arch.type == "ia64":
+                if dev.bus == 0:
                     if not dev.pci_af_flr:
                         # We cope with this case by using the Dstate transition
                         # method or some vendor specific methods for now.

diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py
index d505cc0ac1397c52859348d8c9ae7cbfcfd28162..f3d8455b8b3c9fff38e6eb052498c82b7e0aa200 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/arch.py
+++ b/tools/xm-test/lib/XmTestLib/arch.py
@@ -39,16 +39,13 @@ def getRdPath():
 
     return rdpath
 
-# Begin: Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors
+# Begin: Intel as well as AMD 32-bit and 64-bit processors
 def ia_checkBuffer(buffer):
     return
 
 def ia_minSafeMem():
     return 32
 
-def ia64_minSafeMem():
-    return 128
-
 def ia_getDeviceModel():
     """Get the path to the device model based on
     the architecture reported in uname"""
@@ -85,7 +82,7 @@ ia_HVMDefaults =      {"memory"       : 64,
                        "serial"       : "pty",
                        "device_model" : ia_getDeviceModel(),
 }
-# End  : Intel ia32 and ia64 as well as AMD 32-bit and 64-bit processors
+# End  : Intel as well as AMD 32-bit and 64-bit processors
 
 """Convert from uname specification to a more general platform."""
 _uname_to_arch_map = {
@@ -94,12 +91,11 @@ _uname_to_arch_map = {
     "i586"  : "x86",
     "i686"  : "x86",
     "x86_64": "x86_64",
-    "ia64"  : "ia64",
 }
 
 # Lookup current platform.
 _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown")
-if _arch == "x86" or _arch == "x86_64" or _arch == "ia64":
+if _arch == "x86" or _arch == "x86_64":
     minSafeMem = ia_minSafeMem
     getDefaultKernel = ia_getDefaultKernel
     checkBuffer = ia_checkBuffer
@@ -118,9 +114,5 @@ if _arch == "x86" or _arch == "x86_64" or _arch == "ia64":
         else:
             configDefaults['extra'] = clause
 
-    if _arch == "ia64":
-        minSafeMem = ia64_minSafeMem
-        configDefaults['memory'] = ia64_minSafeMem()
-
 else:
     raise ValueError, "Unknown architecture!"

diff --git a/tools/xm-test/lib/XmTestReport/arch.py b/tools/xm-test/lib/XmTestReport/arch.py
index 920526d137b5d435ac03e0b1df7427d8a7e3be72..b1f4bc8e8a17f2b95752a4e339e3e623b56f35ed 100644 (file)
--- a/tools/xm-test/lib/XmTestReport/arch.py
+++ b/tools/xm-test/lib/XmTestReport/arch.py
@@ -29,7 +29,6 @@ _uname_to_arch_map = {
     "i586"  : "x86",
     "i686"  : "x86",
     "x86_64": "x86_64",
-    "ia64"  : "ia64",
 }
 
 _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown")
@@ -39,8 +38,5 @@ if _arch == "x86":
 elif _arch == "x86_64":
     cpuValues = {"model_name" : "Unknown",
                  "flags"      : "Unknown"}
-elif _arch == "ia64":
-    cpuValues = {"arch"     : "Unknown",
-                 "features" : "Unknown"}
 else:
     raise ValueError, "Unknown architecture!"