Patchwork [1/3] test: remove qemu-ga reference

login
register
mail settings
Submitter Michael Roth
Date March 20, 2012, 12:18 a.m.
Message ID <1332202706-25061-1-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/147695/
State New
Headers show

Comments

Michael Roth - March 20, 2012, 12:18 a.m.
This was added by mistake a while back.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 tests/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Hajnoczi - March 21, 2012, 11:37 a.m.
On Tue, Mar 20, 2012 at 12:18 AM, Michael Roth
<mdroth@linux.vnet.ibm.com> wrote:
> This was added by mistake a while back.
>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>  tests/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

After applying your series and rebuilding, I get the following error.
I checked that there are no auto-generated files left around after
make distclean.

$ make distclean
$ ./configure --target-list=x86_64-softmmu --disable-werror
$ make
  GEN   x86_64-softmmu/config-devices.mak
  GEN   config-all-devices.mak
  GEN   qemu-options.texi
  GEN   qemu-monitor.texi
  GEN   qemu-img-cmds.texi
  GEN   qemu-doc.html
  GEN   qemu-tech.html
  GEN   qemu.1
  GEN   qemu-img.1
  GEN   qemu-nbd.8
  GEN   QMP/qmp-commands.txt
  GEN   config-host.h
  GEN   trace.h
  GEN   qemu-options.def
  GEN   qmp-commands.h
  GEN   qapi-types.h
  GEN   qapi-visit.h
  GEN   /home/stefanha/qemu/qapi-generated/qga-qapi-types.h
  GEN   /home/stefanha/qemu/qapi-generated/qga-qapi-visit.h
  GEN   /home/stefanha/qemu/qapi-generated/qga-qmp-commands.h
  CC    qemu-ga.o
  CC    qga/commands.o
qga/commands.c:15:30: fatal error: qga-qmp-commands.h: No such file or directory
compilation terminated.
make: *** [qga/commands.o] Error 1
Michael Roth - March 21, 2012, 3:06 p.m.
On Wed, Mar 21, 2012 at 11:37:10AM +0000, Stefan Hajnoczi wrote:
> On Tue, Mar 20, 2012 at 12:18 AM, Michael Roth
> <mdroth@linux.vnet.ibm.com> wrote:
> > This was added by mistake a while back.
> >
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> > ---
> >  tests/Makefile |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> After applying your series and rebuilding, I get the following error.
> I checked that there are no auto-generated files left around after
> make distclean.

Shoot, sorry, I must've only tested make check after the change. It looks
like qemu-ga target is relying on that dependency being sourced from
tests/Makefile. I'll send an updated 1/3 that moves it to top-level
Makefile where it should be.

> 
> $ make distclean
> $ ./configure --target-list=x86_64-softmmu --disable-werror
> $ make
>   GEN   x86_64-softmmu/config-devices.mak
>   GEN   config-all-devices.mak
>   GEN   qemu-options.texi
>   GEN   qemu-monitor.texi
>   GEN   qemu-img-cmds.texi
>   GEN   qemu-doc.html
>   GEN   qemu-tech.html
>   GEN   qemu.1
>   GEN   qemu-img.1
>   GEN   qemu-nbd.8
>   GEN   QMP/qmp-commands.txt
>   GEN   config-host.h
>   GEN   trace.h
>   GEN   qemu-options.def
>   GEN   qmp-commands.h
>   GEN   qapi-types.h
>   GEN   qapi-visit.h
>   GEN   /home/stefanha/qemu/qapi-generated/qga-qapi-types.h
>   GEN   /home/stefanha/qemu/qapi-generated/qga-qapi-visit.h
>   GEN   /home/stefanha/qemu/qapi-generated/qga-qmp-commands.h
>   CC    qemu-ga.o
>   CC    qga/commands.o
> qga/commands.c:15:30: fatal error: qga-qmp-commands.h: No such file or directory
> compilation terminated.
> make: *** [qga/commands.o] Error 1
>

Patch

diff --git a/tests/Makefile b/tests/Makefile
index c78ade1..354fdbb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,7 @@  test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y)
 
 test-qmp-input-visitor.o test-qmp-output-visitor.o \
 test-string-input-visitor.o test-string-output-visitor.o \
-	test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
+	test-qmp-commands.o: QEMU_CFLAGS += -I $(qapi-dir)
 
 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py