[Qemu-devel] [PULL 0/5] Trivial patches for 14 to 19 January 2012

[Qemu-devel] [PULL 0/5] Trivial patches for 14 to 19 January 2012

[Stefan Hajnoczi]

The following changes since commit 8c4ec5c0269bda18bb777a64b2008088d1c632dc:

  pxa2xx_keypad: fix unbalanced parenthesis. (2012-01-17 02:14:42 +0100)

are available in the git repository at:
  git://github.com/stefanha/qemu.git trivial-patches

Andreas Färber (4):
      qemu-tool: Fix mixup of int64 and int64_t
      lm32: Fix mixup of uint32 and uint32_t
      Makefile: Exclude tests/Makefile in unconfigured tree
      Makefile: Remove generated headers on clean

Stefan Weil (1):
      tests: Silence gtester in Makefile

 Makefile                      |    3 +++
 hw/milkymist-vgafb_template.h |    2 +-
 qemu-tool.c                   |    4 ++--
 tests/Makefile                |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

-- 
1.7.8.3

[Qemu-devel] [PATCH 1/5] qemu-tool: Fix mixup of int64 and int64_t

[Stefan Hajnoczi]

From: Andreas Färber <afaerber@suse.de>

Commit cbcfa0418f0c196afa765f5c9837b9344d1adcf3 (link the main loop and
its dependencies into the tools) introduced stray usages of int64.

Use int64_t instead.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu-tool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-tool.c b/qemu-tool.c
index c73bf71..6b69668 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -59,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-int64 cpu_get_clock(void)
+int64_t cpu_get_clock(void)
 {
     abort();
 }
 
-int64 cpu_get_icount(void)
+int64_t cpu_get_icount(void)
 {
     abort();
 }
-- 
1.7.8.3

[Qemu-devel] [PATCH 2/5] tests: Silence gtester in Makefile

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

This prettifies make output a little by avoiding a very long line.
As gtester prints the checks when they are run, no information is lost.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 tests/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index efde63a..55e8eb0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,4 +36,4 @@ test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-ob
 
 .PHONY: check
 check: $(CHECKS)
-	gtester $(CHECKS)
+	$(call quiet-command, gtester $(CHECKS), "  CHECK")
-- 
1.7.8.3

[Qemu-devel] [PATCH 3/5] lm32: Fix mixup of uint32 and uint32_t

[Stefan Hajnoczi]

From: Andreas Färber <afaerber@suse.de>

Commit d23948b15a9920fb7f6374b55a6db1ecff81f3ee (lm32: add Milkymist
VGAFB support) introduced a stray usage of the softfloat uint32 type.

Use uint32_t instead.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/milkymist-vgafb_template.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h
index 69af9ef..1d33ee8 100644
--- a/hw/milkymist-vgafb_template.h
+++ b/hw/milkymist-vgafb_template.h
@@ -39,7 +39,7 @@
 #elif BITS == 24
 #define COPY_PIXEL(to, r, g, b)                    \
     do {                                           \
-        uint32 tmp = rgb_to_pixel24(r, g, b);      \
+        uint32_t tmp = rgb_to_pixel24(r, g, b);    \
         *(to++) =         tmp & 0xff;              \
         *(to++) =  (tmp >> 8) & 0xff;              \
         *(to++) = (tmp >> 16) & 0xff;              \
-- 
1.7.8.3

[Qemu-devel] [PATCH 4/5] Makefile: Exclude tests/Makefile in unconfigured tree

[Stefan Hajnoczi]

From: Andreas Färber <andreas.faerber@web.de>

Since commit dbfe06c62ccedc5b64e1c6466445133dd50f6de1 (build:
split unit test builds to a separate makefile fragment),
in absence of config-host.mak an undefined $(SRC_PATH) breaks
`make distclean' due to /tests/Makefile not being include'able.

Fix by only including when config-host.mak is present.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 2bbc547..d356f07 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,9 @@ qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
 
 gen-out-type = $(subst .,-,$(suffix $@))
 
+ifneq ($(wildcard config-host.mak),)
 include $(SRC_PATH)/tests/Makefile
+endif
 
 $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py
-- 
1.7.8.3

[Qemu-devel] [PATCH 5/5] Makefile: Remove generated headers on clean

[Stefan Hajnoczi]

From: Andreas Färber <andreas.faerber@web.de>

Running `make distclean' followed by a new out-of-tree build would fail
due to stale generated QMP headers in the tree.

Commit 611b727374ad76fb0078ea65bc1387194913980e (Makefile: remove more
generated files on clean) made sure generated sources are removed.

Also remove generated headers introduced in commit
e3193601c84558c303b1773379da76fce80c0a56 (qapi: use middle mode in QMP
server).

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index d356f07..917fb9b 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,7 @@ clean:
 	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
 	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
 	rm -f trace-dtrace.h trace-dtrace.h-timestamp
+	rm -f $(GENERATED_HEADERS)
 	rm -f $(GENERATED_SOURCES)
 	rm -rf $(qapi-dir)
 	$(MAKE) -C tests/tcg clean
-- 
1.7.8.3

Re: [Qemu-devel] [PULL 0/5] Trivial patches for 14 to 19 January 2012

[Anthony Liguori]

On 01/19/2012 04:32 AM, Stefan Hajnoczi wrote:
> The following changes since commit 8c4ec5c0269bda18bb777a64b2008088d1c632dc:
>
>    pxa2xx_keypad: fix unbalanced parenthesis. (2012-01-17 02:14:42 +0100)
>
> are available in the git repository at:
>    git://github.com/stefanha/qemu.git trivial-patches

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Andreas Färber (4):
>        qemu-tool: Fix mixup of int64 and int64_t
>        lm32: Fix mixup of uint32 and uint32_t
>        Makefile: Exclude tests/Makefile in unconfigured tree
>        Makefile: Remove generated headers on clean
>
> Stefan Weil (1):
>        tests: Silence gtester in Makefile
>
>   Makefile                      |    3 +++
>   hw/milkymist-vgafb_template.h |    2 +-
>   qemu-tool.c                   |    4 ++--
>   tests/Makefile                |    2 +-
>   4 files changed, 7 insertions(+), 4 deletions(-)
>