diff options
author | Alexander Graf <agraf@suse.de> | 2012-12-12 19:11:30 +0100 |
---|---|---|
committer | Chanho Park <parkch98@gmail.com> | 2014-09-09 11:32:52 +0900 |
commit | 17347f34e9fc9f1f36e473681255b0a3238bca24 (patch) | |
tree | 90ea6d50ef80973ffbc8afc60f608f74348449c8 /block | |
parent | a664ff80e76d0c35ededb7bd4678c833d9f6ac91 (diff) | |
download | qemu-17347f34e9fc9f1f36e473681255b0a3238bca24.tar.gz qemu-17347f34e9fc9f1f36e473681255b0a3238bca24.tar.bz2 qemu-17347f34e9fc9f1f36e473681255b0a3238bca24.zip |
Legacy Patch kvm-qemu-preXX-dictzip3.patch
Diffstat (limited to 'block')
-rw-r--r-- | block/tar.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/block/tar.c b/block/tar.c index c2ab5fade..ea2075d24 100644 --- a/block/tar.c +++ b/block/tar.c @@ -83,7 +83,8 @@ static int str_ends(char *str, const char *end) return !strncmp(str + str_len - end_len, end, end_len); } -static int is_target_file(BlockDriverState *bs, char *filename) +static int is_target_file(BlockDriverState *bs, char *filename, + char *header) { int retval = 0; @@ -99,10 +100,17 @@ static int is_target_file(BlockDriverState *bs, char *filename) if (str_ends(filename, ".vmdk")) retval = 1; + if (retval && + (header[OFFS_TYPE] != '0') && + (header[OFFS_TYPE] != 'S')) { + retval = 0; + } + dprintf("does filename %s match? %s\n", filename, retval ? "yes" : "no"); /* make sure we're not using this name again */ filename[0] = '\0'; + return retval; } @@ -229,12 +237,13 @@ static int tar_open(BlockDriverState *bs, QDict *options, int flags, Error **err bdrv_pread(s->hd, header_offs - s->file_len, s->longfile, sizeof(s->longfile)); s->longfile[sizeof(s->longfile)-1] = '\0'; + real_file = header; } else if (s->longfile[0]) { real_file = s->longfile; } else { real_file = header; } - } while(!is_target_file(bs, real_file)); + } while(!is_target_file(bs, real_file, header)); /* We found an image! */ |