diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c6483ad3..964d8f06 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3965,6 +3965,8 @@ sub config_to_command { if (!$kvm) { push @$machineFlags, 'accel=tcg'; } + my $power_state_flags = PVE::QemuServer::Machine::get_power_state_flags($machine_conf); + push $cmd->@*, $power_state_flags->@* if defined($power_state_flags); push @$machineFlags, 'smm=off' if should_disable_smm($conf, $vga, $machine_type); diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index a5962443..39e7b5b4 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -31,6 +31,16 @@ my $machine_fmt = { enum => ['intel', 'virtio'], optional => 1, }, + 'enable-s3' => { + type => 'boolean', + description => "Enables S3 power state. Defaults to true.", + optional => 1, + }, + 'enable-s4' => { + type => 'boolean', + description => "Enables S4 power state. Defaults to true.", + optional => 1, + }, }; PVE::JSONSchema::register_format('pve-qemu-machine-fmt', $machine_fmt); @@ -284,4 +294,30 @@ sub check_and_pin_machine_string { return print_machine($machine_conf); } +# returns an arrayref of cmdline options for qemu or undef +sub get_power_state_flags { + my ($machine_conf) = @_; + + my $object = $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? "ICH9-LPC" : "PIIX4_PM"; + + my $s3 = $machine_conf->{'enable-s3'} // 1; + my $s4 = $machine_conf->{'enable-s4'} // 1; + + my $options = []; + + # they're enabled by default in QEMU, so only add the flags to disable them + if (!$s3) { + push $options->@*, '-global', "${object}.disable_s3=1"; + } + if (!$s4) { + push $options->@*, '-global', "${object}.disable_s4=1"; + } + + if (scalar($options->@*)) { + return $options; + } + + return; +} + 1;