[pve-devel] [PATCH qemu-server 1/2] print_cpu_device: cleanup default values

[Thomas Lamprecht]

On 05/17/2017 09:47 AM, Fabian Grünbichler wrote:
> for consistency's sake
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
>   PVE/QemuServer.pm | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 2fb419d..ed6c598 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -1720,9 +1720,8 @@ sub print_cpu_device {
>   	$cpu = $cpuconf->{cputype};
>       }
>   
> -    my $sockets = 1;
> -    $sockets = $conf->{sockets} if  $conf->{sockets};
> -    my $cores = $conf->{cores} || 1;
> +    my $sockets = $conf->{sockets} // 1;
> +    my $cores = $conf->{cores} // 1;

Oh, and with the old check you would need the if ($cores > 1) check below?
Negative values should be caught already by the API/Format checks.
nit pick but I do not really see the value from the change :-)

>   
>       my $current_core = ($id - 1) % $cores;
>       my $current_socket = int(($id - $current_core)/$cores);