From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGha-0001DH-FN for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgGhU-0007km-FY for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:15:58 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:52749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhU-0007kY-8z for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:15:52 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so2196644eaa.4 for ; Wed, 05 Dec 2012 07:15:51 -0800 (PST) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" Date: Wed, 5 Dec 2012 16:15:33 +0100 Message-Id: <1354720537-12097-2-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> References: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] spice-qemu-char: factor out CharDriverState creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alevy@redhat.com, kraxel@redhat.com Make the CharDriverState creation code reusable by spicevmc port. --- spice-qemu-char.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 665efd3..b86e83a 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -186,13 +186,32 @@ static void print_allowed_subtypes(void) fprintf(stderr, "\n"); } -CharDriverState *qemu_chr_open_spice(QemuOpts *opts) +static CharDriverState *chr_open(QemuOpts *opts, const char *subtype) { CharDriverState *chr; SpiceCharDriver *s; - const char* name = qemu_opt_get(opts, "name"); uint32_t debug = qemu_opt_get_number(opts, "debug", 0); - const char** psubtype = spice_server_char_device_recognized_subtypes(); + + chr = g_malloc0(sizeof(CharDriverState)); + s = g_malloc0(sizeof(SpiceCharDriver)); + s->chr = chr; + s->debug = debug; + s->active = false; + s->sin.subtype = subtype; + chr->opaque = s; + chr->chr_write = spice_chr_write; + chr->chr_close = spice_chr_close; + chr->chr_guest_open = spice_chr_guest_open; + chr->chr_guest_close = spice_chr_guest_close; + + return chr; +} + +CharDriverState *qemu_chr_open_spice(QemuOpts *opts) +{ + CharDriverState *chr; + const char *name = qemu_opt_get(opts, "name"); + const char **psubtype = spice_server_char_device_recognized_subtypes(); const char *subtype = NULL; if (name == NULL) { @@ -212,17 +231,7 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts) return NULL; } - chr = g_malloc0(sizeof(CharDriverState)); - s = g_malloc0(sizeof(SpiceCharDriver)); - s->chr = chr; - s->debug = debug; - s->active = false; - s->sin.subtype = subtype; - chr->opaque = s; - chr->chr_write = spice_chr_write; - chr->chr_close = spice_chr_close; - chr->chr_guest_open = spice_chr_guest_open; - chr->chr_guest_close = spice_chr_guest_close; + chr = chr_open(opts, subtype); #if SPICE_SERVER_VERSION < 0x000901 /* See comment in vmc_state() */ -- 1.7.11.7