[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] virtio-net: Add version_id 7 placeholder for vn
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 1/7] virtio-net: Add version_id 7 placeholder for vnet header support |
Date: |
Fri, 05 Jun 2009 14:46:52 -0600 |
User-agent: |
StGIT/0.14.2 |
Signed-off-by: Alex Williamson <address@hidden>
---
hw/virtio-net.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 60aa6da..9471d9e 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -16,7 +16,7 @@
#include "qemu-timer.h"
#include "virtio-net.h"
-#define VIRTIO_NET_VM_VERSION 6
+#define VIRTIO_NET_VM_VERSION 7
#define MAC_TABLE_ENTRIES 32
#define MAX_VLAN (1 << 12) /* Per 802.1Q definition */
@@ -523,6 +523,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
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, 0); /* vnet-hdr placeholder */
}
static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
@@ -562,6 +563,12 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int
version_id)
if (version_id >= 6)
qemu_get_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
+ if (version_id >= 7 && qemu_get_be32(f)) {
+ fprintf(stderr,
+ "virtio-net: saved image requires vnet header support\n");
+ exit(1);
+ }
+
if (n->tx_timer_active) {
qemu_mod_timer(n->tx_timer,
qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL);
- [Qemu-devel] [PATCH 0/7] virtio-net: Filter cleanup/improvements, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 1/7] virtio-net: Add version_id 7 placeholder for vnet header support,
Alex Williamson <=
- [Qemu-devel] [PATCH 2/7] virtio-net: Use a byte to store RX mode flags, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 3/7] virtio-net: reorganize receive_filter(), Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 4/7] virtio-net: Fix MAC filter overflow handling, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Alex Williamson, 2009/06/05
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Michael S. Tsirkin, 2009/06/06
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Alex Williamson, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Anthony Liguori, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Daniel P. Berrange, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Anthony Liguori, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Daniel P. Berrange, 2009/06/09