[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v7 03/12] VMDK: probe for monolithicFlat images
From: |
Kevin Wolf |
Subject: |
Re: [Qemu-devel] [PATCH v7 03/12] VMDK: probe for monolithicFlat images |
Date: |
Mon, 04 Jul 2011 12:38:54 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc15 Thunderbird/3.1.10 |
Am 03.07.2011 17:06, schrieb Fam Zheng:
> Probe as the same behavior as VMware does.
> Recognize image as monolithicFlat descriptor file when the file is text
> and the first effective line (not '#' leaded comment or space line) is
> either 'version=1' or 'version=2'. No space or upper case charactors
> accepted.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
> block/vmdk.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
> 1 files changed, 42 insertions(+), 2 deletions(-)
>
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 03a4619..05a58db 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -103,10 +103,50 @@ static int vmdk_probe(const uint8_t *buf, int buf_size,
> const char *filename)
> return 0;
> magic = be32_to_cpu(*(uint32_t *)buf);
> if (magic == VMDK3_MAGIC ||
> - magic == VMDK4_MAGIC)
> + magic == VMDK4_MAGIC) {
> return 100;
> - else
> + } else {
> + const char *p = (const char *)buf;
> + const char *end = p + buf_size;
> + while (p < end) {
> + if (*p == '#') {
> + /* skip comment line */
> + while (p < end && *p != '\n') {
> + p++;
> + }
> + p++;
> + continue;
> + }
> + if (*p == ' ') {
> + while (p < end && *p == ' ') {
> + p++;
> + }
> + /* skip '\r' if windows line endings used. */
> + if (p < end && *p == '\r') {
> + p++;
> + }
> + /* only accept blank lines before 'version=' line */
> + if (p == end || *p != '\n') {
> + return 0;
> + }
> + p++;
> + continue;
> + }
> + if (end - p >= strlen("version=X\n")) {
> + if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 ||
> + strncmp("version=2\n", p, strlen("version=2\n")) == 0) {
> + return 100;
> + }
> + }
> + if (end - p >= strlen("version=X\r\n")) {
> + if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) ==
> 0 ||
> + strncmp("version=2\r\n", p, strlen("version=2\r\n")) ==
> 0) {
> + return 100;
> + }
> + }
I think you may want to insert something right here. :-)
This code (actually v6, but it doesn't seem to have changed) gives my an
endless loop in vmdk_probe when trying to open a qcow2 image. So
"something" might be p++ or probably just return 0;
Kevin
> + }
> return 0;
> + }
> }
>
> #define CHECK_CID 1
- [Qemu-devel] [PATCH v7 00/12] Adding VMDK monolithic flat support, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 01/12] VMDK: introduce VmdkExtent, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 02/12] VMDK: bugfix, align offset to cluster in get_whole_cluster, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 03/12] VMDK: probe for monolithicFlat images, Fam Zheng, 2011/07/03
- Re: [Qemu-devel] [PATCH v7 03/12] VMDK: probe for monolithicFlat images,
Kevin Wolf <=
- [Qemu-devel] [PATCH v7 04/12] VMDK: separate vmdk_open by format version, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 05/12] VMDK: add field BDRVVmdkState.desc_offset, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 06/12] VMDK: flush multiple extents, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 07/12] VMDK: move 'static' cid_update flag to bs field, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 08/12] VMDK: change get_cluster_offset return type, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 09/12] VMDK: open/read/write for monolithicFlat image, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 10/12] VMDK: create different subformats, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 11/12] VMDK: fix coding style, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 12/12] block: add bdrv_get_allocated_file_size() operation, Fam Zheng, 2011/07/03