From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LKcLE-0002JU-55 for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LKcLC-0002Io-Qi for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:15 -0500 Received: from [199.232.76.173] (port=33248 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LKcLC-0002Id-5O for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:14 -0500 Received: from g1t0028.austin.hp.com ([15.216.28.35]:32728) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LKcLB-0004W0-Jt for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:13 -0500 From: Alex Williamson Content-Type: text/plain Date: Wed, 07 Jan 2009 10:37:38 -0700 Message-Id: <1231349858.7109.81.camel@lappy> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/5][RFC] virtio-net: Add load/save for status bits Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm , qemu-devel Cc: Mark McLoughlin virtio-net: Add load/save for status bits Signed-off-by: Alex Williamson --- hw/virtio-net.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index bfb7510..77e3077 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -16,6 +16,8 @@ #include "qemu-timer.h" #include "virtio-net.h" +#define VIRTIO_VM_VERSION 2 + typedef struct VirtIONet { VirtIODevice vdev; @@ -307,13 +309,14 @@ static void virtio_net_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, n->mac, 6); qemu_put_be32(f, n->tx_timer_active); + qemu_put_be16(f, n->status); } static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) { VirtIONet *n = opaque; - if (version_id != 1) + if (version_id < 1 || version_id > VIRTIO_VM_VERSION) return -EINVAL; virtio_load(&n->vdev, f); @@ -321,6 +324,9 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, n->mac, 6); n->tx_timer_active = qemu_get_be32(f); + if (version_id >= 2) + n->status = qemu_get_be16(f); + if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer, qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL); @@ -363,7 +369,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->tx_timer_active = 0; n->mergeable_rx_bufs = 0; - register_savevm("virtio-net", virtio_net_id++, 1, + register_savevm("virtio-net", virtio_net_id++, VIRTIO_VM_VERSION, virtio_net_save, virtio_net_load, n); return (PCIDevice *)n;