From patchwork Mon Oct 24 03:25:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 121266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 76F911007D1 for ; Mon, 24 Oct 2011 14:25:21 +1100 (EST) Received: from localhost ([::1]:50794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIBA6-0003mw-0P for incoming@patchwork.ozlabs.org; Sun, 23 Oct 2011 23:25:18 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIB9z-0003mg-U6 for qemu-devel@nongnu.org; Sun, 23 Oct 2011 23:25:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIB9y-0002T4-Mm for qemu-devel@nongnu.org; Sun, 23 Oct 2011 23:25:11 -0400 Received: from ozlabs.org ([203.10.76.45]:53154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIB9y-0002Se-AJ; Sun, 23 Oct 2011 23:25:10 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 91C301007D1; Mon, 24 Oct 2011 14:25:07 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Mon, 24 Oct 2011 14:25:04 +1100 Message-Id: <1319426704-26850-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.6.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] ppc: Fix up usermode only builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The recent usage of MemoryRegion in kvm_ppc.h breaks builds with CONFIG_USER_ONLY=y. This patch fixes it. Signed-off-by: David Gibson --- target-ppc/kvm_ppc.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index b0d6fb6..f9c0198 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -23,9 +23,11 @@ int kvmppc_get_hypercall(CPUState *env, uint8_t *buf, int buf_len); int kvmppc_set_interrupt(CPUState *env, int irq, int level); void kvmppc_set_papr(CPUState *env); int kvmppc_smt_threads(void); +#ifndef CONFIG_USER_ONLY off_t kvmppc_alloc_rma(const char *name, MemoryRegion *sysmem); void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int *pfd); int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t window_size); +#endif /* !CONFIG_USER_ONLY */ const ppc_def_t *kvmppc_host_cpu_def(void); #else @@ -69,6 +71,7 @@ static inline int kvmppc_smt_threads(void) return 1; } +#ifndef CONFIG_USER_ONLY static inline off_t kvmppc_alloc_rma(const char *name, MemoryRegion *sysmem) { return 0; @@ -85,6 +88,7 @@ static inline int kvmppc_remove_spapr_tce(void *table, int pfd, { return -1; } +#endif /* !CONFIG_USER_ONLY */ static inline const ppc_def_t *kvmppc_host_cpu_def(void) {