X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Flnx_virtio_pci.h;h=5379479c6619c4557e4321f621c0dd08723550ab;hb=c14fd53d3a309c07116138ddff54bfb990e4d620;hp=c0f2295f4890bbc56691f13a133c4c0522f7e705;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios.git

diff --git a/palacios/include/devices/lnx_virtio_pci.h b/palacios/include/devices/lnx_virtio_pci.h
index c0f2295..5379479 100644
--- a/palacios/include/devices/lnx_virtio_pci.h
+++ b/palacios/include/devices/lnx_virtio_pci.h
@@ -36,14 +36,14 @@
 #define VIRTIO_CONSOLE_DEV_ID     0x1003
 #define VIRTIO_SYMBIOTIC_DEV_ID   0x100a
 #define VIRTIO_SYMMOD_DEV_ID      0x100b
-#define VIRTIO_VNET_CTRL_DEV_ID   0x100c
+#define VIRTIO_VNET_DEV_ID        0x100c
 
 #define VIRTIO_NET_SUBDEVICE_ID 1
 #define VIRTIO_BLOCK_SUBDEVICE_ID 2
 #define VIRTIO_BALLOON_SUBDEVICE_ID 5
 #define VIRTIO_SYMBIOTIC_SUBDEVICE_ID 10
 #define VIRTIO_SYMMOD_SUBDEVICE_ID 11
-#define VIRTIO_VNET_CTRL_SUBDEVICE_ID 12
+#define VIRTIO_VNET_SUBDEVICE_ID 12
 
 #define HOST_FEATURES_PORT 0
 #define GUEST_FEATURES_PORT 4
@@ -136,9 +136,6 @@ struct virtio_queue {
     addr_t ring_avail_addr;
     addr_t ring_used_addr;
   
-    uint16_t last_avail_idx;
-    int idx_overflow;
-
     struct vring_desc * desc; // We can treat this as an array...
     struct vring_avail * avail;
     struct vring_used * used;