X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ftmpdisk.c;h=1a917ab2b5afb9e4f1ca3128e7dac0d957abbf4a;hb=83790cde959d56c148be1b5f64d2e4a4414acac9;hp=fde3cf3327fb8ee191f59214fdc762c39437fdb5;hpb=46eb34d1853799f1ad729b7713ec093c5c24a00f;p=palacios.git diff --git a/palacios/src/devices/tmpdisk.c b/palacios/src/devices/tmpdisk.c index fde3cf3..1a917ab 100644 --- a/palacios/src/devices/tmpdisk.c +++ b/palacios/src/devices/tmpdisk.c @@ -32,7 +32,7 @@ struct blk_state { static uint64_t blk_get_capacity(void * private_data) { struct blk_state * blk = (struct blk_state *)private_data; - PrintDebug("SymBlk: Getting Capacity %d\n", (uint32_t)(blk->capacity)); + // PrintDebug("SymBlk: Getting Capacity %d\n", (uint32_t)(blk->capacity)); return blk->capacity; } @@ -42,6 +42,8 @@ static uint64_t blk_get_capacity(void * private_data) { static int blk_read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) { struct blk_state * blk = (struct blk_state *)private_data; + // PrintDebug("TmpDisk Reading %d bytes to %p (lba=%p)\n", (uint32_t)num_bytes, buf, (void *)(addr_t)lba); + if (lba + num_bytes > blk->capacity) { PrintError("TMPDISK Read past end of disk\n"); return -1; @@ -58,6 +60,8 @@ static int blk_read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * priv static int blk_write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) { struct blk_state * blk = (struct blk_state *)private_data; + // PrintDebug("TmpDisk Writing %d bytes to %p (lba=%p)\n", (uint32_t)num_bytes, buf, (void *)(addr_t)lba); + if (lba + num_bytes > blk->capacity) { PrintError("TMPDISK Write past end of disk\n"); return -1; @@ -92,7 +96,7 @@ static struct v3_device_ops dev_ops = { -static int blk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { +static int blk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct blk_state * blk = NULL; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); char * name = v3_cfg_val(cfg, "name");