From patchwork Mon Aug 15 16:17:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 110071 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 184E7B6F6F for ; Tue, 16 Aug 2011 02:47:26 +1000 (EST) Received: from localhost ([::1]:37475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QszsC-0004kk-Sl for incoming@patchwork.ozlabs.org; Mon, 15 Aug 2011 12:18:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qszre-0003Et-HN for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QszrZ-0000o2-Pm for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:07 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:47418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QszrZ-0000nx-N9 for qemu-devel@nongnu.org; Mon, 15 Aug 2011 12:18:05 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7FFmMGe001963 for ; Mon, 15 Aug 2011 11:48:22 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7FGI5Su219592 for ; Mon, 15 Aug 2011 12:18:05 -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 p7FGI3hl003859 for ; Mon, 15 Aug 2011 12:18:04 -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 p7FGHiZ5001510; Mon, 15 Aug 2011 12:18:02 -0400 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 15 Aug 2011 11:17:37 -0500 Message-Id: <1313425061-12854-11-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.145 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH 10/14] char: qemu_chr_open_opts() -> qemu_chr_new_from_opts() 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 --- qemu-char.c | 4 ++-- qemu-char.h | 2 +- vl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 569e989..75fe7b3 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2548,7 +2548,7 @@ static const struct { #endif }; -CharDriverState *qemu_chr_open_opts(QemuOpts *opts, +CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, void (*init)(struct CharDriverState *s)) { CharDriverState *chr; @@ -2617,7 +2617,7 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in if (!opts) return NULL; - chr = qemu_chr_open_opts(opts, init); + chr = qemu_chr_new_from_opts(opts, init); if (chr && qemu_opt_get_bool(opts, "mux", 0)) { monitor_init(chr, MONITOR_USE_READLINE); } diff --git a/qemu-char.h b/qemu-char.h index 097f0e6..f90b85c 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -78,7 +78,7 @@ struct CharDriverState { }; QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); -CharDriverState *qemu_chr_open_opts(QemuOpts *opts, +CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, void (*init)(struct CharDriverState *s)); CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*init)(struct CharDriverState *s)); void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo); diff --git a/vl.c b/vl.c index 7143d15..c389c27 100644 --- a/vl.c +++ b/vl.c @@ -1689,7 +1689,7 @@ static int chardev_init_func(QemuOpts *opts, void *opaque) { CharDriverState *chr; - chr = qemu_chr_open_opts(opts, NULL); + chr = qemu_chr_new_from_opts(opts, NULL); if (!chr) return -1; return 0;