From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlfUs-0005UU-HO for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlfUn-0005Rj-2k for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:17 -0400 Received: from [199.232.76.173] (port=49330 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfUm-0005Rg-J6 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5730) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlfUl-0007Wy-OA for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:12 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A8xApm012335 for ; Thu, 10 Sep 2009 04:59:10 -0400 From: Gerd Hoffmann Date: Thu, 10 Sep 2009 10:58:45 +0200 Message-Id: <1252573135-27688-14-git-send-email-kraxel@redhat.com> In-Reply-To: <1252573135-27688-1-git-send-email-kraxel@redhat.com> References: <1252573135-27688-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 13/23] convert msmouse chardev to QemuOpts. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/msmouse.c | 2 +- hw/msmouse.h | 2 +- qemu-char.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/msmouse.c b/hw/msmouse.c index 69356a5..05f893c 100644 --- a/hw/msmouse.c +++ b/hw/msmouse.c @@ -64,7 +64,7 @@ static void msmouse_chr_close (struct CharDriverState *chr) qemu_free (chr); } -CharDriverState *qemu_chr_open_msmouse(void) +CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts) { CharDriverState *chr; diff --git a/hw/msmouse.h b/hw/msmouse.h index 947afd9..456cb21 100644 --- a/hw/msmouse.h +++ b/hw/msmouse.h @@ -1,2 +1,2 @@ /* msmouse.c */ -CharDriverState *qemu_chr_open_msmouse(void); +CharDriverState *qemu_chr_open_msmouse(QemuOpts *opts); diff --git a/qemu-char.c b/qemu-char.c index df53f12..9c5fe57 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2226,9 +2226,10 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) if (NULL == opts) return NULL; - if (strcmp(filename, "null") == 0 || - strcmp(filename, "pty") == 0 || - strcmp(filename, "stdio") == 0) { + if (strcmp(filename, "null") == 0 || + strcmp(filename, "pty") == 0 || + strcmp(filename, "msmouse") == 0 || + strcmp(filename, "stdio") == 0) { qemu_opt_set(opts, "backend", filename); return opts; } @@ -2279,6 +2280,7 @@ static const struct { } backend_table[] = { { .name = "null", .open = qemu_chr_open_null }, { .name = "socket", .open = qemu_chr_open_socket }, + { .name = "msmouse", .open = qemu_chr_open_msmouse }, #ifdef _WIN32 { .name = "file", .open = qemu_chr_open_win_file_out }, { .name = "pipe", .open = qemu_chr_open_win_pipe }, @@ -2354,8 +2356,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i } else { printf("Unable to open driver: %s\n", p); } - } else if (!strcmp(filename, "msmouse")) { - chr = qemu_chr_open_msmouse(); } else #ifndef _WIN32 #if defined(__linux__) -- 1.6.2.5