From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH v3 01/15] tmem: cleanup: drop unused sub command Date: Wed, 11 Dec 2013 16:50:30 +0800 Message-ID: <1386751844-32387-2-git-send-email-bob.liu@oracle.com> References: <1386751844-32387-1-git-send-email-bob.liu@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VqfVn-0007DO-35 for xen-devel@lists.xenproject.org; Wed, 11 Dec 2013 08:51:19 +0000 Received: by mail-pd0-f179.google.com with SMTP id r10so9168521pdi.10 for ; Wed, 11 Dec 2013 00:51:14 -0800 (PST) In-Reply-To: <1386751844-32387-1-git-send-email-bob.liu@oracle.com> 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@lists.xenproject.org Cc: james.harper@bendigoit.com.au, ian.campbell@citrix.com, andrew.cooper3@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org TMEM_READ/TMEM_WRITE/TMEM_XCHG/TMEM_NEW_PAGE are never used, drop them to make things simple and clean. Signed-off-by: Bob Liu --- xen/common/tmem.c | 23 +---------------------- xen/include/public/tmem.h | 4 +++- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 3d15ead..0991eeb 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2753,11 +2753,6 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) rc = do_tmem_new_pool(TMEM_CLI_ID_NULL, 0, op.u.creat.flags, op.u.creat.uuid[0], op.u.creat.uuid[1]); break; - case TMEM_NEW_PAGE: - tmem_ensure_avail_pages(); - rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, 0, - tmem_cli_buf_null); - break; case TMEM_PUT_PAGE: tmem_ensure_avail_pages(); rc = do_tmem_put(pool, oidp, op.u.gen.index, op.u.gen.cmfn, 0, 0, @@ -2783,25 +2778,9 @@ EXPORT long do_tmem_op(tmem_cli_op_t uops) flush = 1; rc = do_tmem_destroy_pool(op.pool_id); break; - case TMEM_READ: - rc = do_tmem_get(pool, oidp, op.u.gen.index, op.u.gen.cmfn, - op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmem_cli_buf_null); - break; - case TMEM_WRITE: - rc = do_tmem_put(pool, oidp, - op.u.gen.index, op.u.gen.cmfn, - op.u.gen.tmem_offset, op.u.gen.pfn_offset, - op.u.gen.len, tmem_cli_buf_null); - break; - case TMEM_XCHG: - /* need to hold global lock to ensure xchg is atomic */ - tmem_client_warn("tmem_xchg op not implemented yet\n"); - rc = 0; - break; default: tmem_client_warn("tmem: op %d not implemented\n", op.cmd); - rc = 0; + rc = -ENOSYS; break; } diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index 5eb2fb4..4fd2fc6 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -36,14 +36,16 @@ #define TMEM_CONTROL 0 #define TMEM_NEW_POOL 1 #define TMEM_DESTROY_POOL 2 -#define TMEM_NEW_PAGE 3 #define TMEM_PUT_PAGE 4 #define TMEM_GET_PAGE 5 #define TMEM_FLUSH_PAGE 6 #define TMEM_FLUSH_OBJECT 7 +#if __XEN_INTERFACE_VERSION__ < 0x00040400 +#define TMEM_NEW_PAGE 3 #define TMEM_READ 8 #define TMEM_WRITE 9 #define TMEM_XCHG 10 +#endif /* Privileged commands to HYPERVISOR_tmem_op() */ #define TMEM_AUTH 101 -- 1.7.10.4