From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwzoE-0007BN-ET for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:22 -0400 Received: from [140.186.70.92] (port=45962 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwzo7-00074M-OC for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nwzo1-0003hs-8t for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:14 -0400 Received: from mail-bw0-f218.google.com ([209.85.218.218]:60099) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nwzo0-0003hE-Hr for qemu-devel@nongnu.org; Wed, 31 Mar 2010 11:26:08 -0400 Received: by mail-bw0-f218.google.com with SMTP id 10so273516bwz.2 for ; Wed, 31 Mar 2010 08:26:08 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 31 Mar 2010 17:25:57 +0200 Message-Id: <1270049157-29784-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> References: <1270047363-12627-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/3] compile balloon.c once List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org balloon.c contained some code from monitor.c, so it was compiled once per target. Fix this. Signed-off-by: Paolo Bonzini --- Makefile.objs | 2 +- Makefile.target | 2 +- kvm.h | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 233fbba..f89823c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -128,7 +128,7 @@ user-obj-y += cutils.o cache-utils.o # libhw hw-obj-y = -hw-obj-y += vl.o loader.o +hw-obj-y += vl.o balloon.o loader.o hw-obj-y += virtio.o virtio-console.o hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o diff --git a/Makefile.target b/Makefile.target index 9ca6636..dbffe63 100644 --- a/Makefile.target +++ b/Makefile.target @@ -161,7 +161,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o diff --git a/kvm.h b/kvm.h index 4f77188..cb9d79b 100644 --- a/kvm.h +++ b/kvm.h @@ -16,6 +16,7 @@ #include "config-host.h" #include "qemu-queue.h" +#include "cpu-common.h" extern int kvm_allowed; @@ -31,6 +32,10 @@ struct kvm_run; int kvm_init(int smp_cpus); +int kvm_has_sync_mmu(void); +int kvm_has_vcpu_events(void); +int kvm_has_robust_singlestep(void); + #ifdef NEED_CPU_H int kvm_init_vcpu(CPUState *env); @@ -40,10 +45,6 @@ int kvm_cpu_exec(CPUState *env); int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size); int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size); -int kvm_has_sync_mmu(void); -int kvm_has_vcpu_events(void); -int kvm_has_robust_singlestep(void); - void kvm_setup_guest_memory(void *start, size_t size); int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size); -- 1.6.6.1