|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 5/5] xend: remove ia64 from xend sources
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
tools/python/xen/xend/XendNode.py | 10 ------
tools/python/xen/xend/arch.py | 1 -
tools/python/xen/xend/image.py | 56 ----------------------------------
tools/python/xen/xend/server/pciif.py | 2 +-
tools/xm-test/lib/XmTestLib/arch.py | 14 ++-------
tools/xm-test/lib/XmTestReport/arch.py | 4 ---
6 files changed, 4 insertions(+), 83 deletions(-)
diff --git a/tools/python/xen/xend/XendNode.py
b/tools/python/xen/xend/XendNode.py
index f16932c..a26383b 100644
--- 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 6d789d9..2af55e8 100644
--- 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 832c168..54334ae 100644
--- 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 27c1b75..165953f 100644
--- 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 d505cc0..f3d8455 100644
--- 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 920526d..b1f4bc8 100644
--- 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!"
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |