diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2019-12-30 09:00:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-07 12:08:38 +0100 |
| commit | 8f54bbd0b4d9218e7c56a3a9c572b70943579e22 (patch) | |
| tree | e8516d0173db5732626a9bc126e2c0929d6fa2cf /target | |
| parent | c4d1069c2563f70a5271af6e9e000add64e593be (diff) | |
| download | qemu-8f54bbd0b4d9218e7c56a3a9c572b70943579e22.zip qemu-8f54bbd0b4d9218e7c56a3a9c572b70943579e22.tar.gz qemu-8f54bbd0b4d9218e7c56a3a9c572b70943579e22.tar.bz2 | |
x86: Check for machine state object class before typecasting it
In ed9e923c3c ("x86: move SMM property to X86MachineState", 2019-12-17)
In v4.2.0-246-ged9e923c3c the SMM property was moved from PC
machine class to x86 machine class. Makes sense, but the change
was too aggressive: in target/i386/kvm.c:kvm_arch_init() it
altered check which sets SMRAM if given machine has SMM enabled.
The line that detects whether given machine object is class of
PC_MACHINE was removed from the check. This makes qemu try to
enable SMRAM for all machine types, which is not what we want.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Fixes: ed9e923c3c ("x86: move SMM property to X86MachineState", 2019-12-17)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <7cc91bab3191bfd7e071bdd3fdf7fe2a2991deb0.1577692822.git.mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/kvm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 0b51190..7ee3202 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2173,6 +2173,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } if (kvm_check_extension(s, KVM_CAP_X86_SMM) && + object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE) && x86_machine_is_smm_enabled(X86_MACHINE(ms))) { smram_machine_done.notify = register_smram_listener; qemu_add_machine_init_done_notifier(&smram_machine_done); |