On 8/6/20 9:15 PM, Paolo Bonzini wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > Makefile.objs | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/Makefile.objs b/Makefile.objs > index a5c919d..0f3074b 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o > # single QEMU executable should support all CPUs and machines. > > ifeq ($(CONFIG_SOFTMMU),y) > -common-obj-y = block/ Left-over from 58/143 "meson: convert block"? > -common-obj-y += dump/ > +common-obj-y = dump/ > common-obj-y += monitor/ > common-obj-y += net/ > common-obj-$(CONFIG_LINUX) += fsdev/ >
On 07/08/20 15:37, Philippe Mathieu-Daudé wrote: > On 8/6/20 9:15 PM, Paolo Bonzini wrote: >> From: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> Makefile.objs | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/Makefile.objs b/Makefile.objs >> index a5c919d..0f3074b 100644 >> --- a/Makefile.objs >> +++ b/Makefile.objs >> @@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o >> # single QEMU executable should support all CPUs and machines. >> >> ifeq ($(CONFIG_SOFTMMU),y) >> -common-obj-y = block/ > > Left-over from 58/143 "meson: convert block"? More or less. It used to be bigger but it was merged back into 58 due to the introduction of storage-daemon. Good catch though, it broke bisectability because block/Makefile.objs has gone away in 58. Paolo >> -common-obj-y += dump/ >> +common-obj-y = dump/ >> common-obj-y += monitor/ >> common-obj-y += net/ >> common-obj-$(CONFIG_LINUX) += fsdev/ >> >
diff --git a/Makefile.objs b/Makefile.objs index a5c919d..0f3074b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -47,8 +47,7 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = block/ -common-obj-y += dump/ +common-obj-y = dump/ common-obj-y += monitor/ common-obj-y += net/ common-obj-$(CONFIG_LINUX) += fsdev/