From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUZIL-0003wA-0U for qemu-devel@nongnu.org; Fri, 20 Jan 2017 08:31:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUZIK-0006Bq-6d for qemu-devel@nongnu.org; Fri, 20 Jan 2017 08:31:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cUZIK-0006B2-1n for qemu-devel@nongnu.org; Fri, 20 Jan 2017 08:31:56 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35B5BC04BD22 for ; Fri, 20 Jan 2017 13:31:56 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-138.ams2.redhat.com [10.36.117.138]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0KDVeVN014401 for ; Fri, 20 Jan 2017 08:31:55 -0500 From: Paolo Bonzini Date: Fri, 20 Jan 2017 14:31:19 +0100 Message-Id: <20170120133139.31080-16-pbonzini@redhat.com> In-Reply-To: <20170120133139.31080-1-pbonzini@redhat.com> References: <20170120133139.31080-1-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 15/35] stubs: remove stubs/kvm.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This has a single function, just move it to the other target/*/kvm.c files. Signed-off-by: Paolo Bonzini --- stubs/Makefile.objs | 1 - stubs/kvm.c | 8 -------- target/mips/kvm.c | 5 +++++ target/ppc/kvm.c | 5 +++++ target/s390x/kvm.c | 5 +++++ 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 stubs/kvm.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index a7d3b72..a187295 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -31,7 +31,6 @@ stub-obj-y += uuid.o stub-obj-y += vm-stop.o stub-obj-y += vmstate.o stub-obj-$(CONFIG_WIN32) += fd-register.o -stub-obj-y += kvm.o stub-obj-y += qmp_pc_dimm_device_list.o stub-obj-y += target-monitor-defs.o stub-obj-y += target-get-monitor-def.o diff --git a/stubs/kvm.c b/stubs/kvm.c deleted file mode 100644 index ddd6204..0000000 --- a/stubs/kvm.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "sysemu/kvm.h" - -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) -{ - return 0; -} diff --git a/target/mips/kvm.c b/target/mips/kvm.c index dcf5fbb..998c341 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -55,6 +55,11 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return 0; } +int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) +{ + return 0; +} + int kvm_arch_init_vcpu(CPUState *cs) { MIPSCPU *cpu = MIPS_CPU(cs); diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9c4834c..6c53a6d 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -145,6 +145,11 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return 0; } +int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) +{ + return 0; +} + static int kvm_arch_sync_sregs(PowerPCCPU *cpu) { CPUPPCState *cenv = &cpu->env; diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 97afe02..e938954 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -294,6 +294,11 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return 0; } +int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) +{ + return 0; +} + unsigned long kvm_arch_vcpu_id(CPUState *cpu) { return cpu->cpu_index; -- 2.9.3