Commit d8b92452 authored by 李澍非 's avatar 李澍非
Browse files

softmmu:move vl.c to softmmu/&split off vl.c:main() into main.c

parent 5ec15fab
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,8 @@ S: Maintained
F: cpus.c
F: util/main-loop.c
F: util/qemu-timer.c
F: vl.c
F: softmmu/vl.c
F: softmmu/main.c
F: qapi/run-state.json

Human Monitor (HMP)
+0 −2
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ common-obj-y += bt-host.o bt-vhci.o
bt-host.o-cflags := $(BLUEZ_CFLAGS)

common-obj-y += dma-helpers.o
common-obj-y += vl.o
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
common-obj-$(CONFIG_TPM) += tpm.o

common-obj-y += backends/
+2 −1
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 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
@@ -205,7 +206,7 @@ endif
COMMON_LDADDS = ../libqemuutil.a

# build either PROG or PROGW
$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS)
$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS) $(softmmu-main-y)
	$(call LINK, $(filter-out %.mak, $^))
ifdef CONFIG_DARWIN
	$(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"REZ","$(TARGET_DIR)$@")
+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,10 @@ QemuOpts *qemu_get_machine_opts(void);

bool defaults_enabled(void);

void qemu_init(int argc, char **argv, char **envp);
void qemu_main_loop(void);
void qemu_cleanup(void);

extern QemuOptsList qemu_legacy_drive_opts;
extern QemuOptsList qemu_common_drive_opts;
extern QemuOptsList qemu_drive_opts;
+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ sub top_of_kernel_tree {
	my @tree_check = (
		"COPYING", "MAINTAINERS", "Makefile",
		"README", "docs", "VERSION",
		"vl.c"
		"linux-user", "softmmu"
	);

	foreach my $check (@tree_check) {
Loading