From patchwork Fri Oct 18 01:11:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 284475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D15EF2C00CB for ; Fri, 18 Oct 2013 20:20:15 +1100 (EST) Received: from localhost ([::1]:56521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX6E9-0002ap-Tt for incoming@patchwork.ozlabs.org; Fri, 18 Oct 2013 05:20:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX66D-0000jK-3E for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VX662-0007G2-Bv for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:12:01 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:44862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX661-0007FI-KU for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:50 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Oct 2013 14:41:47 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Oct 2013 14:41:44 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id EBFB3394005E for ; Fri, 18 Oct 2013 14:41:23 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9I9Bfhv40632434 for ; Fri, 18 Oct 2013 14:41:41 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9I9BhLx010651 for ; Fri, 18 Oct 2013 14:41:43 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9I9BOpM008595; Fri, 18 Oct 2013 14:41:41 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2013 09:11:20 +0800 Message-Id: <1382058681-14957-13-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101809-9574-0000-0000-00000A2128E2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.6 Cc: kwolf@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 12/13] monitor: hide *cur_mon in monitor_get_fd() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org All existing caller are using *cur_mon as its parameter, and *cur_mon is an internal variable which used inside monitor.c. This patch reduce the exposing of details in monitor.c, by introduce a new function monitor_get_fd_cur() and make old one static. Signed-off-by: Wenchao Xia --- dump.c | 2 +- include/monitor/monitor.h | 2 +- migration-fd.c | 2 +- monitor.c | 7 ++++++- qmp.c | 2 +- stubs/get-fd.c | 2 +- util/qemu-sockets.c | 4 ++-- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dump.c b/dump.c index 846155c..8f5b6b0 100644 --- a/dump.c +++ b/dump.c @@ -860,7 +860,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, #if !defined(WIN32) if (strstart(file, "fd:", &p)) { - fd = monitor_get_fd(cur_mon, p, errp); + fd = monitor_get_fd_cur(p, errp); if (fd == -1) { return; } diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 97fcee3..637f7f3 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -35,7 +35,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device, BlockDriverCompletionFunc *completion_cb, void *opaque); -int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp); +int monitor_get_fd_cur(const char *fdname, Error **errp); int monitor_handle_fd_param(Monitor *mon, const char *fdname); void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) diff --git a/migration-fd.c b/migration-fd.c index d2e523a..022bc50 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -33,7 +33,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp) { - int fd = monitor_get_fd(cur_mon, fdname, errp); + int fd = monitor_get_fd_cur(fdname, errp); if (fd == -1) { return; } diff --git a/monitor.c b/monitor.c index 9377834..80a9dfd 100644 --- a/monitor.c +++ b/monitor.c @@ -2290,7 +2290,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict) } } -int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) +static int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) { mon_fd_t *monfd; @@ -2315,6 +2315,11 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) return -1; } +int monitor_get_fd_cur(const char *fdname, Error **errp) +{ + return monitor_get_fd(cur_mon, fdname, errp); +} + static void monitor_fdset_cleanup(MonFdset *mon_fdset) { MonFdsetFd *mon_fdset_fd; diff --git a/qmp.c b/qmp.c index 4c149b3..a02804b 100644 --- a/qmp.c +++ b/qmp.c @@ -493,7 +493,7 @@ void qmp_add_client(const char *protocol, const char *fdname, CharDriverState *s; int fd; - fd = monitor_get_fd(cur_mon, fdname, errp); + fd = monitor_get_fd_cur(fdname, errp); if (fd < 0) { return; } diff --git a/stubs/get-fd.c b/stubs/get-fd.c index 9f2c65c..7d9ec3b 100644 --- a/stubs/get-fd.c +++ b/stubs/get-fd.c @@ -1,7 +1,7 @@ #include "qemu-common.h" #include "monitor/monitor.h" -int monitor_get_fd(Monitor *mon, const char *name, Error **errp) +int monitor_get_fd_cur(const char *name, Error **errp) { error_setg(errp, "only QEMU supports file descriptor passing"); return -1; diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 6b97dc1..9cd85dd 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -902,7 +902,7 @@ int socket_connect(SocketAddress *addr, Error **errp, break; case SOCKET_ADDRESS_KIND_FD: - fd = monitor_get_fd(cur_mon, addr->fd->str, errp); + fd = monitor_get_fd_cur(addr->fd->str, errp); if (fd >= 0 && callback) { qemu_set_nonblock(fd); callback(fd, opaque); @@ -934,7 +934,7 @@ int socket_listen(SocketAddress *addr, Error **errp) break; case SOCKET_ADDRESS_KIND_FD: - fd = monitor_get_fd(cur_mon, addr->fd->str, errp); + fd = monitor_get_fd_cur(addr->fd->str, errp); break; default: