diff options
| -rw-r--r-- | MAINTAINERS | 12 | ||||
| -rw-r--r-- | Makefile.target | 7 | ||||
| -rw-r--r-- | softmmu/Makefile.objs | 10 | ||||
| -rw-r--r-- | softmmu/arch_init.c (renamed from arch_init.c) | 0 | ||||
| -rw-r--r-- | softmmu/balloon.c (renamed from balloon.c) | 0 | ||||
| -rw-r--r-- | softmmu/cpus.c (renamed from cpus.c) | 0 | ||||
| -rw-r--r-- | softmmu/ioport.c (renamed from ioport.c) | 0 | ||||
| -rw-r--r-- | softmmu/memory.c (renamed from memory.c) | 0 | ||||
| -rw-r--r-- | softmmu/memory_mapping.c (renamed from memory_mapping.c) | 0 | ||||
| -rw-r--r-- | softmmu/qtest.c (renamed from qtest.c) | 0 |
10 files changed, 18 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 51f6ddf..28f3312 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -115,7 +115,7 @@ Overall TCG CPUs M: Richard Henderson <rth@twiddle.net> R: Paolo Bonzini <pbonzini@redhat.com> S: Maintained -F: cpus.c +F: softmmu/cpus.c F: cpus-common.c F: exec.c F: accel/tcg/ @@ -1724,7 +1724,7 @@ M: David Hildenbrand <david@redhat.com> S: Maintained F: hw/virtio/virtio-balloon*.c F: include/hw/virtio/virtio-balloon.h -F: balloon.c +F: softmmu/balloon.c F: include/sysemu/balloon.h virtio-9p @@ -2203,12 +2203,12 @@ Memory API M: Paolo Bonzini <pbonzini@redhat.com> S: Supported F: include/exec/ioport.h -F: ioport.c F: include/exec/memop.h F: include/exec/memory.h F: include/exec/ram_addr.h F: include/exec/ramblock.h -F: memory.c +F: softmmu/ioport.c +F: softmmu/memory.c F: include/exec/memory-internal.h F: exec.c F: scripts/coccinelle/memory-region-housekeeping.cocci @@ -2240,13 +2240,13 @@ F: ui/cocoa.m Main loop M: Paolo Bonzini <pbonzini@redhat.com> S: Maintained -F: cpus.c F: include/qemu/main-loop.h F: include/sysemu/runstate.h F: util/main-loop.c F: util/qemu-timer.c F: softmmu/vl.c F: softmmu/main.c +F: softmmu/cpus.c F: qapi/run-state.json Human Monitor (HMP) @@ -2401,7 +2401,7 @@ M: Thomas Huth <thuth@redhat.com> M: Laurent Vivier <lvivier@redhat.com> R: Paolo Bonzini <pbonzini@redhat.com> S: Maintained -F: qtest.c +F: softmmu/qtest.c F: accel/qtest.c F: tests/qtest/ X: tests/qtest/bios-tables-test-allowed-diff.h diff --git a/Makefile.target b/Makefile.target index 02bd9d7..ffa2657 100644 --- a/Makefile.target +++ b/Makefile.target @@ -152,16 +152,13 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target ifdef CONFIG_SOFTMMU -obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o -obj-y += qtest.o +obj-y += softmmu/ +obj-y += gdbstub.o obj-y += dump/ obj-y += hw/ obj-y += monitor/ obj-y += qapi/ -obj-y += memory.o -obj-y += memory_mapping.o obj-y += migration/ram.o -obj-y += softmmu/ LIBS := $(libs_softmmu) $(LIBS) # Hardware support diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs index dd15c24..a4bd9f2 100644 --- a/softmmu/Makefile.objs +++ b/softmmu/Makefile.objs @@ -1,3 +1,13 @@ softmmu-main-y = softmmu/main.o + +obj-y += arch_init.o +obj-y += cpus.o +obj-y += balloon.o +obj-y += ioport.o +obj-y += memory.o +obj-y += memory_mapping.o + +obj-y += qtest.o + obj-y += vl.o vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) diff --git a/arch_init.c b/softmmu/arch_init.c index 8afea47..8afea47 100644 --- a/arch_init.c +++ b/softmmu/arch_init.c diff --git a/balloon.c b/softmmu/balloon.c index 354408c..354408c 100644 --- a/balloon.c +++ b/softmmu/balloon.c diff --git a/ioport.c b/softmmu/ioport.c index 04e360e..04e360e 100644 --- a/ioport.c +++ b/softmmu/ioport.c diff --git a/memory.c b/softmmu/memory.c index 9200b20..9200b20 100644 --- a/memory.c +++ b/softmmu/memory.c diff --git a/memory_mapping.c b/softmmu/memory_mapping.c index 18d0b80..18d0b80 100644 --- a/memory_mapping.c +++ b/softmmu/memory_mapping.c diff --git a/qtest.c b/softmmu/qtest.c index 5672b75..5672b75 100644 --- a/qtest.c +++ b/softmmu/qtest.c |