From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC9Io-0002FE-Af for qemu-devel@nongnu.org; Mon, 06 Jul 2015 12:31:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZC9Ih-0005oP-1O for qemu-devel@nongnu.org; Mon, 06 Jul 2015 12:31:30 -0400 Received: from mail-vn0-f52.google.com ([209.85.216.52]:43770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC9Ig-0005nn-Qh for qemu-devel@nongnu.org; Mon, 06 Jul 2015 12:31:22 -0400 Received: by vnbf1 with SMTP id f1so12763994vnb.10 for ; Mon, 06 Jul 2015 09:31:22 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1436199533-41111-1-git-send-email-pbonzini@redhat.com> References: <1436199533-41111-1-git-send-email-pbonzini@redhat.com> From: Peter Maydell Date: Mon, 6 Jul 2015 17:31:02 +0100 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PULL v2 00/13] KVM patches (SMM implementation) for 2015-07-06 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: QEMU Developers On 6 July 2015 at 17:18, Paolo Bonzini 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