From patchwork Tue Jun 22 12:56:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 107385 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MCuPwD018656 for ; Tue, 22 Jun 2010 12:56:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757240Ab0FVM4X (ORCPT ); Tue, 22 Jun 2010 08:56:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35138 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757112Ab0FVM4V (ORCPT ); Tue, 22 Jun 2010 08:56:21 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCuKuX006646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 08:56:20 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCu6td002896; Tue, 22 Jun 2010 08:56:19 -0400 From: Jes.Sorensen@redhat.com To: avi@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jes Sorensen Subject: [PATCH 5/7] Only export phys_mem create functions for !CONFIG_USER_ONLY builds Date: Tue, 22 Jun 2010 14:56:02 +0200 Message-Id: <1277211364-12451-6-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> References: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 12:56:25 +0000 (UTC) diff --git a/qemu-kvm.h b/qemu-kvm.h index c9b93dc..6dd3a01 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -835,6 +835,7 @@ void qemu_kvm_cpuid_on_env(CPUState *env); void kvm_inject_interrupt(CPUState *env, int mask); void kvm_update_after_sipi(CPUState *env); void kvm_update_interrupt_request(CPUState *env); +#ifndef CONFIG_USER_ONLY void *kvm_cpu_create_phys_mem(target_phys_addr_t start_addr, unsigned long size, int log, int writable); @@ -842,6 +843,7 @@ void kvm_cpu_destroy_phys_mem(target_phys_addr_t start_addr, unsigned long size); void kvm_qemu_log_memory(target_phys_addr_t start, target_phys_addr_t size, int log); +#endif int kvm_qemu_create_memory_alias(uint64_t phys_start, uint64_t len, uint64_t target_phys); int kvm_qemu_destroy_memory_alias(uint64_t phys_start);