浏览代码

softmmu: move vl.c to softmmu/

Move vl.c to a separate directory, similar to linux-user/
Update the chechpatch and get_maintainer scripts, since they relied on
/vl.c for top_of_tree checks.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200220041118.23264-2-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Alexander Bulekov 5 年之前
父节点
当前提交
bac068e064
共有 7 个文件被更改,包括 7 次插入5 次删除
  1. 1 1
      MAINTAINERS
  2. 0 2
      Makefile.objs
  3. 1 0
      Makefile.target
  4. 1 1
      scripts/checkpatch.pl
  5. 2 1
      scripts/get_maintainer.pl
  6. 2 0
      softmmu/Makefile.objs
  7. 0 0
      softmmu/vl.c

+ 1 - 1
MAINTAINERS

@@ -2031,7 +2031,7 @@ F: include/qemu/main-loop.h
 F: include/sysemu/runstate.h
 F: include/sysemu/runstate.h
 F: util/main-loop.c
 F: util/main-loop.c
 F: util/qemu-timer.c
 F: util/qemu-timer.c
-F: vl.c
+F: softmmu/vl.c
 F: qapi/run-state.json
 F: qapi/run-state.json
 
 
 Human Monitor (HMP)
 Human Monitor (HMP)

+ 0 - 2
Makefile.objs

@@ -58,8 +58,6 @@ common-obj-y += ui/
 common-obj-m += ui/
 common-obj-m += ui/
 
 
 common-obj-y += dma-helpers.o
 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-$(CONFIG_TPM) += tpm.o
 
 
 common-obj-y += backends/
 common-obj-y += backends/

+ 1 - 0
Makefile.target

@@ -160,6 +160,7 @@ obj-y += qapi/
 obj-y += memory.o
 obj-y += memory.o
 obj-y += memory_mapping.o
 obj-y += memory_mapping.o
 obj-y += migration/ram.o
 obj-y += migration/ram.o
+obj-y += softmmu/
 LIBS := $(libs_softmmu) $(LIBS)
 LIBS := $(libs_softmmu) $(LIBS)
 
 
 # Hardware support
 # Hardware support

+ 1 - 1
scripts/checkpatch.pl

@@ -462,7 +462,7 @@ sub top_of_kernel_tree {
 	my @tree_check = (
 	my @tree_check = (
 		"COPYING", "MAINTAINERS", "Makefile",
 		"COPYING", "MAINTAINERS", "Makefile",
 		"README.rst", "docs", "VERSION",
 		"README.rst", "docs", "VERSION",
-		"vl.c"
+		"linux-user", "softmmu"
 	);
 	);
 
 
 	foreach my $check (@tree_check) {
 	foreach my $check (@tree_check) {

+ 2 - 1
scripts/get_maintainer.pl

@@ -795,7 +795,8 @@ sub top_of_tree {
         && (-f "${lk_path}Makefile")
         && (-f "${lk_path}Makefile")
         && (-d "${lk_path}docs")
         && (-d "${lk_path}docs")
         && (-f "${lk_path}VERSION")
         && (-f "${lk_path}VERSION")
-        && (-f "${lk_path}vl.c")) {
+        && (-d "${lk_path}linux-user/")
+        && (-d "${lk_path}softmmu/")) {
 	return 1;
 	return 1;
     }
     }
     return 0;
     return 0;

+ 2 - 0
softmmu/Makefile.objs

@@ -0,0 +1,2 @@
+obj-y += vl.o
+vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

+ 0 - 0
vl.c → softmmu/vl.c