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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1740a4fddc140c036b3ac252b6ca540752dd35e1..6e26d2ec2aaacf52ea2f5a3655d9eb5c620649b4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2031,7 +2031,7 @@ F: include/qemu/main-loop.h
 F: include/sysemu/runstate.h
 F: util/main-loop.c
 F: util/qemu-timer.c
-F: vl.c
+F: softmmu/vl.c
 F: qapi/run-state.json
 
 Human Monitor (HMP)

diff --git a/Makefile.objs b/Makefile.objs
index 26b9cff95436f0a2db30c69f9ebbb2d0c0742b4d..8a1cbe8000e6109f46a0308774e128e3cac7f59d 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -58,8 +58,6 @@ common-obj-y += ui/
 common-obj-m += ui/
 
 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/

diff --git a/Makefile.target b/Makefile.target
index 6e61f607b14ae7cbb5081f47bf58f46bf86886d4..06c36d11610d0b44436f72e047272b96dd804ed7 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -160,6 +160,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

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 11512a8a09b84001eedc881034cd5612c7f9225c..b27e4ff5e95a3704c2ae3510038bf8f6b45498c1 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -462,7 +462,7 @@ sub top_of_kernel_tree {
        my @tree_check = (
                "COPYING", "MAINTAINERS", "Makefile",
                "README.rst", "docs", "VERSION",
-               "vl.c"
+               "linux-user", "softmmu"
        );
 
        foreach my $check (@tree_check) {

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 27991eb1cfb4c31fa142f5db810c2dc2f96de7d5..271f5ff42ac12ef9a803ba22d6fa45fd48d1096a 100755 (executable)
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -795,7 +795,8 @@ sub top_of_tree {
         && (-f "${lk_path}Makefile")
         && (-d "${lk_path}docs")
         && (-f "${lk_path}VERSION")
-        && (-f "${lk_path}vl.c")) {
+        && (-d "${lk_path}linux-user/")
+        && (-d "${lk_path}softmmu/")) {
        return 1;
     }
     return 0;

diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
new file mode 100644 (file)
index 0000000..d80a5ff
--- /dev/null
+++ b/softmmu/Makefile.objs
@@ -0,0 +1,2 @@
+obj-y += vl.o
+vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

diff --git a/vl.c b/softmmu/vl.c
similarity index 100%
rename from vl.c
rename to softmmu/vl.c