From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLVWn-0008VQ-Gi for qemu-devel@nongnu.org; Thu, 06 Mar 2014 05:27:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLVWh-0001xM-Tu for qemu-devel@nongnu.org; Thu, 06 Mar 2014 05:27:49 -0500 Received: from mail-pb0-x232.google.com ([2607:f8b0:400e:c01::232]:64115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLVWh-0001x1-No for qemu-devel@nongnu.org; Thu, 06 Mar 2014 05:27:43 -0500 Received: by mail-pb0-f50.google.com with SMTP id md12so2421967pbc.37 for ; Thu, 06 Mar 2014 02:27:42 -0800 (PST) From: Xuebing Wang Date: Thu, 6 Mar 2014 18:27:13 +0800 Message-Id: <1394101634-21509-7-git-send-email-xbing6@gmail.com> In-Reply-To: <1394101634-21509-1-git-send-email-xbing6@gmail.com> References: <1394101634-21509-1-git-send-email-xbing6@gmail.com> Subject: [Qemu-devel] [PATCH 6/7] kvm-ppc: remove target-ppc/kvm-stub.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , xbing6@gmail.com, Gleb Natapov Size of text section of ppc64-softmmu/qemu-system-ppc64 is reduced by 152 bytes. Signed-off-by: Xuebing Wang --- include/hw/ppc/openpic.h | 1 - target-ppc/Makefile.objs | 1 - target-ppc/kvm-stub.c | 18 ------------------ target-ppc/kvm_ppc.h | 5 +++++ 4 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 target-ppc/kvm-stub.c diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index ee67098..8c8719c 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -27,6 +27,5 @@ enum { OPENPIC_MAX_TMR) #define TYPE_KVM_OPENPIC "kvm-openpic" -int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs); #endif /* __OPENPIC_H__ */ diff --git a/target-ppc/Makefile.objs b/target-ppc/Makefile.objs index 3cb23e0..9428df3 100644 --- a/target-ppc/Makefile.objs +++ b/target-ppc/Makefile.objs @@ -5,7 +5,6 @@ obj-y += machine.o mmu_helper.o mmu-hash32.o obj-$(TARGET_PPC64) += mmu-hash64.o arch_dump.o endif obj-$(CONFIG_KVM) += kvm.o kvm_ppc.o -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-y += excp_helper.o obj-y += fpu_helper.o obj-y += int_helper.o diff --git a/target-ppc/kvm-stub.c b/target-ppc/kvm-stub.c deleted file mode 100644 index ee3f5d2..0000000 --- a/target-ppc/kvm-stub.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * QEMU KVM PPC specific function stubs - * - * Copyright Freescale Inc. 2013 - * - * Author: Alexander Graf - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ -#include "qemu-common.h" -#include "hw/ppc/openpic.h" - -int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) -{ - return -EINVAL; -} diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index c532d2a..27d855d 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -21,8 +21,13 @@ #ifdef CONFIG_KVM void kvmppc_init(void); +int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs); #else static inline void kvmppc_init(void) {} +static inline int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) +{ + return -EINVAL; +} #endif #ifdef CONFIG_KVM -- 1.7.9.5