X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fdisk_model.c;h=0eec5bfb1673472271421461f22aad8ac72470c2;hb=d0ebfed83ac079f95da8bf79e64ac77f31d551ac;hp=75f4526ad18c19dac8cca83c3c1e7e933ed870eb;hpb=7021908ce7f63df7c8a9e8e007471d8df96aa1b6;p=palacios.git

diff --git a/palacios/src/devices/disk_model.c b/palacios/src/devices/disk_model.c
index 75f4526..0eec5bf 100644
--- a/palacios/src/devices/disk_model.c
+++ b/palacios/src/devices/disk_model.c
@@ -19,7 +19,6 @@
 
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_sym_swap.h>
 #include <palacios/vm_guest.h>
 
 
@@ -81,7 +80,7 @@ static struct v3_device_ops dev_ops = {
 };
 
 
-static int connect_fn(struct guest_info * info, 
+static int connect_fn(struct v3_vm_info * vm, 
 		      void * frontend_data, 
 		      struct v3_dev_blk_ops * ops, 
 		      v3_cfg_tree_t * cfg, 
@@ -96,7 +95,7 @@ static int connect_fn(struct guest_info * info,
   model->seek_usecs = seek_time;
   model->private_data = private_data;
 
-  if (v3_dev_connect_blk(info, v3_cfg_val(frontend_cfg, "tag"), 
+  if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"), 
 			 &blk_ops, frontend_cfg, model) == -1) {
       PrintError("Could not connect  to frontend %s\n", 
 		  v3_cfg_val(frontend_cfg, "tag"));
@@ -106,7 +105,7 @@ static int connect_fn(struct guest_info * info,
   return 0;
 }
 
-static int model_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+static int model_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     char * name = v3_cfg_val(cfg, "name");