diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-24 10:53:41 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-05-24 10:53:41 -0500 |
| commit | 9c678ccd15e71968ba9ce3cba704f429c5c7d539 (patch) | |
| tree | 39aec570e79a4e5e23ade0415d1fddb980f7d2da /block | |
| parent | 3853528a913f0807170e2c78b6ea692f8515c859 (diff) | |
| parent | 3e89cb0419cf5ff8f97fe219c6faa58f4c0c8728 (diff) | |
| download | qemu-9c678ccd15e71968ba9ce3cba704f429c5c7d539.zip qemu-9c678ccd15e71968ba9ce3cba704f429c5c7d539.tar.gz qemu-9c678ccd15e71968ba9ce3cba704f429c5c7d539.tar.bz2 | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'block')
| -rw-r--r-- | block/vvfat.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index ce16bbd..6d61c2e 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1244,7 +1244,7 @@ static void print_direntry(const direntry_t* direntry) int j = 0; char buffer[1024]; - fprintf(stderr, "direntry 0x%x: ", (int)direntry); + fprintf(stderr, "direntry %p: ", direntry); if(!direntry) return; if(is_long_name(direntry)) { @@ -1273,7 +1273,11 @@ static void print_direntry(const direntry_t* direntry) static void print_mapping(const mapping_t* mapping) { - fprintf(stderr, "mapping (0x%x): begin, end = %d, %d, dir_index = %d, first_mapping_index = %d, name = %s, mode = 0x%x, " , (int)mapping, mapping->begin, mapping->end, mapping->dir_index, mapping->first_mapping_index, mapping->path, mapping->mode); + fprintf(stderr, "mapping (%p): begin, end = %d, %d, dir_index = %d, " + "first_mapping_index = %d, name = %s, mode = 0x%x, " , + mapping, mapping->begin, mapping->end, mapping->dir_index, + mapping->first_mapping_index, mapping->path, mapping->mode); + if (mapping->mode & MODE_DIRECTORY) fprintf(stderr, "parent_mapping_index = %d, first_dir_index = %d\n", mapping->info.dir.parent_mapping_index, mapping->info.dir.first_dir_index); else @@ -2865,7 +2869,7 @@ static void checkpoint(void) { return; /* avoid compiler warnings: */ hexdump(NULL, 100); - remove_mapping(vvv, NULL); + remove_mapping(vvv, 0); print_mapping(NULL); print_direntry(NULL); } |