diff mbox

vmdk: Create streamOptimized as version 3

Message ID 1442466250-27787-1-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng Sept. 17, 2015, 5:04 a.m. UTC
VMware products accept only version 3 for streamOptimized, let's bump
the version.

Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/vmdk.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Kevin Wolf Sept. 17, 2015, 8:55 a.m. UTC | #1
Am 17.09.2015 um 07:04 hat Fam Zheng geschrieben:
> VMware products accept only version 3 for streamOptimized, let's bump
> the version.
> 
> Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>

Radoslav, can I have your Reviewed-by and/or Tested-by for this patch?

Kevin

>  block/vmdk.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index be0d640..37326c3 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -1651,7 +1651,13 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,
>      }
>      magic = cpu_to_be32(VMDK4_MAGIC);
>      memset(&header, 0, sizeof(header));
> -    header.version = zeroed_grain ? 2 : 1;
> +    if (compress) {
> +        header.version = 3;
> +    } else if (zeroed_grain) {
> +        header.version = 2;
> +    } else {
> +        header.version = 1;
> +    }
>      header.flags = VMDK4_FLAG_RGD | VMDK4_FLAG_NL_DETECT
>                     | (compress ? VMDK4_FLAG_COMPRESS | VMDK4_FLAG_MARKER : 0)
>                     | (zeroed_grain ? VMDK4_FLAG_ZERO_GRAIN : 0);
> -- 
> 2.4.3
>
Fam Zheng Jan. 20, 2016, 4:28 a.m. UTC | #2
On Thu, 09/17 10:55, Kevin Wolf wrote:
> Am 17.09.2015 um 07:04 hat Fam Zheng geschrieben:
> > VMware products accept only version 3 for streamOptimized, let's bump
> > the version.
> > 
> > Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> Radoslav, can I have your Reviewed-by and/or Tested-by for this patch?

Kevin, RHBZ 1299116 confirms that using version 3 for streamOptimized will make
VMware products happy. Could you apply this patch?

Fam

> 
> Kevin
> 
> >  block/vmdk.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/block/vmdk.c b/block/vmdk.c
> > index be0d640..37326c3 100644
> > --- a/block/vmdk.c
> > +++ b/block/vmdk.c
> > @@ -1651,7 +1651,13 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,
> >      }
> >      magic = cpu_to_be32(VMDK4_MAGIC);
> >      memset(&header, 0, sizeof(header));
> > -    header.version = zeroed_grain ? 2 : 1;
> > +    if (compress) {
> > +        header.version = 3;
> > +    } else if (zeroed_grain) {
> > +        header.version = 2;
> > +    } else {
> > +        header.version = 1;
> > +    }
> >      header.flags = VMDK4_FLAG_RGD | VMDK4_FLAG_NL_DETECT
> >                     | (compress ? VMDK4_FLAG_COMPRESS | VMDK4_FLAG_MARKER : 0)
> >                     | (zeroed_grain ? VMDK4_FLAG_ZERO_GRAIN : 0);
> > -- 
> > 2.4.3
> >
Kevin Wolf Jan. 20, 2016, 10:31 a.m. UTC | #3
Am 20.01.2016 um 05:28 hat Fam Zheng geschrieben:
> On Thu, 09/17 10:55, Kevin Wolf wrote:
> > Am 17.09.2015 um 07:04 hat Fam Zheng geschrieben:
> > > VMware products accept only version 3 for streamOptimized, let's bump
> > > the version.
> > > 
> > > Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
> > > Signed-off-by: Fam Zheng <famz@redhat.com>
> > 
> > Radoslav, can I have your Reviewed-by and/or Tested-by for this patch?
> 
> Kevin, RHBZ 1299116 confirms that using version 3 for streamOptimized will make
> VMware products happy. Could you apply this patch?

Sorry, I completely forgot about this patch. You could even have pinged
me earlier when it became apparent that Radoslav wouldn't reply.

Thanks, applied to the block branch.

Kevin
Radoslav Gerganov March 8, 2016, 9:37 a.m. UTC | #4
On 17.09.2015 08:04, Fam Zheng wrote:
> VMware products accept only version 3 for streamOptimized, let's bump
> the version.
> 
> Reported-by: Radoslav Gerganov <rgerganov@vmware.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/vmdk.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Hi Fam,

I am really sorry for the late reply.  Your patch looks great, I confirm that
VMware products expect VMDK version 3 for streamOptimized images.

I will try to follow-up the VMDK work promptly from now on.  Please keep
adding me in CC.  Thanks! 

-Rado
diff mbox

Patch

diff --git a/block/vmdk.c b/block/vmdk.c
index be0d640..37326c3 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1651,7 +1651,13 @@  static int vmdk_create_extent(const char *filename, int64_t filesize,
     }
     magic = cpu_to_be32(VMDK4_MAGIC);
     memset(&header, 0, sizeof(header));
-    header.version = zeroed_grain ? 2 : 1;
+    if (compress) {
+        header.version = 3;
+    } else if (zeroed_grain) {
+        header.version = 2;
+    } else {
+        header.version = 1;
+    }
     header.flags = VMDK4_FLAG_RGD | VMDK4_FLAG_NL_DETECT
                    | (compress ? VMDK4_FLAG_COMPRESS | VMDK4_FLAG_MARKER : 0)
                    | (zeroed_grain ? VMDK4_FLAG_ZERO_GRAIN : 0);