| Message ID | 1596741379-12902-69-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Meson integration for 5.2 | expand |
Hi Paolo, On 8/6/20 9:15 PM, Paolo Bonzini wrote: > Leave out main.c, it's special due to fuzzing. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > softmmu/meson.build | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/softmmu/meson.build b/softmmu/meson.build > index d4ac51b..95d38df 100644 > --- a/softmmu/meson.build > +++ b/softmmu/meson.build > @@ -1,4 +1,4 @@ > -specific_ss.add(files( > +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( > 'arch_init.c', > 'balloon.c', > 'cpus.c', > @@ -6,4 +6,5 @@ specific_ss.add(files( > 'ioport.c', > 'memory.c', > 'memory_mapping.c', > - 'qtest.c')) > + 'qtest.c', > + 'vl.c')) > There is still "obj-y += vl.o" in softmmu/Makefile.objs. Did you meant to squash this into the previous patch?
On 07/08/20 15:36, Philippe Mathieu-Daudé wrote: > There is still "obj-y += vl.o" in softmmu/Makefile.objs. > > Did you meant to squash this into the previous patch? This is what I meant: diff --git a/meson.build b/meson.build index a7ad3248cc..ef6f811c51 100644 --- a/meson.build +++ b/meson.build @@ -618,6 +618,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) common_ss.add(files('cpus-common.c')) +subdir('softmmu') + # needed for fuzzing binaries subdir('tests/qtest/libqos') diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs index a414a74c50..ebcfd15695 100644 --- a/softmmu/Makefile.objs +++ b/softmmu/Makefile.objs @@ -1,14 +1,2 @@ softmmu-main-y = softmmu/main.o - -obj-y += arch_init.o -obj-y += cpus.o -obj-y += cpu-throttle.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) +main.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) diff --git a/softmmu/meson.build b/softmmu/meson.build new file mode 100644 index 0000000000..95d38df259 --- /dev/null +++ b/softmmu/meson.build @@ -0,0 +1,10 @@ +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'arch_init.c', + 'balloon.c', + 'cpus.c', + 'cpu-throttle.c', + 'ioport.c', + 'memory.c', + 'memory_mapping.c', + 'qtest.c', + 'vl.c'))
On 8/7/20 4:18 PM, Paolo Bonzini wrote: > On 07/08/20 15:36, Philippe Mathieu-Daudé wrote: >> There is still "obj-y += vl.o" in softmmu/Makefile.objs. >> >> Did you meant to squash this into the previous patch? > > This is what I meant: > > diff --git a/meson.build b/meson.build > index a7ad3248cc..ef6f811c51 100644 > --- a/meson.build > +++ b/meson.build > @@ -618,6 +618,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')]) > > common_ss.add(files('cpus-common.c')) > > +subdir('softmmu') > + > # needed for fuzzing binaries > subdir('tests/qtest/libqos') > > diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs > index a414a74c50..ebcfd15695 100644 > --- a/softmmu/Makefile.objs > +++ b/softmmu/Makefile.objs > @@ -1,14 +1,2 @@ > softmmu-main-y = softmmu/main.o > - > -obj-y += arch_init.o > -obj-y += cpus.o > -obj-y += cpu-throttle.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) > +main.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) OK now I understand. Please add "Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>" to the new patch with this snippet content. > diff --git a/softmmu/meson.build b/softmmu/meson.build > new file mode 100644 > index 0000000000..95d38df259 > --- /dev/null > +++ b/softmmu/meson.build > @@ -0,0 +1,10 @@ > +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( > + 'arch_init.c', > + 'balloon.c', > + 'cpus.c', > + 'cpu-throttle.c', > + 'ioport.c', > + 'memory.c', > + 'memory_mapping.c', > + 'qtest.c', > + 'vl.c')) >
diff --git a/softmmu/meson.build b/softmmu/meson.build index d4ac51b..95d38df 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,4 +1,4 @@ -specific_ss.add(files( +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( 'arch_init.c', 'balloon.c', 'cpus.c', @@ -6,4 +6,5 @@ specific_ss.add(files( 'ioport.c', 'memory.c', 'memory_mapping.c', - 'qtest.c')) + 'qtest.c', + 'vl.c'))
Leave out main.c, it's special due to fuzzing. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- softmmu/meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)