updated virtio block device to partially handle non-aligned IO requests

[palacios.git] / palacios / include / devices / lnx_virtio_pci.h

diff --git a/palacios/include/devices/lnx_virtio_pci.h b/palacios/include/devices/lnx_virtio_pci.h
index 5379479..f0c5e3d 100644 (file)
--- a/palacios/include/devices/lnx_virtio_pci.h
+++ b/palacios/include/devices/lnx_virtio_pci.h
@@ -40,11 +40,13 @@
 
 #define VIRTIO_NET_SUBDEVICE_ID 1
 #define VIRTIO_BLOCK_SUBDEVICE_ID 2
+#define VIRTIO_CONSOLE_SUBDEVICE_ID 3
 #define VIRTIO_BALLOON_SUBDEVICE_ID 5
 #define VIRTIO_SYMBIOTIC_SUBDEVICE_ID 10
 #define VIRTIO_SYMMOD_SUBDEVICE_ID 11
 #define VIRTIO_VNET_SUBDEVICE_ID 12
 
+
 #define HOST_FEATURES_PORT 0
 #define GUEST_FEATURES_PORT 4
 #define VRING_PG_NUM_PORT 8
@@ -89,14 +91,19 @@
  * 
  */
 struct virtio_config {
-    uint32_t host_features;
-    uint32_t guest_features;
-    uint32_t vring_page_num;
-    uint16_t vring_ring_size;
-    uint16_t vring_queue_selector;
-    uint16_t vring_queue_notifier;
-    uint8_t status;
-    uint8_t pci_isr;
+    union {
+       uint8_t buf[20];
+       struct {
+           uint32_t host_features;
+           uint32_t guest_features;
+           uint32_t vring_page_num;
+           uint16_t vring_ring_size;
+           uint16_t vring_queue_selector;
+           uint16_t vring_queue_notifier;
+           uint8_t status;
+           uint8_t pci_isr;
+       } __attribute__((packed));
+    } __attribute__((packed));
 } __attribute__((packed));