[pve-devel] applied: [PATCH v2 qemu-server] fix efi disk format detection

[Wolfgang Bumiller]

applied

On Mon, Jan 08, 2018 at 03:25:07PM +0100, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
> Fixes: 2bfbee039bbe ("include format for efidisk")
> ---
> Changes since v1:
> * When the disk was specified as a path instead of as storage:volume
>   the format property is now mandatory.
> 
>  PVE/QemuServer.pm | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 42c412a..32bf70d 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2908,20 +2908,27 @@ sub config_to_command {
>  	die "uefi base image not found\n" if ! -f $OVMF_CODE;
>  
>  	my $path;
> -	my $format = 'raw';
> +	my $format;
>  	if (my $efidisk = $conf->{efidisk0}) {
>  	    my $d = PVE::JSONSchema::parse_property_string($efidisk_fmt, $efidisk);
>  	    my ($storeid, $volname) = PVE::Storage::parse_volume_id($d->{file}, 1);
> +	    $format = $d->{format};
>  	    if ($storeid) {
>  		$path = PVE::Storage::path($storecfg, $d->{file});
> +		if (!defined($format)) {
> +		    my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
> +		    $format = qemu_img_format($scfg, $volname);
> +		}
>  	    } else {
>  		$path = $d->{file};
> +		die "efidisk format must be specified\n"
> +		    if !defined($format);
>  	    }
> -	    $format = $d->{format} if $d->{format};
>  	} else {
>  	    warn "no efidisk configured! Using temporary efivars disk.\n";
>  	    $path = "/tmp/$vmid-ovmf.fd";
>  	    PVE::Tools::file_copy($OVMF_VARS, $path, -s $OVMF_VARS);
> +	    $format = 'raw';
>  	}
>  
>  	push @$cmd, '-drive', "if=pflash,unit=0,format=raw,readonly,file=$OVMF_CODE";
> -- 
> 2.11.0