Patchwork [5/7] Only export phys_mem create functions for !CONFIG_USER_ONLY builds

login
register
mail settings
Submitter Jes Sorensen
Date June 15, 2010, 11:04 a.m.
Message ID <1276599879-22749-6-git-send-email-Jes.Sorensen@redhat.com>
Download mbox | patch
Permalink /patch/55640/
State New
Headers show

Comments

Jes Sorensen - June 15, 2010, 11:04 a.m.
From: Jes Sorensen <Jes.Sorensen@redhat.com>

Only export phys_mem create functions for !CONFIG_USER_ONLY builds

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 qemu-kvm.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Paolo Bonzini - June 15, 2010, 1:35 p.m.
On 06/15/2010 01:04 PM, Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen<Jes.Sorensen@redhat.com>
>
> Only export phys_mem create functions for !CONFIG_USER_ONLY builds
>
> Signed-off-by: Jes Sorensen<Jes.Sorensen@redhat.com>
> ---
>   qemu-kvm.h |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/qemu-kvm.h b/qemu-kvm.h
> index 6f6c6d8..9adbc58 100644
> --- a/qemu-kvm.h
> +++ b/qemu-kvm.h
> @@ -812,6 +812,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);
>
> @@ -819,6 +820,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);

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

Patch

diff --git a/qemu-kvm.h b/qemu-kvm.h
index 6f6c6d8..9adbc58 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -812,6 +812,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);
 
@@ -819,6 +820,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);