b6f516049c
Add xen_disk discard support (olh), backport VMDK SCSI change from v1.6.2 maintenance update and update syscall numbers OBS-URL: https://build.opensuse.org/request/show/221154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=179
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 352ccb463225f5028de8aeb9a12379800bef30e6 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 12 Dec 2012 19:11:30 +0100
|
|
Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
|
|
|
|
---
|
|
block/tar.c | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block/tar.c b/block/tar.c
|
|
index 24ed37b..c324240 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! */
|
|
|