X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_blk.c;h=0059fb6f8fa6b6eb93b3f70aebd5a9dc4d99f0a0;hb=0fe8e057d19e132f88ab71dce8724b2c5585803a;hp=b3ea47b51586cf1034ce00378587b1f045368bc1;hpb=13fb068168e2826db39a481cf85033bb0156d2f9;p=palacios.releases.git

diff --git a/palacios/src/devices/lnx_virtio_blk.c b/palacios/src/devices/lnx_virtio_blk.c
index b3ea47b..0059fb6 100644
--- a/palacios/src/devices/lnx_virtio_blk.c
+++ b/palacios/src/devices/lnx_virtio_blk.c
@@ -25,14 +25,14 @@
 #include <palacios/vm_guest_mem.h>
 
 #include <devices/pci.h>
-#include <palacios/vmm_io.h>
 
-/*
-#ifndef DEBUG_VIRTIO_BLK
+
+
+#ifndef CONFIG_DEBUG_VIRTIO_BLK
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
-*/
+
 
 #define BLK_CAPACITY_PORT     20
 #define BLK_MAX_SIZE_PORT     28
@@ -340,7 +340,8 @@ static int handle_kick(struct vm_device * dev) {
     return 0;
 }
 
-static int virtio_io_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+static int virtio_io_write(uint16_t port, void * src, uint_t length, void * private_data) {
+    struct vm_device * dev = (struct vm_device *)private_data;
     struct virtio_blk_state * virtio = (struct virtio_blk_state *)dev->private_data;
     int port_idx = port % virtio->io_range_size;
 
@@ -447,7 +448,8 @@ static int virtio_io_write(uint16_t port, void * src, uint_t length, struct vm_d
 }
 
 
-static int virtio_io_read(uint16_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * private_data) {
+    struct vm_device * dev = (struct vm_device *)private_data;
     struct virtio_blk_state * virtio = (struct virtio_blk_state *)dev->private_data;
     int port_idx = port % virtio->io_range_size;
 
@@ -621,11 +623,12 @@ static int virtio_init(struct guest_info * vm, void * cfg_data) {
 
 	bars[0].io_read = virtio_io_read;
 	bars[0].io_write = virtio_io_write;
+	bars[0].private_data = dev;
 
 	pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE, 
 					 0, PCI_AUTO_DEV_NUM, 0,
 					 "LNX_VIRTIO_BLK", bars,
-					 NULL, NULL, NULL, dev);
+					 NULL, NULL, NULL, dev, NULL);
 
 	if (!pci_dev) {
 	    PrintError("Could not register PCI Device\n");