[Qemu-devel] [PATCH 3/7] kvm-i386: remove target-i386/kvm-stub.c

[Xuebing Wang <xbing6@gmail.com>]

To eliminate kvm-stub for target-i386.

Size of text section of x86_64-linux-user/qemu-x86_64 is reduced by 104 bytes
by inline these 2 functions.

Signed-off-by: Xuebing Wang <xbing6@gmail.com>
---
 include/sysemu/kvm.h      |    3 ---
 target-i386/Makefile.objs |    1 -
 target-i386/cpu.c         |    2 +-
 target-i386/kvm-stub.c    |   24 ------------------------
 target-i386/kvm_i386.h    |   26 ++++++++++++++++++++++++++
 5 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 target-i386/kvm-stub.c

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 1829206..60e95d8 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -281,9 +281,6 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cpu);
 
 int kvm_check_extension(KVMState *s, unsigned int extension);
 
-uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
-                                      uint32_t index, int reg);
-
 #if !defined(CONFIG_USER_ONLY)
 int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
                                        hwaddr *phys_addr);
diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs
index 027b94e..abebea8 100644
--- a/target-i386/Makefile.objs
+++ b/target-i386/Makefile.objs
@@ -4,6 +4,5 @@ obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o
 obj-y += gdbstub.o
 obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o
 obj-$(CONFIG_KVM) += kvm.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 obj-$(CONFIG_LINUX_USER) += ioport-user.o
 obj-$(CONFIG_BSD_USER) += ioport-user.o
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0e8812a..31ebef0 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "cpu.h"
-#include "sysemu/kvm.h"
+#include "kvm_i386.h"
 #include "sysemu/cpus.h"
 #include "topology.h"
 
diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c
deleted file mode 100644
index 0ef642d..0000000
--- a/target-i386/kvm-stub.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * QEMU KVM x86 specific function stubs
- *
- * Copyright Linaro Limited 2012
- *
- * Author: Peter Maydell <peter.maydell@linaro.org>
- *
- * 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 "kvm_i386.h"
-
-bool kvm_allows_irq0_override(void)
-{
-    return 1;
-}
-
-uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
-                                      uint32_t index, int reg)
-{
-    abort();
-}
diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h
index 4392ab4..202b811 100644
--- a/target-i386/kvm_i386.h
+++ b/target-i386/kvm_i386.h
@@ -11,9 +11,24 @@
 #ifndef QEMU_KVM_I386_H
 #define QEMU_KVM_I386_H
 
+/* Adding "config-target.h" is to ensure this header file is correct by itself.
+ *
+ * Only source files in *-softmmu/ or *-linux-user/ folder can
+ * include "config-target.h". If this header is incorrectly included,
+ * compiler errors out.
+ */
+#include "config-target.h" /* for CONFIG_KVM */
+
 #include "sysemu/kvm.h"
 
+#if defined(CONFIG_KVM)
 bool kvm_allows_irq0_override(void);
+#else
+static inline bool kvm_allows_irq0_override(void)
+{
+    return 1;
+}
+#endif
 
 int kvm_device_pci_assign(KVMState *s, PCIHostDeviceAddress *dev_addr,
                           uint32_t flags, uint32_t *dev_id);
@@ -35,4 +50,15 @@ int kvm_device_msix_set_vector(KVMState *s, uint32_t dev_id, uint32_t vector,
 int kvm_device_msix_assign(KVMState *s, uint32_t dev_id);
 int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id);
 
+#if defined(CONFIG_KVM)
+uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
+                                      uint32_t index, int reg);
+#else
+static inline uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
+                                      uint32_t index, int reg)
+{
+    abort();
+}
 #endif
+
+#endif /* QEMU_KVM_I386_H */
-- 
1.7.9.5