projectacrn · ysun · Oct 23, 2018 · Oct 23, 2018 · Oct 23, 2018 · Oct 23, 2018
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.o
 *.flat
 *.elf
+*.raw
 .pc
 patches
 .stgit-*

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,10 +1,5 @@
-Copyright (C) 2006 Qumranet.
-Copyright (C) 2007-2017 by various contributors (see source files for details)
-
-The kvm-unit-tests are free software; the whole package can be redistributed
-and/or modified under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-Many files in this directory and its subdirectories are also licensed under
-the less restrictive GNU LGPL, version 2, or other compatible licenses. See
-the individual files for details.
+There are two parts unit-test:
+ - guest based unit test. This is inherited from kvm-unit-test and inherit the kvm-unit-test
+   license.
+ - host base unit test. This is free software and can be redistributed and/or modified under
+   BSD license.
diff --git a/README b/README
diff --git a/README b/README
@@ -0,0 +1,3 @@
+This is the unit-test for ACRN project. We have two type of unit-test:
+ - guest side. The unit-test will be run as a ACRN guest
+ - host side. The uni-test will be run at ACRN host side.
diff --git a/guest/COPYRIGHT b/guest/COPYRIGHT
@@ -0,0 +1,10 @@
+Copyright (C) 2006 Qumranet.
+Copyright (C) 2007-2017 by various contributors (see source files for details)
+
+The kvm-unit-tests are free software; the whole package can be redistributed
+and/or modified under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+Many files in this directory and its subdirectories are also licensed under
+the less restrictive GNU LGPL, version 2, or other compatible licenses. See
+the individual files for details.
diff --git a/MAINTAINERS → guest/MAINTAINERS b/MAINTAINERS → guest/MAINTAINERS
diff --git a/Makefile → guest/Makefile b/Makefile → guest/Makefile
@@ -101,6 +101,8 @@ all: directories $(shell cd $(SRCDIR) && git rev-parse --verify --short=8 HEAD >
 standalone: all
 	@scripts/mkstandalone.sh
 
+stitched: $(TEST_DIR)/stitched.raw
+
 install: standalone
 	mkdir -p $(DESTDIR)
 	install tests/* $(DESTDIR)
@@ -114,7 +116,7 @@ libfdt_clean:
 	$(LIBFDT_objdir)/.*.d
 
 distclean: clean libfdt_clean
-	$(RM) lib/asm config.mak $(TEST_DIR)-run msr.out cscope.* build-head
+	$(RM) $(TEST_DIR)-run msr.out cscope.* build-head
 	$(RM) -r tests logs logs.old
 
 cscope: cscope_dirs = lib lib/libfdt lib/linux $(TEST_DIR) $(ARCH_LIBDIRS) lib/asm-generic
@@ -123,3 +125,6 @@ cscope:
 	find -L $(cscope_dirs) -maxdepth 1 \
 		-name '*.[chsS]' -exec realpath --relative-base=$(PWD) {} \; | sort -u > ./cscope.files
 	cscope -bk
+
+unit: all
+	x86/run x86/$(file).flat
diff --git a/guest/README b/guest/README
@@ -0,0 +1 @@
+README.md
diff --git a/README.md → guest/README.md b/README.md → guest/README.md
diff --git a/api/api-sample.cc → guest/api/api-sample.cc b/api/api-sample.cc → guest/api/api-sample.cc
diff --git a/api/dirty-log-perf.cc → guest/api/dirty-log-perf.cc b/api/dirty-log-perf.cc → guest/api/dirty-log-perf.cc
diff --git a/api/dirty-log.cc → guest/api/dirty-log.cc b/api/dirty-log.cc → guest/api/dirty-log.cc
diff --git a/api/exception.cc → guest/api/exception.cc b/api/exception.cc → guest/api/exception.cc
diff --git a/api/exception.hh → guest/api/exception.hh b/api/exception.hh → guest/api/exception.hh
diff --git a/api/identity.cc → guest/api/identity.cc b/api/identity.cc → guest/api/identity.cc
diff --git a/api/identity.hh → guest/api/identity.hh b/api/identity.hh → guest/api/identity.hh
diff --git a/api/kvmxx.cc → guest/api/kvmxx.cc b/api/kvmxx.cc → guest/api/kvmxx.cc
diff --git a/api/kvmxx.hh → guest/api/kvmxx.hh b/api/kvmxx.hh → guest/api/kvmxx.hh
diff --git a/api/memmap.cc → guest/api/memmap.cc b/api/memmap.cc → guest/api/memmap.cc
diff --git a/api/memmap.hh → guest/api/memmap.hh b/api/memmap.hh → guest/api/memmap.hh
diff --git a/arm/Makefile → guest/arm/Makefile b/arm/Makefile → guest/arm/Makefile
diff --git a/arm/Makefile.arm → guest/arm/Makefile.arm b/arm/Makefile.arm → guest/arm/Makefile.arm
diff --git a/arm/Makefile.arm64 → guest/arm/Makefile.arm64 b/arm/Makefile.arm64 → guest/arm/Makefile.arm64
diff --git a/arm/Makefile.common → guest/arm/Makefile.common b/arm/Makefile.common → guest/arm/Makefile.common
diff --git a/arm/cstart.S → guest/arm/cstart.S b/arm/cstart.S → guest/arm/cstart.S
diff --git a/arm/cstart64.S → guest/arm/cstart64.S b/arm/cstart64.S → guest/arm/cstart64.S
diff --git a/arm/flat.lds → guest/arm/flat.lds b/arm/flat.lds → guest/arm/flat.lds
diff --git a/arm/gic.c → guest/arm/gic.c b/arm/gic.c → guest/arm/gic.c
diff --git a/arm/pci-test.c → guest/arm/pci-test.c b/arm/pci-test.c → guest/arm/pci-test.c
diff --git a/arm/pmu.c → guest/arm/pmu.c b/arm/pmu.c → guest/arm/pmu.c
diff --git a/arm/psci.c → guest/arm/psci.c b/arm/psci.c → guest/arm/psci.c
diff --git a/arm/run → guest/arm/run b/arm/run → guest/arm/run
diff --git a/arm/selftest.c → guest/arm/selftest.c b/arm/selftest.c → guest/arm/selftest.c
diff --git a/arm/sieve.c → guest/arm/sieve.c b/arm/sieve.c → guest/arm/sieve.c
diff --git a/arm/spinlock-test.c → guest/arm/spinlock-test.c b/arm/spinlock-test.c → guest/arm/spinlock-test.c
diff --git a/arm/timer.c → guest/arm/timer.c b/arm/timer.c → guest/arm/timer.c
diff --git a/arm/unittests.cfg → guest/arm/unittests.cfg b/arm/unittests.cfg → guest/arm/unittests.cfg
diff --git a/guest/config.mak b/guest/config.mak
@@ -0,0 +1,21 @@
+SRCDIR=${shell pwd}
+PREFIX=/usr/local
+HOST=x86_64
+ARCH=x86_64
+ARCH_NAME=x86_64
+PROCESSOR=x86_64
+CC=gcc
+CXX=g++
+LD=ld
+OBJCOPY=objcopy
+OBJDUMP=objdump
+AR=ar
+ADDR2LINE=addr2line
+API=
+TEST_DIR=x86
+FIRMWARE=
+ENDIAN=
+PRETTY_PRINT_STACKS=yes
+ENVIRON_DEFAULT=yes
+ERRATATXT=errata.txt
+U32_LONG_FMT=
diff --git a/configure → guest/configure b/configure → guest/configure
diff --git a/errata.txt → guest/errata.txt b/errata.txt → guest/errata.txt
diff --git a/lib/abort.c → guest/lib/abort.c b/lib/abort.c → guest/lib/abort.c
diff --git a/lib/alloc.c → guest/lib/alloc.c b/lib/alloc.c → guest/lib/alloc.c
diff --git a/lib/alloc.h → guest/lib/alloc.h b/lib/alloc.h → guest/lib/alloc.h
diff --git a/lib/alloc_page.c → guest/lib/alloc_page.c b/lib/alloc_page.c → guest/lib/alloc_page.c
diff --git a/lib/alloc_page.h → guest/lib/alloc_page.h b/lib/alloc_page.h → guest/lib/alloc_page.h
diff --git a/lib/alloc_phys.c → guest/lib/alloc_phys.c b/lib/alloc_phys.c → guest/lib/alloc_phys.c
diff --git a/lib/alloc_phys.h → guest/lib/alloc_phys.h b/lib/alloc_phys.h → guest/lib/alloc_phys.h
diff --git a/lib/argv.c → guest/lib/argv.c b/lib/argv.c → guest/lib/argv.c
diff --git a/lib/argv.h → guest/lib/argv.h b/lib/argv.h → guest/lib/argv.h
diff --git a/lib/arm/.gitignore → guest/lib/arm/.gitignore b/lib/arm/.gitignore → guest/lib/arm/.gitignore
diff --git a/lib/arm/asm-offsets.c → guest/lib/arm/asm-offsets.c b/lib/arm/asm-offsets.c → guest/lib/arm/asm-offsets.c
diff --git a/lib/arm/asm/arch_gicv3.h → guest/lib/arm/asm/arch_gicv3.h b/lib/arm/asm/arch_gicv3.h → guest/lib/arm/asm/arch_gicv3.h
diff --git a/lib/arm/asm/barrier.h → guest/lib/arm/asm/barrier.h b/lib/arm/asm/barrier.h → guest/lib/arm/asm/barrier.h
diff --git a/lib/arm/asm/bitops.h → guest/lib/arm/asm/bitops.h b/lib/arm/asm/bitops.h → guest/lib/arm/asm/bitops.h
diff --git a/lib/arm/asm/cpumask.h → guest/lib/arm/asm/cpumask.h b/lib/arm/asm/cpumask.h → guest/lib/arm/asm/cpumask.h
diff --git a/lib/arm/asm/delay.h → guest/lib/arm/asm/delay.h b/lib/arm/asm/delay.h → guest/lib/arm/asm/delay.h
diff --git a/lib/arm/asm/gic-v2.h → guest/lib/arm/asm/gic-v2.h b/lib/arm/asm/gic-v2.h → guest/lib/arm/asm/gic-v2.h
diff --git a/lib/arm/asm/gic-v3.h → guest/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h → guest/lib/arm/asm/gic-v3.h
diff --git a/lib/arm/asm/gic.h → guest/lib/arm/asm/gic.h b/lib/arm/asm/gic.h → guest/lib/arm/asm/gic.h
diff --git a/lib/arm/asm/io.h → guest/lib/arm/asm/io.h b/lib/arm/asm/io.h → guest/lib/arm/asm/io.h
diff --git a/lib/arm/asm/mmu-api.h → guest/lib/arm/asm/mmu-api.h b/lib/arm/asm/mmu-api.h → guest/lib/arm/asm/mmu-api.h
diff --git a/lib/arm/asm/mmu.h → guest/lib/arm/asm/mmu.h b/lib/arm/asm/mmu.h → guest/lib/arm/asm/mmu.h
diff --git a/lib/arm/asm/page.h → guest/lib/arm/asm/page.h b/lib/arm/asm/page.h → guest/lib/arm/asm/page.h
diff --git a/lib/arm/asm/pci.h → guest/lib/arm/asm/pci.h b/lib/arm/asm/pci.h → guest/lib/arm/asm/pci.h
diff --git a/lib/arm/asm/pgtable-hwdef.h → guest/lib/arm/asm/pgtable-hwdef.h b/lib/arm/asm/pgtable-hwdef.h → guest/lib/arm/asm/pgtable-hwdef.h
diff --git a/lib/arm/asm/pgtable.h → guest/lib/arm/asm/pgtable.h b/lib/arm/asm/pgtable.h → guest/lib/arm/asm/pgtable.h
diff --git a/lib/arm/asm/processor.h → guest/lib/arm/asm/processor.h b/lib/arm/asm/processor.h → guest/lib/arm/asm/processor.h
diff --git a/lib/arm/asm/psci.h → guest/lib/arm/asm/psci.h b/lib/arm/asm/psci.h → guest/lib/arm/asm/psci.h
diff --git a/lib/arm/asm/ptrace.h → guest/lib/arm/asm/ptrace.h b/lib/arm/asm/ptrace.h → guest/lib/arm/asm/ptrace.h
diff --git a/lib/arm/asm/setup.h → guest/lib/arm/asm/setup.h b/lib/arm/asm/setup.h → guest/lib/arm/asm/setup.h
diff --git a/lib/arm/asm/smp.h → guest/lib/arm/asm/smp.h b/lib/arm/asm/smp.h → guest/lib/arm/asm/smp.h
diff --git a/lib/arm/asm/spinlock.h → guest/lib/arm/asm/spinlock.h b/lib/arm/asm/spinlock.h → guest/lib/arm/asm/spinlock.h
diff --git a/lib/arm/asm/stack.h → guest/lib/arm/asm/stack.h b/lib/arm/asm/stack.h → guest/lib/arm/asm/stack.h
diff --git a/lib/arm/asm/sysreg.h → guest/lib/arm/asm/sysreg.h b/lib/arm/asm/sysreg.h → guest/lib/arm/asm/sysreg.h
diff --git a/lib/arm/asm/thread_info.h → guest/lib/arm/asm/thread_info.h b/lib/arm/asm/thread_info.h → guest/lib/arm/asm/thread_info.h
diff --git a/lib/arm/bitops.c → guest/lib/arm/bitops.c b/lib/arm/bitops.c → guest/lib/arm/bitops.c
diff --git a/lib/arm/delay.c → guest/lib/arm/delay.c b/lib/arm/delay.c → guest/lib/arm/delay.c
diff --git a/lib/arm/eabi_compat.c → guest/lib/arm/eabi_compat.c b/lib/arm/eabi_compat.c → guest/lib/arm/eabi_compat.c
diff --git a/lib/arm/gic-v2.c → guest/lib/arm/gic-v2.c b/lib/arm/gic-v2.c → guest/lib/arm/gic-v2.c
diff --git a/lib/arm/gic-v3.c → guest/lib/arm/gic-v3.c b/lib/arm/gic-v3.c → guest/lib/arm/gic-v3.c
diff --git a/lib/arm/gic.c → guest/lib/arm/gic.c b/lib/arm/gic.c → guest/lib/arm/gic.c
diff --git a/lib/arm/io.c → guest/lib/arm/io.c b/lib/arm/io.c → guest/lib/arm/io.c
diff --git a/lib/arm/io.h → guest/lib/arm/io.h b/lib/arm/io.h → guest/lib/arm/io.h
diff --git a/lib/arm/mmu.c → guest/lib/arm/mmu.c b/lib/arm/mmu.c → guest/lib/arm/mmu.c
diff --git a/lib/arm/processor.c → guest/lib/arm/processor.c b/lib/arm/processor.c → guest/lib/arm/processor.c
diff --git a/lib/arm/psci.c → guest/lib/arm/psci.c b/lib/arm/psci.c → guest/lib/arm/psci.c
diff --git a/lib/arm/setup.c → guest/lib/arm/setup.c b/lib/arm/setup.c → guest/lib/arm/setup.c
diff --git a/lib/arm/smp.c → guest/lib/arm/smp.c b/lib/arm/smp.c → guest/lib/arm/smp.c
diff --git a/lib/arm/spinlock.c → guest/lib/arm/spinlock.c b/lib/arm/spinlock.c → guest/lib/arm/spinlock.c
diff --git a/lib/arm/stack.c → guest/lib/arm/stack.c b/lib/arm/stack.c → guest/lib/arm/stack.c
diff --git a/lib/arm64/.gitignore → guest/lib/arm64/.gitignore b/lib/arm64/.gitignore → guest/lib/arm64/.gitignore
diff --git a/lib/arm64/asm-offsets.c → guest/lib/arm64/asm-offsets.c b/lib/arm64/asm-offsets.c → guest/lib/arm64/asm-offsets.c
diff --git a/lib/arm64/asm/arch_gicv3.h → guest/lib/arm64/asm/arch_gicv3.h b/lib/arm64/asm/arch_gicv3.h → guest/lib/arm64/asm/arch_gicv3.h
diff --git a/lib/arm64/asm/barrier.h → guest/lib/arm64/asm/barrier.h b/lib/arm64/asm/barrier.h → guest/lib/arm64/asm/barrier.h
diff --git a/lib/arm64/asm/bitops.h → guest/lib/arm64/asm/bitops.h b/lib/arm64/asm/bitops.h → guest/lib/arm64/asm/bitops.h
diff --git a/lib/arm64/asm/cpumask.h → guest/lib/arm64/asm/cpumask.h b/lib/arm64/asm/cpumask.h → guest/lib/arm64/asm/cpumask.h
diff --git a/lib/arm64/asm/delay.h → guest/lib/arm64/asm/delay.h b/lib/arm64/asm/delay.h → guest/lib/arm64/asm/delay.h
diff --git a/lib/arm64/asm/esr.h → guest/lib/arm64/asm/esr.h b/lib/arm64/asm/esr.h → guest/lib/arm64/asm/esr.h
diff --git a/lib/arm64/asm/gic-v2.h → guest/lib/arm64/asm/gic-v2.h b/lib/arm64/asm/gic-v2.h → guest/lib/arm64/asm/gic-v2.h
diff --git a/lib/arm64/asm/gic-v3.h → guest/lib/arm64/asm/gic-v3.h b/lib/arm64/asm/gic-v3.h → guest/lib/arm64/asm/gic-v3.h
diff --git a/lib/arm64/asm/gic.h → guest/lib/arm64/asm/gic.h b/lib/arm64/asm/gic.h → guest/lib/arm64/asm/gic.h
diff --git a/lib/arm64/asm/io.h → guest/lib/arm64/asm/io.h b/lib/arm64/asm/io.h → guest/lib/arm64/asm/io.h
diff --git a/lib/arm64/asm/mmu-api.h → guest/lib/arm64/asm/mmu-api.h b/lib/arm64/asm/mmu-api.h → guest/lib/arm64/asm/mmu-api.h
diff --git a/lib/arm64/asm/mmu.h → guest/lib/arm64/asm/mmu.h b/lib/arm64/asm/mmu.h → guest/lib/arm64/asm/mmu.h
diff --git a/lib/arm64/asm/page.h → guest/lib/arm64/asm/page.h b/lib/arm64/asm/page.h → guest/lib/arm64/asm/page.h
diff --git a/lib/arm64/asm/pci.h → guest/lib/arm64/asm/pci.h b/lib/arm64/asm/pci.h → guest/lib/arm64/asm/pci.h
diff --git a/lib/arm64/asm/pgtable-hwdef.h → guest/lib/arm64/asm/pgtable-hwdef.h b/lib/arm64/asm/pgtable-hwdef.h → guest/lib/arm64/asm/pgtable-hwdef.h
diff --git a/lib/arm64/asm/pgtable.h → guest/lib/arm64/asm/pgtable.h b/lib/arm64/asm/pgtable.h → guest/lib/arm64/asm/pgtable.h
diff --git a/lib/arm64/asm/processor.h → guest/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h → guest/lib/arm64/asm/processor.h
diff --git a/lib/arm64/asm/psci.h → guest/lib/arm64/asm/psci.h b/lib/arm64/asm/psci.h → guest/lib/arm64/asm/psci.h
diff --git a/lib/arm64/asm/ptrace.h → guest/lib/arm64/asm/ptrace.h b/lib/arm64/asm/ptrace.h → guest/lib/arm64/asm/ptrace.h
diff --git a/lib/arm64/asm/setup.h → guest/lib/arm64/asm/setup.h b/lib/arm64/asm/setup.h → guest/lib/arm64/asm/setup.h
diff --git a/lib/arm64/asm/smp.h → guest/lib/arm64/asm/smp.h b/lib/arm64/asm/smp.h → guest/lib/arm64/asm/smp.h
diff --git a/lib/arm64/asm/spinlock.h → guest/lib/arm64/asm/spinlock.h b/lib/arm64/asm/spinlock.h → guest/lib/arm64/asm/spinlock.h
diff --git a/lib/arm64/asm/stack.h → guest/lib/arm64/asm/stack.h b/lib/arm64/asm/stack.h → guest/lib/arm64/asm/stack.h
diff --git a/lib/arm64/asm/sysreg.h → guest/lib/arm64/asm/sysreg.h b/lib/arm64/asm/sysreg.h → guest/lib/arm64/asm/sysreg.h
diff --git a/lib/arm64/asm/thread_info.h → guest/lib/arm64/asm/thread_info.h b/lib/arm64/asm/thread_info.h → guest/lib/arm64/asm/thread_info.h
diff --git a/lib/arm64/processor.c → guest/lib/arm64/processor.c b/lib/arm64/processor.c → guest/lib/arm64/processor.c
diff --git a/lib/arm64/spinlock.c → guest/lib/arm64/spinlock.c b/lib/arm64/spinlock.c → guest/lib/arm64/spinlock.c
diff --git a/guest/lib/asm b/guest/lib/asm
@@ -0,0 +1 @@
+x86/asm
diff --git a/lib/asm-generic/atomic.h → guest/lib/asm-generic/atomic.h b/lib/asm-generic/atomic.h → guest/lib/asm-generic/atomic.h
diff --git a/lib/asm-generic/barrier.h → guest/lib/asm-generic/barrier.h b/lib/asm-generic/barrier.h → guest/lib/asm-generic/barrier.h
diff --git a/lib/asm-generic/io.h → guest/lib/asm-generic/io.h b/lib/asm-generic/io.h → guest/lib/asm-generic/io.h
diff --git a/lib/asm-generic/page.h → guest/lib/asm-generic/page.h b/lib/asm-generic/page.h → guest/lib/asm-generic/page.h
diff --git a/lib/asm-generic/pci-host-bridge.h → guest/lib/asm-generic/pci-host-bridge.h b/lib/asm-generic/pci-host-bridge.h → guest/lib/asm-generic/pci-host-bridge.h
diff --git a/lib/asm-generic/pci.h → guest/lib/asm-generic/pci.h b/lib/asm-generic/pci.h → guest/lib/asm-generic/pci.h
diff --git a/lib/asm-generic/spinlock.h → guest/lib/asm-generic/spinlock.h b/lib/asm-generic/spinlock.h → guest/lib/asm-generic/spinlock.h
diff --git a/lib/auxinfo.c → guest/lib/auxinfo.c b/lib/auxinfo.c → guest/lib/auxinfo.c
diff --git a/lib/auxinfo.h → guest/lib/auxinfo.h b/lib/auxinfo.h → guest/lib/auxinfo.h
diff --git a/lib/bitops.h → guest/lib/bitops.h b/lib/bitops.h → guest/lib/bitops.h
diff --git a/lib/chr-testdev.c → guest/lib/chr-testdev.c b/lib/chr-testdev.c → guest/lib/chr-testdev.c
diff --git a/lib/chr-testdev.h → guest/lib/chr-testdev.h b/lib/chr-testdev.h → guest/lib/chr-testdev.h
diff --git a/lib/devicetree.c → guest/lib/devicetree.c b/lib/devicetree.c → guest/lib/devicetree.c
diff --git a/lib/devicetree.h → guest/lib/devicetree.h b/lib/devicetree.h → guest/lib/devicetree.h
diff --git a/lib/errata.h → guest/lib/errata.h b/lib/errata.h → guest/lib/errata.h
diff --git a/lib/getchar.c → guest/lib/getchar.c b/lib/getchar.c → guest/lib/getchar.c
diff --git a/lib/kbuild.h → guest/lib/kbuild.h b/lib/kbuild.h → guest/lib/kbuild.h
diff --git a/lib/libcflat.h → guest/lib/libcflat.h b/lib/libcflat.h → guest/lib/libcflat.h
diff --git a/lib/libfdt/Makefile.libfdt → guest/lib/libfdt/Makefile.libfdt b/lib/libfdt/Makefile.libfdt → guest/lib/libfdt/Makefile.libfdt
diff --git a/lib/libfdt/README → guest/lib/libfdt/README b/lib/libfdt/README → guest/lib/libfdt/README
diff --git a/lib/libfdt/fdt.c → guest/lib/libfdt/fdt.c b/lib/libfdt/fdt.c → guest/lib/libfdt/fdt.c
diff --git a/lib/libfdt/fdt.h → guest/lib/libfdt/fdt.h b/lib/libfdt/fdt.h → guest/lib/libfdt/fdt.h
diff --git a/lib/libfdt/fdt_empty_tree.c → guest/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c → guest/lib/libfdt/fdt_empty_tree.c
diff --git a/lib/libfdt/fdt_ro.c → guest/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c → guest/lib/libfdt/fdt_ro.c
diff --git a/lib/libfdt/fdt_rw.c → guest/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c → guest/lib/libfdt/fdt_rw.c
diff --git a/lib/libfdt/fdt_strerror.c → guest/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c → guest/lib/libfdt/fdt_strerror.c
diff --git a/lib/libfdt/fdt_sw.c → guest/lib/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c → guest/lib/libfdt/fdt_sw.c
diff --git a/lib/libfdt/fdt_wip.c → guest/lib/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c → guest/lib/libfdt/fdt_wip.c
diff --git a/lib/libfdt/libfdt.h → guest/lib/libfdt/libfdt.h b/lib/libfdt/libfdt.h → guest/lib/libfdt/libfdt.h
diff --git a/lib/libfdt/libfdt_env.h → guest/lib/libfdt/libfdt_env.h b/lib/libfdt/libfdt_env.h → guest/lib/libfdt/libfdt_env.h
diff --git a/lib/libfdt/libfdt_internal.h → guest/lib/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h → guest/lib/libfdt/libfdt_internal.h
diff --git a/lib/libfdt/version.lds → guest/lib/libfdt/version.lds b/lib/libfdt/version.lds → guest/lib/libfdt/version.lds
diff --git a/lib/linux/const.h → guest/lib/linux/const.h b/lib/linux/const.h → guest/lib/linux/const.h
diff --git a/lib/linux/pci_regs.h → guest/lib/linux/pci_regs.h b/lib/linux/pci_regs.h → guest/lib/linux/pci_regs.h
diff --git a/lib/linux/psci.h → guest/lib/linux/psci.h b/lib/linux/psci.h → guest/lib/linux/psci.h
diff --git a/lib/pci-edu.c → guest/lib/pci-edu.c b/lib/pci-edu.c → guest/lib/pci-edu.c
diff --git a/lib/pci-edu.h → guest/lib/pci-edu.h b/lib/pci-edu.h → guest/lib/pci-edu.h
diff --git a/lib/pci-host-generic.c → guest/lib/pci-host-generic.c b/lib/pci-host-generic.c → guest/lib/pci-host-generic.c
diff --git a/lib/pci-host-generic.h → guest/lib/pci-host-generic.h b/lib/pci-host-generic.h → guest/lib/pci-host-generic.h
diff --git a/lib/pci-testdev.c → guest/lib/pci-testdev.c b/lib/pci-testdev.c → guest/lib/pci-testdev.c
diff --git a/lib/pci.c → guest/lib/pci.c b/lib/pci.c → guest/lib/pci.c
diff --git a/lib/pci.h → guest/lib/pci.h b/lib/pci.h → guest/lib/pci.h
diff --git a/lib/powerpc/.gitignore → guest/lib/powerpc/.gitignore b/lib/powerpc/.gitignore → guest/lib/powerpc/.gitignore
diff --git a/lib/powerpc/asm/handlers.h → guest/lib/powerpc/asm/handlers.h b/lib/powerpc/asm/handlers.h → guest/lib/powerpc/asm/handlers.h
diff --git a/lib/powerpc/asm/hcall.h → guest/lib/powerpc/asm/hcall.h b/lib/powerpc/asm/hcall.h → guest/lib/powerpc/asm/hcall.h
diff --git a/lib/powerpc/asm/ppc_asm.h → guest/lib/powerpc/asm/ppc_asm.h b/lib/powerpc/asm/ppc_asm.h → guest/lib/powerpc/asm/ppc_asm.h
diff --git a/lib/powerpc/asm/processor.h → guest/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h → guest/lib/powerpc/asm/processor.h
diff --git a/lib/powerpc/asm/rtas.h → guest/lib/powerpc/asm/rtas.h b/lib/powerpc/asm/rtas.h → guest/lib/powerpc/asm/rtas.h
diff --git a/lib/powerpc/asm/setup.h → guest/lib/powerpc/asm/setup.h b/lib/powerpc/asm/setup.h → guest/lib/powerpc/asm/setup.h
diff --git a/lib/powerpc/asm/smp.h → guest/lib/powerpc/asm/smp.h b/lib/powerpc/asm/smp.h → guest/lib/powerpc/asm/smp.h
diff --git a/lib/powerpc/asm/stack.h → guest/lib/powerpc/asm/stack.h b/lib/powerpc/asm/stack.h → guest/lib/powerpc/asm/stack.h
diff --git a/lib/powerpc/handlers.c → guest/lib/powerpc/handlers.c b/lib/powerpc/handlers.c → guest/lib/powerpc/handlers.c
diff --git a/lib/powerpc/hcall.c → guest/lib/powerpc/hcall.c b/lib/powerpc/hcall.c → guest/lib/powerpc/hcall.c
diff --git a/lib/powerpc/io.c → guest/lib/powerpc/io.c b/lib/powerpc/io.c → guest/lib/powerpc/io.c
diff --git a/lib/powerpc/io.h → guest/lib/powerpc/io.h b/lib/powerpc/io.h → guest/lib/powerpc/io.h
diff --git a/lib/powerpc/processor.c → guest/lib/powerpc/processor.c b/lib/powerpc/processor.c → guest/lib/powerpc/processor.c
diff --git a/lib/powerpc/rtas.c → guest/lib/powerpc/rtas.c b/lib/powerpc/rtas.c → guest/lib/powerpc/rtas.c
diff --git a/lib/powerpc/setup.c → guest/lib/powerpc/setup.c b/lib/powerpc/setup.c → guest/lib/powerpc/setup.c
diff --git a/lib/powerpc/smp.c → guest/lib/powerpc/smp.c b/lib/powerpc/smp.c → guest/lib/powerpc/smp.c
diff --git a/lib/ppc64/.gitignore → guest/lib/ppc64/.gitignore b/lib/ppc64/.gitignore → guest/lib/ppc64/.gitignore
diff --git a/lib/ppc64/asm-offsets.c → guest/lib/ppc64/asm-offsets.c b/lib/ppc64/asm-offsets.c → guest/lib/ppc64/asm-offsets.c
diff --git a/lib/ppc64/asm/barrier.h → guest/lib/ppc64/asm/barrier.h b/lib/ppc64/asm/barrier.h → guest/lib/ppc64/asm/barrier.h
diff --git a/lib/ppc64/asm/bitops.h → guest/lib/ppc64/asm/bitops.h b/lib/ppc64/asm/bitops.h → guest/lib/ppc64/asm/bitops.h
diff --git a/lib/ppc64/asm/handlers.h → guest/lib/ppc64/asm/handlers.h b/lib/ppc64/asm/handlers.h → guest/lib/ppc64/asm/handlers.h
diff --git a/lib/ppc64/asm/hcall.h → guest/lib/ppc64/asm/hcall.h b/lib/ppc64/asm/hcall.h → guest/lib/ppc64/asm/hcall.h
diff --git a/lib/ppc64/asm/io.h → guest/lib/ppc64/asm/io.h b/lib/ppc64/asm/io.h → guest/lib/ppc64/asm/io.h
diff --git a/lib/ppc64/asm/page.h → guest/lib/ppc64/asm/page.h b/lib/ppc64/asm/page.h → guest/lib/ppc64/asm/page.h
diff --git a/lib/ppc64/asm/ppc_asm.h → guest/lib/ppc64/asm/ppc_asm.h b/lib/ppc64/asm/ppc_asm.h → guest/lib/ppc64/asm/ppc_asm.h
diff --git a/lib/ppc64/asm/processor.h → guest/lib/ppc64/asm/processor.h b/lib/ppc64/asm/processor.h → guest/lib/ppc64/asm/processor.h
diff --git a/lib/ppc64/asm/ptrace.h → guest/lib/ppc64/asm/ptrace.h b/lib/ppc64/asm/ptrace.h → guest/lib/ppc64/asm/ptrace.h
diff --git a/lib/ppc64/asm/rtas.h → guest/lib/ppc64/asm/rtas.h b/lib/ppc64/asm/rtas.h → guest/lib/ppc64/asm/rtas.h
diff --git a/lib/ppc64/asm/setup.h → guest/lib/ppc64/asm/setup.h b/lib/ppc64/asm/setup.h → guest/lib/ppc64/asm/setup.h
diff --git a/lib/ppc64/asm/smp.h → guest/lib/ppc64/asm/smp.h b/lib/ppc64/asm/smp.h → guest/lib/ppc64/asm/smp.h
diff --git a/lib/ppc64/asm/spinlock.h → guest/lib/ppc64/asm/spinlock.h b/lib/ppc64/asm/spinlock.h → guest/lib/ppc64/asm/spinlock.h
diff --git a/lib/ppc64/asm/stack.h → guest/lib/ppc64/asm/stack.h b/lib/ppc64/asm/stack.h → guest/lib/ppc64/asm/stack.h
diff --git a/lib/printf.c → guest/lib/printf.c b/lib/printf.c → guest/lib/printf.c
diff --git a/lib/report.c → guest/lib/report.c b/lib/report.c → guest/lib/report.c
diff --git a/lib/s390x/.gitignore → guest/lib/s390x/.gitignore b/lib/s390x/.gitignore → guest/lib/s390x/.gitignore
diff --git a/lib/s390x/asm-offsets.c → guest/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c → guest/lib/s390x/asm-offsets.c
diff --git a/lib/s390x/asm/arch_def.h → guest/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h → guest/lib/s390x/asm/arch_def.h
diff --git a/lib/s390x/asm/barrier.h → guest/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h → guest/lib/s390x/asm/barrier.h
diff --git a/lib/s390x/asm/bitops.h → guest/lib/s390x/asm/bitops.h b/lib/s390x/asm/bitops.h → guest/lib/s390x/asm/bitops.h
diff --git a/lib/s390x/asm/cpacf.h → guest/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h → guest/lib/s390x/asm/cpacf.h
diff --git a/lib/s390x/asm/facility.h → guest/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h → guest/lib/s390x/asm/facility.h
diff --git a/lib/s390x/asm/float.h → guest/lib/s390x/asm/float.h b/lib/s390x/asm/float.h → guest/lib/s390x/asm/float.h
diff --git a/lib/s390x/asm/interrupt.h → guest/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h → guest/lib/s390x/asm/interrupt.h
diff --git a/lib/s390x/asm/io.h → guest/lib/s390x/asm/io.h b/lib/s390x/asm/io.h → guest/lib/s390x/asm/io.h
diff --git a/lib/s390x/asm/mem.h → guest/lib/s390x/asm/mem.h b/lib/s390x/asm/mem.h → guest/lib/s390x/asm/mem.h
diff --git a/lib/s390x/asm/page.h → guest/lib/s390x/asm/page.h b/lib/s390x/asm/page.h → guest/lib/s390x/asm/page.h
diff --git a/lib/s390x/asm/pgtable.h → guest/lib/s390x/asm/pgtable.h b/lib/s390x/asm/pgtable.h → guest/lib/s390x/asm/pgtable.h
diff --git a/lib/s390x/asm/spinlock.h → guest/lib/s390x/asm/spinlock.h b/lib/s390x/asm/spinlock.h → guest/lib/s390x/asm/spinlock.h
diff --git a/lib/s390x/asm/stack.h → guest/lib/s390x/asm/stack.h b/lib/s390x/asm/stack.h → guest/lib/s390x/asm/stack.h
diff --git a/lib/s390x/interrupt.c → guest/lib/s390x/interrupt.c b/lib/s390x/interrupt.c → guest/lib/s390x/interrupt.c
diff --git a/lib/s390x/io.c → guest/lib/s390x/io.c b/lib/s390x/io.c → guest/lib/s390x/io.c
diff --git a/lib/s390x/mmu.c → guest/lib/s390x/mmu.c b/lib/s390x/mmu.c → guest/lib/s390x/mmu.c
diff --git a/lib/s390x/mmu.h → guest/lib/s390x/mmu.h b/lib/s390x/mmu.h → guest/lib/s390x/mmu.h
diff --git a/lib/s390x/sclp-ascii.c → guest/lib/s390x/sclp-ascii.c b/lib/s390x/sclp-ascii.c → guest/lib/s390x/sclp-ascii.c
diff --git a/lib/s390x/sclp.c → guest/lib/s390x/sclp.c b/lib/s390x/sclp.c → guest/lib/s390x/sclp.c
diff --git a/lib/s390x/sclp.h → guest/lib/s390x/sclp.h b/lib/s390x/sclp.h → guest/lib/s390x/sclp.h
diff --git a/lib/s390x/stack.c → guest/lib/s390x/stack.c b/lib/s390x/stack.c → guest/lib/s390x/stack.c
diff --git a/lib/setjmp.h → guest/lib/setjmp.h b/lib/setjmp.h → guest/lib/setjmp.h
diff --git a/lib/stack.c → guest/lib/stack.c b/lib/stack.c → guest/lib/stack.c
diff --git a/lib/stack.h → guest/lib/stack.h b/lib/stack.h → guest/lib/stack.h
diff --git a/lib/string.c → guest/lib/string.c b/lib/string.c → guest/lib/string.c
diff --git a/lib/string.h → guest/lib/string.h b/lib/string.h → guest/lib/string.h
diff --git a/lib/util.c → guest/lib/util.c b/lib/util.c → guest/lib/util.c
diff --git a/lib/util.h → guest/lib/util.h b/lib/util.h → guest/lib/util.h
diff --git a/lib/virtio-mmio.c → guest/lib/virtio-mmio.c b/lib/virtio-mmio.c → guest/lib/virtio-mmio.c
diff --git a/lib/virtio-mmio.h → guest/lib/virtio-mmio.h b/lib/virtio-mmio.h → guest/lib/virtio-mmio.h
diff --git a/lib/virtio.c → guest/lib/virtio.c b/lib/virtio.c → guest/lib/virtio.c
diff --git a/lib/virtio.h → guest/lib/virtio.h b/lib/virtio.h → guest/lib/virtio.h
diff --git a/lib/vmalloc.c → guest/lib/vmalloc.c b/lib/vmalloc.c → guest/lib/vmalloc.c
diff --git a/lib/vmalloc.h → guest/lib/vmalloc.h b/lib/vmalloc.h → guest/lib/vmalloc.h
diff --git a/lib/x86/acpi.c → guest/lib/x86/acpi.c b/lib/x86/acpi.c → guest/lib/x86/acpi.c
diff --git a/lib/x86/acpi.h → guest/lib/x86/acpi.h b/lib/x86/acpi.h → guest/lib/x86/acpi.h
diff --git a/lib/x86/apic-defs.h → guest/lib/x86/apic-defs.h b/lib/x86/apic-defs.h → guest/lib/x86/apic-defs.h
diff --git a/lib/x86/apic.c → guest/lib/x86/apic.c b/lib/x86/apic.c → guest/lib/x86/apic.c
diff --git a/lib/x86/apic.h → guest/lib/x86/apic.h b/lib/x86/apic.h → guest/lib/x86/apic.h
diff --git a/lib/x86/asm/barrier.h → guest/lib/x86/asm/barrier.h b/lib/x86/asm/barrier.h → guest/lib/x86/asm/barrier.h
diff --git a/lib/x86/asm/bitops.h → guest/lib/x86/asm/bitops.h b/lib/x86/asm/bitops.h → guest/lib/x86/asm/bitops.h
diff --git a/lib/x86/asm/io.h → guest/lib/x86/asm/io.h b/lib/x86/asm/io.h → guest/lib/x86/asm/io.h
diff --git a/lib/x86/asm/page.h → guest/lib/x86/asm/page.h b/lib/x86/asm/page.h → guest/lib/x86/asm/page.h
diff --git a/lib/x86/asm/pci.h → guest/lib/x86/asm/pci.h b/lib/x86/asm/pci.h → guest/lib/x86/asm/pci.h
diff --git a/lib/x86/asm/spinlock.h → guest/lib/x86/asm/spinlock.h b/lib/x86/asm/spinlock.h → guest/lib/x86/asm/spinlock.h
diff --git a/lib/x86/asm/stack.h → guest/lib/x86/asm/stack.h b/lib/x86/asm/stack.h → guest/lib/x86/asm/stack.h
diff --git a/lib/x86/atomic.c → guest/lib/x86/atomic.c b/lib/x86/atomic.c → guest/lib/x86/atomic.c
diff --git a/lib/x86/atomic.h → guest/lib/x86/atomic.h b/lib/x86/atomic.h → guest/lib/x86/atomic.h
diff --git a/lib/x86/delay.c → guest/lib/x86/delay.c b/lib/x86/delay.c → guest/lib/x86/delay.c
diff --git a/lib/x86/delay.h → guest/lib/x86/delay.h b/lib/x86/delay.h → guest/lib/x86/delay.h
diff --git a/lib/x86/desc.c → guest/lib/x86/desc.c b/lib/x86/desc.c → guest/lib/x86/desc.c
diff --git a/lib/x86/desc.h → guest/lib/x86/desc.h b/lib/x86/desc.h → guest/lib/x86/desc.h
diff --git a/lib/x86/fake-apic.h → guest/lib/x86/fake-apic.h b/lib/x86/fake-apic.h → guest/lib/x86/fake-apic.h
diff --git a/lib/x86/fault_test.c → guest/lib/x86/fault_test.c b/lib/x86/fault_test.c → guest/lib/x86/fault_test.c
diff --git a/lib/x86/fault_test.h → guest/lib/x86/fault_test.h b/lib/x86/fault_test.h → guest/lib/x86/fault_test.h
diff --git a/lib/x86/fwcfg.c → guest/lib/x86/fwcfg.c b/lib/x86/fwcfg.c → guest/lib/x86/fwcfg.c
@@ -41,5 +41,5 @@ uint64_t fwcfg_get_u64(unsigned index)
 
 unsigned fwcfg_get_nb_cpus(void)
 {
-    return fwcfg_get_u16(FW_CFG_NB_CPUS);
+    return 2;
 }
diff --git a/lib/x86/fwcfg.h → guest/lib/x86/fwcfg.h b/lib/x86/fwcfg.h → guest/lib/x86/fwcfg.h
diff --git a/lib/x86/intel-iommu.c → guest/lib/x86/intel-iommu.c b/lib/x86/intel-iommu.c → guest/lib/x86/intel-iommu.c
diff --git a/lib/x86/intel-iommu.h → guest/lib/x86/intel-iommu.h b/lib/x86/intel-iommu.h → guest/lib/x86/intel-iommu.h
diff --git a/lib/x86/io.c → guest/lib/x86/io.c b/lib/x86/io.c → guest/lib/x86/io.c
diff --git a/lib/x86/isr.c → guest/lib/x86/isr.c b/lib/x86/isr.c → guest/lib/x86/isr.c
diff --git a/lib/x86/isr.h → guest/lib/x86/isr.h b/lib/x86/isr.h → guest/lib/x86/isr.h
diff --git a/lib/x86/msr.h → guest/lib/x86/msr.h b/lib/x86/msr.h → guest/lib/x86/msr.h
diff --git a/lib/x86/processor.h → guest/lib/x86/processor.h b/lib/x86/processor.h → guest/lib/x86/processor.h
diff --git a/lib/x86/setjmp32.S → guest/lib/x86/setjmp32.S b/lib/x86/setjmp32.S → guest/lib/x86/setjmp32.S
diff --git a/lib/x86/setjmp64.S → guest/lib/x86/setjmp64.S b/lib/x86/setjmp64.S → guest/lib/x86/setjmp64.S
diff --git a/lib/x86/setup.c → guest/lib/x86/setup.c b/lib/x86/setup.c → guest/lib/x86/setup.c
@@ -9,6 +9,7 @@
 #include "fwcfg.h"
 #include "alloc_phys.h"
 
+extern char bss_start;
 extern char edata;
 
 struct mbi_bootinfo {
@@ -42,6 +43,11 @@ u32 initrd_size;
 
 static char env[ENV_SIZE];
 
+void bss_init(void)
+{
+	memset(&bss_start, 0, &edata - &bss_start);
+}
+
 void setup_multiboot(struct mbi_bootinfo *bootinfo)
 {
 	struct mbi_module *mods;

diff --git a/lib/x86/smp.c → guest/lib/x86/smp.c b/lib/x86/smp.c → guest/lib/x86/smp.c
diff --git a/lib/x86/smp.h → guest/lib/x86/smp.h b/lib/x86/smp.h → guest/lib/x86/smp.h
diff --git a/lib/x86/stack.c → guest/lib/x86/stack.c b/lib/x86/stack.c → guest/lib/x86/stack.c
diff --git a/lib/x86/usermode.c → guest/lib/x86/usermode.c b/lib/x86/usermode.c → guest/lib/x86/usermode.c
diff --git a/lib/x86/usermode.h → guest/lib/x86/usermode.h b/lib/x86/usermode.h → guest/lib/x86/usermode.h
diff --git a/lib/x86/vm.c → guest/lib/x86/vm.c b/lib/x86/vm.c → guest/lib/x86/vm.c
diff --git a/lib/x86/vm.h → guest/lib/x86/vm.h b/lib/x86/vm.h → guest/lib/x86/vm.h
diff --git a/powerpc/.gitignore → guest/powerpc/.gitignore b/powerpc/.gitignore → guest/powerpc/.gitignore
diff --git a/powerpc/Makefile → guest/powerpc/Makefile b/powerpc/Makefile → guest/powerpc/Makefile
diff --git a/powerpc/Makefile.common → guest/powerpc/Makefile.common b/powerpc/Makefile.common → guest/powerpc/Makefile.common
diff --git a/powerpc/Makefile.ppc64 → guest/powerpc/Makefile.ppc64 b/powerpc/Makefile.ppc64 → guest/powerpc/Makefile.ppc64
diff --git a/powerpc/boot_rom.S → guest/powerpc/boot_rom.S b/powerpc/boot_rom.S → guest/powerpc/boot_rom.S
diff --git a/powerpc/cstart64.S → guest/powerpc/cstart64.S b/powerpc/cstart64.S → guest/powerpc/cstart64.S
diff --git a/powerpc/emulator.c → guest/powerpc/emulator.c b/powerpc/emulator.c → guest/powerpc/emulator.c
diff --git a/powerpc/flat.lds → guest/powerpc/flat.lds b/powerpc/flat.lds → guest/powerpc/flat.lds
diff --git a/powerpc/reloc64.c → guest/powerpc/reloc64.c b/powerpc/reloc64.c → guest/powerpc/reloc64.c
diff --git a/powerpc/rtas.c → guest/powerpc/rtas.c b/powerpc/rtas.c → guest/powerpc/rtas.c
diff --git a/powerpc/run → guest/powerpc/run b/powerpc/run → guest/powerpc/run
diff --git a/powerpc/selftest.c → guest/powerpc/selftest.c b/powerpc/selftest.c → guest/powerpc/selftest.c
diff --git a/powerpc/spapr.h → guest/powerpc/spapr.h b/powerpc/spapr.h → guest/powerpc/spapr.h
diff --git a/powerpc/spapr_hcall.c → guest/powerpc/spapr_hcall.c b/powerpc/spapr_hcall.c → guest/powerpc/spapr_hcall.c
diff --git a/powerpc/sprs.c → guest/powerpc/sprs.c b/powerpc/sprs.c → guest/powerpc/sprs.c
diff --git a/powerpc/tm.c → guest/powerpc/tm.c b/powerpc/tm.c → guest/powerpc/tm.c
diff --git a/powerpc/unittests.cfg → guest/powerpc/unittests.cfg b/powerpc/unittests.cfg → guest/powerpc/unittests.cfg
diff --git a/run_tests.sh → guest/run_tests.sh b/run_tests.sh → guest/run_tests.sh
diff --git a/s390x/Makefile → guest/s390x/Makefile b/s390x/Makefile → guest/s390x/Makefile
diff --git a/s390x/cmm.c → guest/s390x/cmm.c b/s390x/cmm.c → guest/s390x/cmm.c
diff --git a/s390x/cstart64.S → guest/s390x/cstart64.S b/s390x/cstart64.S → guest/s390x/cstart64.S
diff --git a/s390x/diag10.c → guest/s390x/diag10.c b/s390x/diag10.c → guest/s390x/diag10.c
diff --git a/s390x/emulator.c → guest/s390x/emulator.c b/s390x/emulator.c → guest/s390x/emulator.c
diff --git a/s390x/flat.lds → guest/s390x/flat.lds b/s390x/flat.lds → guest/s390x/flat.lds
diff --git a/s390x/gs.c → guest/s390x/gs.c b/s390x/gs.c → guest/s390x/gs.c
diff --git a/s390x/iep.c → guest/s390x/iep.c b/s390x/iep.c → guest/s390x/iep.c
diff --git a/s390x/intercept.c → guest/s390x/intercept.c b/s390x/intercept.c → guest/s390x/intercept.c