[pve-devel] applied: [PATCH qemu-server 1/2] fix #1267: move args to the end of qemu commandline

[Wolfgang Bumiller]

applied

I still wonder if there exist some bizarre `args` users are using which
get broken by this ;-)
(But any such lines should be easily fixed...)

On Thu, Dec 06, 2018 at 10:17:25AM +0100, Dominik Csapak wrote:
> there is nothing that should be really affected by this, but
> even then, this option is only for experts and people using this
> should know what they are doing
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  PVE/QemuServer.pm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index a162db9..861ded8 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -3883,12 +3883,6 @@ sub config_to_command {
>  	}
>      }
>  
> -    # add custom args
> -    if ($conf->{args}) {
> -	my $aa = PVE::Tools::split_args($conf->{args});
> -	push @$cmd, @$aa;
> -    }
> -
>      push @$cmd, @$devices;
>      push @$cmd, '-rtc', join(',', @$rtcFlags)
>  	if scalar(@$rtcFlags);
> @@ -3897,6 +3891,12 @@ sub config_to_command {
>      push @$cmd, '-global', join(',', @$globalFlags)
>  	if scalar(@$globalFlags);
>  
> +    # add custom args
> +    if ($conf->{args}) {
> +	my $aa = PVE::Tools::split_args($conf->{args});
> +	push @$cmd, @$aa;
> +    }
> +
>      return wantarray ? ($cmd, $vollist, $spice_port) : $cmd;
>  }
>  
> -- 
> 2.11.0