Attachment 853937 Details for Bug 1056640 – Proposed patch to solve a few disk sizing issues

[patch] Proposed patch to solve a few disk sizing issues

proposed-1056640.patch (text/plain), 2.24 KB, created by Ronald van Zantvoort on 2014-01-22 16:07:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronald van Zantvoort

Created: 2014-01-22 16:07:51 UTC

Size: 2.24 KB

patch

obsolete

>--- /usr/share/perl5/vendor_perl/Sys/VirtConvert/Connection/VMwareOVASource.pm	2013-08-09 00:02:58.000000000 +0200
>+++ ./VMwareOVASource-p1056640.pm	2014-01-22 17:05:01.749831803 +0100
>@@ -1,4 +1,4 @@
>-# Sys::VirtConvert::Connection::VMwareOVASource
>+# # Sys::VirtConvert::Connection::VMwareOVASource
> # Copyright (C) 2012 Red Hat Inc.
> #
> # This library is free software; you can redistribute it and/or
>@@ -243,6 +243,43 @@
>     return $input_number;
> }
> 
>+#Translate a unit field into bytes per unit
>+sub _get_byte_units
>+{
>+        my $units = @_;
>+
>+        #$1 = kilo,mega,giga
>+        #$2 = s
>+        #$3 = group w/calc
>+        #$4 = 2 | 10 (^$5)
>+        #$5 = ^digit
>+        $units =~ /^(kilo|mega|giga){0,1}byte(s){0,1}([\s]*\*[\s]*(\d+)[\s]*\^[\s]*(\d+)){0,1}[\s]*$/i or die "Unexpected unit specification: $units";
>+       
>+        my $byte_size;
>+        #Can't find references in the OVA spec to binary/decimal counting,
>+        #other than that units are supposed to be logical.
>+        #In the case of any computer, binary logic is logical.
>+        #In the case of HD's and SI in general, HW vendors like decimal.
>+        #OVF doesn't seem to allow the -bi syntax, 
>+        #leaving the issue out to dry. I'm going to assume binary.
>+        if(defined($1)) {
>+            if ($1 =~ "[Kk]ilo"){
>+                $byte_size = 1024;
>+            } elsif ($1 =~ "[Mm]ega"){
>+                $byte_size = 1024 * 1024;
>+            } elsif ($1 =~ "[Gg]iga"){
>+                $byte_size = 1024 * 1024 * 1024;
>+            } else {
>+                die "Unexpected unit specification: $units";
>+            }
>+        } else {
>+            $byte_size = 1;
>+        }
>+        
>+        if(defined($3)) {
>+            $byte_size = $byte_size * $4 ** $5;
>+        }
>+}
> 
> # to double check for errors
> 
>@@ -307,9 +344,11 @@
>     my $usage = _node_val($disk, '@ovf:populatedSize');
> 
>     my $units = _node_val($disk, '@ovf:capacityAllocationUnits');
>-    $units =~ /^byte \* 2\^(\d+)$/
>-        or die "Unexpected ovf:capacityAllocationUnits: $units";
>-    $units = 2 ** $1;
>+    if (defined($units)){
>+        $units = _get_byte_units($units);
>+    } else {
>+        $units = 1;
>+    }
>     my $size = _node_val($disk, '@ovf:capacity') * $units;
> 
>     my $is_block = 0;

Actions: View | Diff

Attachments on bug 1056640: 853937