From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] tools/ia64: Cull more ia64 code Date: Tue, 13 Aug 2013 14:00:09 +0100 Message-ID: <1376398809-7962-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- tools/libfsimage/common/fsimage_grub.c | 22 ------------- tools/python/xen/lowlevel/xc/xc.c | 53 -------------------------------- 2 files changed, 75 deletions(-) diff --git a/tools/libfsimage/common/fsimage_grub.c b/tools/libfsimage/common/fsimage_grub.c index c58790d..42c5a02 100644 --- a/tools/libfsimage/common/fsimage_grub.c +++ b/tools/libfsimage/common/fsimage_grub.c @@ -138,28 +138,6 @@ fsig_log2 (unsigned long word) return word; } -#elif defined(__ia64__) - -#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) -# define ia64_popcnt(x) __builtin_popcountl(x) -#else -# define ia64_popcnt(x) \ - ({ \ - uint64_t ia64_intri_res; \ - asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \ - ia64_intri_res; \ - }) -#endif - -unsigned long -fsig_log2 (unsigned long word) -{ - unsigned long result; - - result = ia64_popcnt((word - 1) & ~word); - return result; -} - #elif defined(__powerpc__) #ifdef __powerpc64__ diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index e611b24..2625fc4 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -178,10 +178,6 @@ static PyObject *pyxc_domain_unpause(XcObject *self, PyObject *args) static PyObject *pyxc_domain_destroy_hook(XcObject *self, PyObject *args) { -#ifdef __ia64__ - dom_op(self, args, xc_ia64_save_to_nvram); -#endif - Py_INCREF(zero); return zero; } @@ -779,39 +775,6 @@ static PyObject *pyxc_get_device_group(XcObject *self, return Pystr; } -#ifdef __ia64__ -static PyObject *pyxc_nvram_init(XcObject *self, - PyObject *args) -{ - char *dom_name; - uint32_t dom; - - if ( !PyArg_ParseTuple(args, "si", &dom_name, &dom) ) - return NULL; - - xc_ia64_nvram_init(self->xc_handle, dom_name, dom); - - Py_INCREF(zero); - return zero; -} - -static PyObject *pyxc_set_os_type(XcObject *self, - PyObject *args) -{ - char *os_type; - uint32_t dom; - - if ( !PyArg_ParseTuple(args, "si", &os_type, &dom) ) - return NULL; - - xc_ia64_set_os_type(self->xc_handle, os_type, dom); - - Py_INCREF(zero); - return zero; -} -#endif /* __ia64__ */ - - #if defined(__i386__) || defined(__x86_64__) static void pyxc_dom_extract_cpuid(PyObject *config, char **regs) @@ -950,10 +913,8 @@ static PyObject *pyxc_hvm_build(XcObject *self, PyObject *kwds) { uint32_t dom; -#if !defined(__ia64__) struct hvm_info_table *va_hvm; uint8_t *va_map, sum; -#endif int i; char *image; int memsize, target=-1, vcpus = 1, acpi = 0, apic = 1; @@ -1000,7 +961,6 @@ static PyObject *pyxc_hvm_build(XcObject *self, target, image) != 0 ) return pyxc_error_to_exception(self->xc_handle); -#if !defined(__ia64__) /* Fix up the HVM info table. */ va_map = xc_map_foreign_range(self->xc_handle, dom, XC_PAGE_SIZE, PROT_READ | PROT_WRITE, @@ -1015,7 +975,6 @@ static PyObject *pyxc_hvm_build(XcObject *self, sum += ((uint8_t *)va_hvm)[i]; va_hvm->checksum -= sum; munmap(va_map, XC_PAGE_SIZE); -#endif return Py_BuildValue("{}"); } @@ -2713,18 +2672,6 @@ static PyMethodDef pyxc_methods[] = { " map_limitkb [int]: .\n" "Returns: [int] 0 on success; -1 on error.\n" }, -#ifdef __ia64__ - { "nvram_init", - (PyCFunction)pyxc_nvram_init, - METH_VARARGS, "\n" - "Init nvram in IA64 platform\n" - "Returns: [int] 0 on success; -1 on error.\n" }, - { "set_os_type", - (PyCFunction)pyxc_set_os_type, - METH_VARARGS, "\n" - "Set guest OS type on IA64 platform\n" - "Returns: [int] 0 on success; -1 on error.\n" }, -#endif /* __ia64__ */ { "domain_ioport_permission", (PyCFunction)pyxc_domain_ioport_permission, METH_VARARGS | METH_KEYWORDS, "\n" -- 1.7.10.4