On 6 July 2015 at 17:18, Paolo Bonzini <[email protected]> wrote:
> The following changes since commit 7edd8e4660beb301d527257f8e04ebec0f841cb0:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into
> staging (2015-07-06 14:03:44 +0100)
>
> are available in the git repository at:
>
>
> git://github.com/bonzini/qemu.git tags/for-upstream-smm
>
> for you to fetch changes up to b90c5c82b7e723d7509b5dae8be9b74a4195a64a:
>
> pc: add SMM property (2015-07-06 17:59:44 +0200)
>
> ----------------------------------------------------------------
> This series implements KVM support for SMM, and lets you enable/disable
> it through the "smm" property of x86 machine types.
>
> Achievement unlocked: send two pull requests the same day with a conflict
> between them.
:-)
> ----------------------------------------------------------------
I'm afraid this doesn't build on OSX or on ARM Linux
(or likely any build host where x86 isn't a CONFIG_KVM build):
CC i386-softmmu/hw/i386/pc_piix.o
/Users/pm215/src/qemu/hw/i386/pc.c:1782:56: error: use of undeclared identifier
'KVM_CAP_X86_SMM'
smm_available = kvm_check_extension(kvm_state, KVM_CAP_X86_SMM);
^
1 error generated.
Putting #ifdef CONFIG_KVM around the offending line fixes this;
there may be a cleaner approach.
-- PMM
