From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mv84J-0006t7-Dx for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mv84D-0006pg-Rq for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:58 -0400 Received: from [199.232.76.173] (port=40396 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mv84D-0006pH-35 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14922) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mv84C-0007ry-KT for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:52 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n96BIpGS004562 for ; Tue, 6 Oct 2009 07:18:51 -0400 From: Mark McLoughlin Date: Tue, 6 Oct 2009 12:16:53 +0100 Message-Id: <1254827836-11021-4-git-send-email-markmc@redhat.com> In-Reply-To: <1254827783.2720.42.camel@blaa> References: <1254827783.2720.42.camel@blaa> Subject: [Qemu-devel] [PATCH] Make NICInfo string fields non-const List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin We now only assign strdup()ed strings to these fields, never static strings. Signed-off-by: Mark McLoughlin --- net.c | 8 ++++---- net.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net.c b/net.c index f2b954c..76e44c9 100644 --- a/net.c +++ b/net.c @@ -2813,10 +2813,10 @@ void net_client_uninit(NICInfo *nd) nd->vlan->nb_guest_devs--; nb_nics--; - qemu_free((void *)nd->model); - qemu_free((void *)nd->name); - qemu_free((void *)nd->devaddr); - qemu_free((void *)nd->id); + qemu_free(nd->model); + qemu_free(nd->name); + qemu_free(nd->devaddr); + qemu_free(nd->id); memset(nd, 0, sizeof(*nd)); } diff --git a/net.h b/net.h index dfce8d6..a36df45 100644 --- a/net.h +++ b/net.h @@ -95,10 +95,10 @@ enum { struct NICInfo { uint8_t macaddr[6]; - const char *model; - const char *name; - const char *devaddr; - const char *id; + char *model; + char *name; + char *devaddr; + char *id; VLANState *vlan; VLANClientState *vc; void *private; -- 1.6.2.5