| Message ID | 20200220041118.23264-2-alxndr@bu.edu |
|---|---|
| State | New |
| Headers | show |
| Series | Add virtual device fuzzing support | expand |
On Wed, Feb 19, 2020 at 11:10:57PM -0500, Alexander Bulekov wrote: >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> >--- > MAINTAINERS | 2 +- > Makefile.objs | 2 -- > Makefile.target | 1 + > scripts/checkpatch.pl | 2 +- > scripts/get_maintainer.pl | 3 ++- > softmmu/Makefile.objs | 2 ++ > vl.c => softmmu/vl.c | 0 > 7 files changed, 7 insertions(+), 5 deletions(-) > create mode 100644 softmmu/Makefile.objs > rename vl.c => softmmu/vl.c (100%) > >diff --git a/MAINTAINERS b/MAINTAINERS >index c7717df720..98cbeaab97 100644 >--- a/MAINTAINERS >+++ b/MAINTAINERS >@@ -2023,7 +2023,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 26b9cff954..8a1cbe8000 100644 >--- 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 6e61f607b1..06c36d1161 100644 >--- 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 ce43a306f8..c85ad11de1 100755 >--- 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 27991eb1cf..271f5ff42a 100755 >--- 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 >index 0000000000..d80a5ffe5a >--- /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 >-- >2.25.0 >
On Wed, Feb 19, 2020 at 11:10:57PM -0500, Alexander Bulekov wrote: > 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> > --- > MAINTAINERS | 2 +- > Makefile.objs | 2 -- > Makefile.target | 1 + > scripts/checkpatch.pl | 2 +- > scripts/get_maintainer.pl | 3 ++- > softmmu/Makefile.objs | 2 ++ > vl.c => softmmu/vl.c | 0 > 7 files changed, 7 insertions(+), 5 deletions(-) > create mode 100644 softmmu/Makefile.objs > rename vl.c => softmmu/vl.c (100%) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/MAINTAINERS b/MAINTAINERS index c7717df720..98cbeaab97 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2023,7 +2023,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 26b9cff954..8a1cbe8000 100644 --- 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 6e61f607b1..06c36d1161 100644 --- 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 ce43a306f8..c85ad11de1 100755 --- 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 27991eb1cf..271f5ff42a 100755 --- 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 index 0000000000..d80a5ffe5a --- /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
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> --- MAINTAINERS | 2 +- Makefile.objs | 2 -- Makefile.target | 1 + scripts/checkpatch.pl | 2 +- scripts/get_maintainer.pl | 3 ++- softmmu/Makefile.objs | 2 ++ vl.c => softmmu/vl.c | 0 7 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 softmmu/Makefile.objs rename vl.c => softmmu/vl.c (100%)