From patchwork Wed Mar 13 13:59:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 227292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE03F2C00A5 for ; Thu, 14 Mar 2013 00:57:15 +1100 (EST) Received: from localhost ([::1]:54047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmB8-0007ur-31 for incoming@patchwork.ozlabs.org; Wed, 13 Mar 2013 09:57:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmAa-0007iq-V9 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFmAW-0002gI-Lk for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmAW-0002g8-E3 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:36 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2DDuZ1Y012328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Mar 2013 09:56:35 -0400 Received: from shalem.localdomain.com (vpn1-7-240.ams2.redhat.com [10.36.7.240]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2DDuSJj003674; Wed, 13 Mar 2013 09:56:34 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2013 14:59:43 +0100 Message-Id: <1363183187-16258-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1363183187-16258-1-git-send-email-hdegoede@redhat.com> References: <1363183187-16258-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Hans de Goede , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/7] spice-qemu-char: Fix name parameter issues after qapi-ifying 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 The strings passed in through the qapi calls are dynamic memory, since we want to have them stick around longer then just the call to qemu_chr_open_spice_* we need to strdup them. Signed-off-by: Hans de Goede --- spice-qemu-char.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 0c92ca8..a94f76b 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -185,6 +185,11 @@ static void spice_chr_close(struct CharDriverState *chr) printf("%s\n", __func__); vmc_unregister_interface(s); QLIST_REMOVE(s, next); + + g_free((char *)s->sin.subtype); +#if SPICE_SERVER_VERSION >= 0x000c02 + g_free((char *)s->sin.portname); +#endif g_free(s); } @@ -226,7 +231,7 @@ static CharDriverState *chr_open(const char *subtype) s = g_malloc0(sizeof(SpiceCharDriver)); s->chr = chr; s->active = false; - s->sin.subtype = subtype; + s->sin.subtype = g_strdup(subtype); chr->opaque = s; chr->chr_write = spice_chr_write; chr->chr_close = spice_chr_close; @@ -284,7 +289,7 @@ CharDriverState *qemu_chr_open_spice_port(const char *name) chr = chr_open("port"); s = chr->opaque; - s->sin.portname = name; + s->sin.portname = g_strdup(name); return chr; }