From patchwork Wed Dec 2 12:04:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40029 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1B2BB7BE3 for ; Thu, 3 Dec 2009 00:57:52 +1100 (EST) Received: from localhost ([127.0.0.1]:43271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpiH-0006XJ-Lb for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:57:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFny4-0004W4-7G for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:00 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxz-0004UD-TV for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:59 -0500 Received: from [199.232.76.173] (port=42933 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxz-0004U0-Kd for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29478) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxz-0004E3-4n for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:55 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5sXi031646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:54 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5ILM029769; Wed, 2 Dec 2009 07:05:53 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:22 +0100 Message-Id: <4f2dc736eeb34f2a79ec65cabbcbfe860abac47a.1259754427.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 24/41] virtio-net: use type checking version of qemu_put/get-* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/virtio-net.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 4ad5edd..57ad20b 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -695,20 +695,20 @@ static void virtio_net_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, n->mac, ETH_ALEN); qemu_put_be32s(f, &n->tx_timer_active); qemu_put_be32s(f, &n->mergeable_rx_bufs); - qemu_put_be16(f, n->status); - qemu_put_byte(f, n->promisc); - qemu_put_byte(f, n->allmulti); + qemu_put_be16s(f, &n->status); + qemu_put_8s(f, &n->promisc); + qemu_put_8s(f, &n->allmulti); qemu_put_be32(f, n->mac_table.in_use); qemu_put_buffer(f, n->mac_table.macs, n->mac_table.in_use * ETH_ALEN); qemu_put_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3); qemu_put_be32(f, n->has_vnet_hdr); - qemu_put_byte(f, n->mac_table.multi_overflow); - qemu_put_byte(f, n->mac_table.uni_overflow); - qemu_put_byte(f, n->alluni); - qemu_put_byte(f, n->nomulti); - qemu_put_byte(f, n->nouni); - qemu_put_byte(f, n->nobcast); - qemu_put_byte(f, n->has_ufo); + qemu_put_8s(f, &n->mac_table.multi_overflow); + qemu_put_8s(f, &n->mac_table.uni_overflow); + qemu_put_8s(f, &n->alluni); + qemu_put_8s(f, &n->nomulti); + qemu_put_8s(f, &n->nouni); + qemu_put_8s(f, &n->nobcast); + qemu_put_8s(f, &n->has_ufo); } static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) @@ -726,15 +726,15 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be32s(f, &n->mergeable_rx_bufs); if (version_id >= 3) - n->status = qemu_get_be16(f); + qemu_get_be16s(f, &n->status); if (version_id >= 4) { if (version_id < 8) { n->promisc = qemu_get_be32(f); n->allmulti = qemu_get_be32(f); } else { - n->promisc = qemu_get_byte(f); - n->allmulti = qemu_get_byte(f); + qemu_get_8s(f, &n->promisc); + qemu_get_8s(f, &n->allmulti); } } @@ -772,19 +772,20 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) } if (version_id >= 9) { - n->mac_table.multi_overflow = qemu_get_byte(f); - n->mac_table.uni_overflow = qemu_get_byte(f); + qemu_get_8s(f, &n->mac_table.multi_overflow); + qemu_get_8s(f, &n->mac_table.uni_overflow); } if (version_id >= 10) { - n->alluni = qemu_get_byte(f); - n->nomulti = qemu_get_byte(f); - n->nouni = qemu_get_byte(f); - n->nobcast = qemu_get_byte(f); + qemu_get_8s(f, &n->alluni); + qemu_get_8s(f, &n->nomulti); + qemu_get_8s(f, &n->nouni); + qemu_get_8s(f, &n->nobcast); } if (version_id >= 11) { - if (qemu_get_byte(f) && !peer_has_ufo(n)) { + qemu_get_8s(f, &n->has_ufo); + if (n->has_ufo && !peer_has_ufo(n)) { qemu_error("virtio-net: saved image requires TUN_F_UFO support\n"); return -1; }