8c721a87ae
- Remove deprecated patch "work-around-SA_RESTART-race" (boo#982208) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 * Patches dropped: 0002-XXX-work-around-SA_RESTART-race-wit.patch 0003-qemu-0.9.0.cvs-binfmt.patch 0004-qemu-cvs-alsa_bitfield.patch 0005-qemu-cvs-alsa_ioctl.patch 0006-qemu-cvs-alsa_mmap.patch 0007-qemu-cvs-gettimeofday.patch 0008-qemu-cvs-ioctl_debug.patch 0009-qemu-cvs-ioctl_nodirection.patch 0010-block-vmdk-Support-creation-of-SCSI.patch 0011-linux-user-add-binfmt-wrapper-for-a.patch 0012-PPC-KVM-Disable-mmu-notifier-check.patch 0013-linux-user-fix-segfault-deadlock.patch 0014-linux-user-binfmt-support-host-bina.patch 0015-linux-user-Ignore-broken-loop-ioctl.patch 0016-linux-user-lock-tcg.patch 0017-linux-user-Run-multi-threaded-code-.patch 0018-linux-user-lock-tb-flushing-too.patch 0019-linux-user-Fake-proc-cpuinfo.patch 0020-linux-user-implement-FS_IOC_GETFLAG.patch 0021-linux-user-implement-FS_IOC_SETFLAG.patch 0022-linux-user-XXX-disable-fiemap.patch 0023-slirp-nooutgoing.patch 0024-vnc-password-file-and-incoming-conn.patch 0025-linux-user-add-more-blk-ioctls.patch 0026-linux-user-use-target_ulong.patch 0027-block-Add-support-for-DictZip-enabl.patch 0028-block-Add-tar-container-format.patch OBS-URL: https://build.opensuse.org/request/show/408549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=305
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 5c25d47e2378efdbd72c49827252741b46ebacff 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 31da8b9..41620fd 100644
|
|
--- a/block/tar.c
|
|
+++ b/block/tar.c
|
|
@@ -73,7 +73,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;
|
|
|
|
@@ -89,10 +90,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;
|
|
}
|
|
|
|
@@ -219,12 +227,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! */
|
|
|