The unit test includes target-i386/cpu.c instead of simply linking
against cpu.o because the test code will use static variables/functions
from cpu.c.
Reasoning for each object file included in the test binary:
* qom/cpu.o - for TYPE_CPU. Dependencies:
* qom/qom-qobject.o
* qom/qdev.o - for TYPE_DEVICE. Dependencies:
* qom/container.o
* migration/vmstate.o. Dependencies:
* migration/qemu-file.o
* qjson.o
* hw/core/hotplug.o
* hw/core/irq.o
* hw/core/fw-path-provider.o
* hw/core/qdev-properties.o
* qom/object.o - for TYPE_OBJECT
* x86_64-softmmu/target-i386/machine.o - for vmstate_x86_cpu
* qemu-log.o - for the logging API, used by target-i386/cpu.c
* libqemuutil.a - for QAPI visitors, error API, and other symbols
* libqemustub.a - existing stubs, including: savevm, monitor symbols
The remaining symbols used by target-i386/cpu.c were added as stubs to
either tests/vl-stub.c and tests/x86-stub.c.
Note: I couldn't add dependencies that ensure the target-specific object
files are compiled on demand when building the test binary, but "make
check" already requires "make" to be run first because of the qtest test
cases, so I assume this is OK.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
Changes v4 -> v5:
* Rewrote kvm_arch_get_supported_cpuid() to simplify test code
Changes v3 -> v4:
* Keep target_words_bigendian() prototype inside x86-stub.c
Changes v1 -> v2:
* Don't include cpus.o on test binary, making lots of stubs now
unnecessary
---
tests/.gitignore | 1 +
tests/Makefile | 16 ++++-
tests/test-x86-cpu.c | 68 +++++++++++++++++++++
tests/vl-stub.c | 15 +++++
tests/x86-stub.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 264 insertions(+), 1 deletion(-)
create mode 100644 tests/test-x86-cpu.c
create mode 100644 tests/vl-stub.c
create mode 100644 tests/x86-stub.c
diff --git a/tests/.gitignore b/tests/.gitignore
index 0dcb618..24b5eb4 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -38,5 +38,6 @@ test-vmstate
test-write-threshold
test-x86-cpuid
test-xbzrle
+test-x86-cpu
*-test
qapi-schema/*.test.*
diff --git a/tests/Makefile b/tests/Makefile
index 1a78b86..e2b1fcd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,7 @@ check-unit-y += tests/test-qemu-opts$(EXESUF)
gcov-files-test-qemu-opts-y = qom/test-qemu-opts.c
check-unit-y += tests/test-write-threshold$(EXESUF)
gcov-files-test-write-threshold-y = block/write-threshold.c
+check-unit-x86_64-softmmu-y += tests/test-x86-cpu$(EXESUF)
check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
@@ -235,7 +236,8 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o
tests/check-qdict.o \
tests/test-opts-visitor.o tests/test-qmp-event.o \
tests/rcutorture.o tests/test-rcu-list.o
-test-obj-x86_64-softmmu-y = tests/test-x86-cpuid.o
+test-obj-x86_64-softmmu-y = tests/test-x86-cpuid.o \
+ tests/test-x86-cpu.o tests/x86-stub.o
test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \
tests/test-qapi-event.o
@@ -371,6 +373,18 @@ tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o
qemu-char.o qemu-timer.o
tests/qemu-iotests/socket_scm_helper$(EXESUF):
tests/qemu-iotests/socket_scm_helper.o
tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a
libqemustub.a
tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o
$(block-obj-y) libqemuutil.a libqemustub.a
+tests/test-x86-cpu$(EXESUF): tests/test-x86-cpu.o \
+ x86_64-softmmu/target-i386/machine.o \
+ qom/cpu.o \
+ qom/object.o qom/qom-qobject.o qom/container.o \
+ hw/core/qdev.o hw/core/qdev-properties.o \
+ hw/core/hotplug.o hw/core/irq.o hw/core/fw-path-provider.o \
+ migration/vmstate.o migration/qemu-file.o \
+ qemu-log.o \
+ qjson.o \
+ libqemuutil.a \
+ libqemustub.a \
+ tests/vl-stub.o tests/x86-stub.o
ifeq ($(CONFIG_POSIX),y)
LIBS += -lutil
diff --git a/tests/test-x86-cpu.c b/tests/test-x86-cpu.c
new file mode 100644
index 0000000..1ce7e1d
--- /dev/null
+++ b/tests/test-x86-cpu.c
@@ -0,0 +1,68 @@
+#include <glib.h>
+
+#include "cpu.c"
+
+
+/* stub to avoid requiring hw/intc/apic.o */
+void apic_poll_irq(DeviceState *dev)
+{
+}
+
+/* Special test modes for faking kvm_arch_get_supported_cpuid() results: */
+static bool use_fake_cpuid; /* Enable fake_cpuid() usage */
+static bool all_unsupported; /* Return all features as unsupported */
+
+/* Fake get_supported_cpuid() which will just return as hash of
+ * function/index/reg. Use a (somewhat poor) hash function to do that.
+ */
+static uint32_t fake_cpuid(uint32_t function, uint32_t index, int reg)
+{
+ uint64_t i = (uint64_t)function * 16ULL * 4ULL + (uint64_t)index * 4 + reg;
+ return i * 2654435761ULL;
+}
+
+uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
+ uint32_t index, int reg)
+{
+ if (all_unsupported) {
+ return 0;
+ }
+ if (use_fake_cpuid) {
+ return fake_cpuid(function, index, reg);
+ }
+ /* Default is to simply report all features as supported */
+ return ~0;
+}
+
+static void test_cpu_creation(void)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) {
+ ObjectClass *oc;
+ X86CPUClass *xcc;
+ X86CPU *cpu;
+ X86CPUDefinition *def = &builtin_x86_defs[i];
+ char features[] = "";
+
+ oc = x86_cpu_class_by_name(def->name);
+ g_assert_true(oc);
+ xcc = X86_CPU_CLASS(oc);
+ g_assert_true(xcc);
+ cpu = X86_CPU(object_new(object_class_get_name(oc)));
+ x86_cpu_parse_featurestr(CPU(cpu), features, &error_abort);
+ object_unref(OBJECT(cpu));
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ module_call_init(MODULE_INIT_QOM);
+
+ g_test_init(&argc, &argv, NULL);
+
+ g_test_add_func("/cpu/x86/creation", test_cpu_creation);
+
+ g_test_run();
+
+ return 0;
+}
diff --git a/tests/vl-stub.c b/tests/vl-stub.c
new file mode 100644
index 0000000..32085aa
--- /dev/null
+++ b/tests/vl-stub.c
@@ -0,0 +1,15 @@
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
+#include "hw/hw.h"
+#include "hw/hw.h"
+
+int smp_cpus = 1;
+int smp_cores = 1;
+int smp_threads = 1;
+bool xen_allowed;
+
+bool tcg_enabled(void)
+{
+ return !kvm_allowed && !xen_allowed;
+}
+
diff --git a/tests/x86-stub.c b/tests/x86-stub.c
new file mode 100644
index 0000000..02b3017
--- /dev/null
+++ b/tests/x86-stub.c
@@ -0,0 +1,165 @@
+/* Stub functions for target-specific code (target-i386 files, cpu-exec.c,
+ * exec.c, etc.) */
+#include "target-i386/cpu.h"
+#include "target-i386/cpu-qom.h"
+#include "target-i386/kvm_i386.h"
+#include "exec/exec-all.h"
+#include "sysemu/kvm.h"
+#include "exec/gdbstub.h"
+
+struct CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);
+
+void cpu_exec_init(CPUArchState *env)
+{
+}
+
+void kvm_arch_reset_vcpu(X86CPU *cpu)
+{
+}
+
+void optimize_flags_init(void)
+{
+}
+
+void x86_cpu_do_interrupt(CPUState *cs)
+{
+ abort();
+}
+
+bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
+{
+ abort();
+}
+
+void x86_cpu_exec_enter(CPUState *cs)
+{
+ abort();
+}
+
+void x86_cpu_exec_exit(CPUState *cs)
+{
+ abort();
+}
+
+void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
+ int flags)
+{
+ abort();
+}
+
+int x86_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
+{
+ abort();
+}
+
+int x86_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
+{
+ abort();
+}
+
+int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
+ int cpuid, void *opaque)
+{
+ abort();
+}
+
+int x86_cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cs,
+ void *opaque)
+{
+ abort();
+}
+
+
+int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
+ int cpuid, void *opaque)
+{
+ abort();
+}
+
+int x86_cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cs,
+ void *opaque)
+{
+ abort();
+}
+
+void x86_cpu_get_memory_mapping(CPUState *cs, MemoryMappingList *list,
+ Error **errp)
+{
+ abort();
+}
+
+hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
+{
+ abort();
+}
+
+void hw_breakpoint_insert(CPUX86State *env, int index)
+{
+ abort();
+}
+
+void cpu_breakpoint_remove_all(CPUState *cpu, int mask)
+{
+ abort();
+}
+
+void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
+{
+ abort();
+}
+
+void breakpoint_handler(CPUState *cs)
+{
+ abort();
+}
+
+void tlb_flush(CPUState *cpu, int flush_global)
+{
+ abort();
+}
+
+void cpu_x86_update_cr0(CPUX86State *env, uint32_t new_cr0)
+{
+ abort();
+}
+
+void cpu_set_fpuc(CPUX86State *env, uint16_t val)
+{
+ abort();
+}
+
+void update_fp_status(CPUX86State *env)
+{
+ abort();
+}
+
+void cpu_get_fp80(uint64_t *pmant, uint16_t *pexp, floatx80 f)
+{
+ abort();
+}
+
+floatx80 cpu_set_fp80(uint64_t mant, uint16_t upper)
+{
+ abort();
+}
+
+uint64_t cpu_get_apic_base(DeviceState *dev)
+{
+ abort();
+}
+
+void apic_designate_bsp(DeviceState *dev)
+{
+ abort();
+}
+
+bool target_words_bigendian(void);
+bool target_words_bigendian(void)
+{
+ return false;
+}
+
+/* Include kvm-stub.c here instead of linking against kvm-stub.o because
+ * kvm-stub.o is built only if CONFIG_KVM is disabled
+ */
+#include "kvm-stub.c"
--
2.1.0
