* [pve-devel] [PATCH qemu-server] disable SMM check: always return false for virt machine type
@ 2023-05-11 11:43 Fiona Ebner
2023-05-15 9:11 ` [pve-devel] applied: " Wolfgang Bumiller
0 siblings, 1 reply; 2+ messages in thread
From: Fiona Ebner @ 2023-05-11 11:43 UTC (permalink / raw)
To: pve-devel
There is no 'smm' flag for the 'virt' machine type.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
PVE/QemuServer.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index c1d0fd2d..ab33aa37 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3543,7 +3543,9 @@ sub query_understood_cpu_flags {
# Since commit 277d33454f77ec1d1e0bc04e37621e4dd2424b67 in pve-qemu, smm is not off by default
# anymore. But smm=off seems to be required when using SeaBIOS and serial display.
my sub should_disable_smm {
- my ($conf, $vga) = @_;
+ my ($conf, $vga, $machine) = @_;
+
+ return if $machine =~ m/^virt/; # there is no smm flag that could be disabled
return (!defined($conf->{bios}) || $conf->{bios} eq 'seabios') &&
$vga->{type} && $vga->{type} =~ m/^(serial\d+|none)$/;
@@ -4155,7 +4157,7 @@ sub config_to_command {
push @$machineFlags, 'accel=tcg';
}
- push @$machineFlags, 'smm=off' if should_disable_smm($conf, $vga);
+ push @$machineFlags, 'smm=off' if should_disable_smm($conf, $vga, $machine_type);
my $machine_type_min = $machine_type;
if ($add_pve_version) {
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH qemu-server] disable SMM check: always return false for virt machine type
2023-05-11 11:43 [pve-devel] [PATCH qemu-server] disable SMM check: always return false for virt machine type Fiona Ebner
@ 2023-05-15 9:11 ` Wolfgang Bumiller
0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Bumiller @ 2023-05-15 9:11 UTC (permalink / raw)
To: Fiona Ebner; +Cc: pve-devel
applied, thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-15 9:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-11 11:43 [pve-devel] [PATCH qemu-server] disable SMM check: always return false for virt machine type Fiona Ebner
2023-05-15 9:11 ` [pve-devel] applied: " Wolfgang Bumiller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox