From patchwork Mon Nov 11 21:22:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 3169991 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0BD4C9F39E for ; Mon, 11 Nov 2013 22:07:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C6112041E for ; Mon, 11 Nov 2013 22:07:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68C6C2041D for ; Mon, 11 Nov 2013 22:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862Ab3KKWHv (ORCPT ); Mon, 11 Nov 2013 17:07:51 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:59243 "EHLO mnementh.archaic.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369Ab3KKWHu (ORCPT ); Mon, 11 Nov 2013 17:07:50 -0500 X-Greylist: delayed 2736 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 Nov 2013 17:07:50 EST Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Vfyvq-00029X-Mh; Mon, 11 Nov 2013 21:22:02 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Andreas Tobler , Paolo Bonzini , Gleb Natapov , kvm@vger.kernel.org, Anthony Liguori Subject: [PATCH for-1.7] target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid() Date: Mon, 11 Nov 2013 21:22:02 +0000 Message-Id: <1384204922-8250-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix build failures with clang when KVM is not enabled by providing a stub version of kvm_arch_get_supported_cpuid(). Signed-off-by: Peter Maydell --- I wouldn't be surprised if this also affected debug gcc builds with KVM disabled, but I haven't checked. Incidentally, since this is an x86 specific function its prototype should be moved into target-i386/kvm_i386.h, but that's a separate patch. target-i386/kvm-stub.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c index 11429c4..18fe938 100644 --- a/target-i386/kvm-stub.c +++ b/target-i386/kvm-stub.c @@ -16,3 +16,9 @@ bool kvm_allows_irq0_override(void) { return 1; } + +uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, + uint32_t index, int reg) +{ + return 0; +}