From patchwork Mon Aug 15 16:17:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 110072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 998F3B6F62 for ; Tue, 16 Aug 2011 02:54:18 +1000 (EST) Received: from localhost ([::1]:37509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QszsJ-0004lg-7U for incoming@patchwork.ozlabs.org; Mon, 15 Aug 2011 12:18:51 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qszrm-0003Mj-JZ for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qszrg-0000p0-Gt for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:13 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:50540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qszrg-0000ow-EG for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:12 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7FFim3w003769 for ; Mon, 15 Aug 2011 11:44:48 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7FGIB1E203962 for ; Mon, 15 Aug 2011 12:18:11 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7FGIAGO004419 for ; Mon, 15 Aug 2011 12:18:10 -0400 Received: from titi.local (sig-9-49-139-190.mts.ibm.com [9.49.139.190]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p7FGHiZ7001510; Mon, 15 Aug 2011 12:18:08 -0400 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 15 Aug 2011 11:17:39 -0500 Message-Id: <1313425061-12854-13-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1313425061-12854-1-git-send-email-aliguori@us.ibm.com> References: <1313425061-12854-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.139 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH 12/14] char: rename qemu_chr_get_msgfd() -> qemu_chr_fe_get_msgfd() 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 Signed-off-by: Anthony Liguori --- hw/ivshmem.c | 2 +- monitor.c | 2 +- qemu-char.c | 2 +- qemu-char.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 42a5877..1176387 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -401,7 +401,7 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags) memcpy(&incoming_posn, buf, sizeof(long)); /* pick off s->server_chr->msgfd and store it, posn should accompany msg */ - tmp_fd = qemu_chr_get_msgfd(s->server_chr); + tmp_fd = qemu_chr_fe_get_msgfd(s->server_chr); IVSHMEM_DPRINTF("posn is %ld, fd is %d\n", incoming_posn, tmp_fd); /* make sure we have enough space for this guest */ diff --git a/monitor.c b/monitor.c index e7f41eb..7d5dd6f 100644 --- a/monitor.c +++ b/monitor.c @@ -2758,7 +2758,7 @@ static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) mon_fd_t *monfd; int fd; - fd = qemu_chr_get_msgfd(mon->chr); + fd = qemu_chr_fe_get_msgfd(mon->chr); if (fd == -1) { qerror_report(QERR_FD_NOT_SUPPLIED); return -1; diff --git a/qemu-char.c b/qemu-char.c index 70349fd..9af6c58 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -163,7 +163,7 @@ void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len) s->chr_read(s->handler_opaque, buf, len); } -int qemu_chr_get_msgfd(CharDriverState *s) +int qemu_chr_fe_get_msgfd(CharDriverState *s) { return s->get_msgfd ? s->get_msgfd(s) : -1; } diff --git a/qemu-char.h b/qemu-char.h index 555b5f1..abd9cbd 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -98,7 +98,7 @@ int qemu_chr_fe_ioctl(CharDriverState *s, int cmd, void *arg); void qemu_chr_generic_open(CharDriverState *s); int qemu_chr_be_can_write(CharDriverState *s); void qemu_chr_be_write(CharDriverState *s, uint8_t *buf, int len); -int qemu_chr_get_msgfd(CharDriverState *s); +int qemu_chr_fe_get_msgfd(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); int qemu_chr_add_client(CharDriverState *s, int fd); void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);