Re: [pve-devel] [PATCH qemu-server] cfg2cmd: fix uninitialized value warning on OVMF w/o efidisk

2020-05-06 Thread Thomas Lamprecht 
On 5/6/20 2:17 PM, Stefan Reiter wrote:
> It's possible to have a VM with OVMF but without an efidisk, so don't
> call parse_drive on a potential undef value.
> 
> Partial revert of 818c3b8d91 ("cfg2cmd: ovmf: code cleanup")
> 
> Signed-off-by: Stefan Reiter 
> ---
>  PVE/QemuServer.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index e9b094b..e76aee3 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -3084,7 +3084,8 @@ sub config_to_command {
>   die "uefi base image '$ovmf_code' not found\n" if ! -f $ovmf_code;
>  
>   my ($path, $format);
> - if (my $d = parse_drive('efidisk0', $conf->{efidisk0})) {
> + if (my $efidisk = $conf->{efidisk0}) {
> + my $d = parse_drive('efidisk0', $efidisk);
>   my ($storeid, $volname) = PVE::Storage::parse_volume_id($d->{file}, 
> 1);
>   $format = $d->{format};
>   if ($storeid) {
> 

applied, thanks!

___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH qemu-server] cfg2cmd: fix uninitialized value warning on OVMF w/o efidisk

2020-05-06 Thread Stefan Reiter 
It's possible to have a VM with OVMF but without an efidisk, so don't
call parse_drive on a potential undef value.

Partial revert of 818c3b8d91 ("cfg2cmd: ovmf: code cleanup")

Signed-off-by: Stefan Reiter 
---
 PVE/QemuServer.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index e9b094b..e76aee3 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3084,7 +3084,8 @@ sub config_to_command {
die "uefi base image '$ovmf_code' not found\n" if ! -f $ovmf_code;
 
my ($path, $format);
-   if (my $d = parse_drive('efidisk0', $conf->{efidisk0})) {
+   if (my $efidisk = $conf->{efidisk0}) {
+   my $d = parse_drive('efidisk0', $efidisk);
my ($storeid, $volname) = PVE::Storage::parse_volume_id($d->{file}, 
1);
$format = $d->{format};
if ($storeid) {
-- 
2.20.1


___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel