From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 15/32] stubs: remove stubs/kvm.c
Date: Mon, 16 Jan 2017 17:58:59 +0100 [thread overview]
Message-ID: <20170116165916.8575-16-pbonzini@redhat.com> (raw)
In-Reply-To: <20170116165916.8575-1-pbonzini@redhat.com>
This has a single function, just move it to the other target/*/kvm.c files.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2017-01-16 16:59 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 16:58 [Qemu-devel] [PULL v2 00/32] Misc patches for 2017-01-11 Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 01/32] bugfix: vm halt when in reset looping Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 02/32] megasas: fix guest-triggered memory leak Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 03/32] qom: Make all interface types abstract Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 04/32] smbios: filter based on CONFIG_SMBIOS rather than TARGET Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 05/32] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 06/32] stubs: move smbios stubs to hw/smbios Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 07/32] stubs: move acpi stubs to hw/acpi Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 08/32] stubs: remove unused stub for serial_hd Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 09/32] hw: move reset handlers from vl.c to hw/core Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 10/32] stubs: group stubs for user-mode emulation Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 11/32] stubs: group all monitor_fdset_* functions in a single file Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 12/32] stubs: move vhost stubs to stubs/vhost.o Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 13/32] event_notifier: cleanups around event_notifier_set_handler Paolo Bonzini
2017-01-16 16:58 ` [Qemu-devel] [PULL 14/32] build: remove --enable-colo/--disable-colo Paolo Bonzini
2017-01-16 16:58 ` Paolo Bonzini [this message]
2017-01-16 16:59 ` [Qemu-devel] [PULL 16/32] acpi: filter based on CONFIG_ACPI_X86 rather than TARGET Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 17/32] pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 18/32] scsi-block: fix direction of BYTCHK test for VERIFY commands Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 19/32] serial: fix memory leak in serial exit Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 20/32] qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create() Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 21/32] hxtool: emit Texinfo headings as @subsection Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 22/32] x86: ioapic: add traces for ioapic Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 23/32] x86: ioapic: dump version for "info ioapic" Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 24/32] x86: ioapic: fix fail migration when irqchip=split Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 25/32] exec: Add missing rcu_read_unlock Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 26/32] char: fix ctrl-a b not working Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 27/32] ramblock-notifier: new Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 28/32] kvm: move cpu synchronization code Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 29/32] target/i386: Add Intel HAX files Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 30/32] Plumb the HAXM-based hardware acceleration support Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 31/32] hax: add Darwin support Paolo Bonzini
2017-01-16 16:59 ` [Qemu-devel] [PULL 32/32] Revert "win32: don't run subprocess tests on Mingw32 platform" Paolo Bonzini
2017-01-16 17:49 ` [Qemu-devel] [PULL v2 00/32] Misc patches for 2017-01-11 no-reply
2017-01-19 13:35 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170116165916.8575-16-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).