[Qemu-devel] [PULL 0/7] Trivial patches for September 22 to October 5 2011

[Qemu-devel] [PULL 0/7] Trivial patches for September 22 to October 5 2011

[Stefan Hajnoczi]

The following changes since commit d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:

  etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)

are available in the git repository at:
  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Andreas Färber (1):
      target-arm: Fix typo

Antony Pavlov (2):
      gt64xxx.c: fix length modifier in DPRINTF format string
      gt64xxx.c: remove reference to non-existing ISD_handle field

Jan Kiszka (1):
      lsi: Fix tag reference in debug print

Paolo Bonzini (1):
      makefile: extract tools-obj-y

Stefan Weil (2):
      Fix mismatching allocation and deallocation
      linux-user: Remove unused code

 Makefile            |    9 +++++----
 console.c           |    2 +-
 hw/gt64xxx.c        |   13 +++++++------
 hw/lsi53c895a.c     |    2 +-
 linux-user/signal.c |    5 +----
 target-arm/helper.c |    2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)

-- 
1.7.6.3

[Qemu-devel] [PATCH 1/7] makefile: extract tools-obj-y

[Stefan Hajnoczi]

From: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6ed3194..5723108 100644
--- a/Makefile
+++ b/Makefile
@@ -145,11 +145,12 @@ endif
 qemu-img.o: qemu-img-cmds.h
 qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o qemu-ga.o: $(GENERATED_HEADERS)
 
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
+tools-obj-y = qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) \
+        $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
 
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
-
-qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
+qemu-img$(EXESUF): qemu-img.o $(tools-obj-y)
+qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y)
+qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y)
 
 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
-- 
1.7.6.3

[Qemu-devel] [PATCH 2/7] gt64xxx.c: fix length modifier in DPRINTF format string

[Stefan Hajnoczi]

From: Antony Pavlov <antonynpavlov@gmail.com>

The commit fc2bf44972349b078d8310466c3866615500e67f
changed the type of val argument of the function gt64120_writel()
from uint32_t to uint64_t, so we need to change the corresponding
length modifier from "%x" to "%" PRIx64.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/gt64xxx.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 1c34253..73454ff 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -543,19 +543,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
         /* not really implemented */
         s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
         s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
-        DPRINTF("INTRCAUSE %x\n", val);
+        DPRINTF("INTRCAUSE %" PRIx64 "\n", val);
         break;
     case GT_INTRMASK:
         s->regs[saddr] = val & 0x3c3ffffe;
-        DPRINTF("INTRMASK %x\n", val);
+        DPRINTF("INTRMASK %" PRIx64 "\n", val);
         break;
     case GT_PCI0_ICMASK:
         s->regs[saddr] = val & 0x03fffffe;
-        DPRINTF("ICMASK %x\n", val);
+        DPRINTF("ICMASK %" PRIx64 "\n", val);
         break;
     case GT_PCI0_SERR0MASK:
         s->regs[saddr] = val & 0x0000003f;
-        DPRINTF("SERR0MASK %x\n", val);
+        DPRINTF("SERR0MASK %" PRIx64 "\n", val);
         break;
 
     /* Reserved when only PCI_0 is configured. */
-- 
1.7.6.3

[Qemu-devel] [PATCH 3/7] gt64xxx.c: remove reference to non-existing ISD_handle field

[Stefan Hajnoczi]

From: Antony Pavlov <antonynpavlov@gmail.com>

The commit fc2bf44972349b078d8310466c3866615500e67f
removed ISD_handle field from struct GT64120State,
so remove the field from DPRINTF too.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/gt64xxx.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 73454ff..432683a 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -275,8 +275,9 @@ static void gt64120_isd_mapping(GT64120State *s)
     check_reserved_space(&start, &length);
     length = 0x1000;
     /* Map new address */
-    DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx" -> "TARGET_FMT_plx"@"TARGET_FMT_plx", %x\n", s->ISD_length, s->ISD_start,
-            length, start, s->ISD_handle);
+    DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx
+        " -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n",
+        s->ISD_length, s->ISD_start, length, start);
     s->ISD_start = start;
     s->ISD_length = length;
     memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem);
-- 
1.7.6.3

[Qemu-devel] [PATCH 4/7] lsi: Fix tag reference in debug print

[Stefan Hajnoczi]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/lsi53c895a.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 75a03a7..e077ec0 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -697,7 +697,7 @@ static int lsi_queue_req(LSIState *s, SCSIRequest *req, uint32_t len)
         lsi_reselect(s, p);
         return 0;
     } else {
-        DPRINTF("Queueing IO tag=0x%x\n", tag);
+        DPRINTF("Queueing IO tag=0x%x\n", p->tag);
         p->pending = len;
         return 1;
     }
-- 
1.7.6.3

[Qemu-devel] [PATCH 5/7] target-arm: Fix typo

[Stefan Hajnoczi]

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

The command line option is called -kernel, not -kenrel.

Cc: Paul Brook <paul@codesourcery.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 target-arm/helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index d3a3ba2..e2428eb 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -298,7 +298,7 @@ void cpu_reset(CPUARMState *env)
         if (rom) {
             /* We should really use ldl_phys here, in case the guest
                modified flash and reset itself.  However images
-               loaded via -kenrel have not been copied yet, so load the
+               loaded via -kernel have not been copied yet, so load the
                values directly from there.  */
             env->regs[13] = ldl_p(rom);
             pc = ldl_p(rom + 4);
-- 
1.7.6.3

[Qemu-devel] [PATCH 6/7] Fix mismatching allocation and deallocation

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

This error was reported by cppcheck.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 console.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/console.c b/console.c
index 6dfcc47..e43de92 100644
--- a/console.c
+++ b/console.c
@@ -1538,7 +1538,7 @@ int text_console_init(QemuOpts *opts, CharDriverState **_chr)
     }
 
     if (!s) {
-        free(chr);
+        g_free(chr);
         return -EBUSY;
     }
 
-- 
1.7.6.3

[Qemu-devel] [PATCH 7/7] linux-user: Remove unused code

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

The code is unused since 8 years, so remove it.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 linux-user/signal.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index 89276eb..40c5eb18 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -1274,10 +1274,7 @@ setup_return(CPUState *env, struct target_sigaction *ka,
 
 		if (__put_user(retcodes[idx], rc))
 			return 1;
-#if 0
-		flush_icache_range((abi_ulong)rc,
-				   (abi_ulong)(rc + 1));
-#endif
+
 		retcode = rc_addr + thumb;
 	}
 
-- 
1.7.6.3

Re: [Qemu-devel] [PULL 0/7] Trivial patches for September 22 to October 5 2011

[Anthony Liguori]

On 10/05/2011 03:47 AM, Stefan Hajnoczi wrote:
> The following changes since commit d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:
>
>    etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)
>
> are available in the git repository at:
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Andreas Färber (1):
>        target-arm: Fix typo
>
> Antony Pavlov (2):
>        gt64xxx.c: fix length modifier in DPRINTF format string
>        gt64xxx.c: remove reference to non-existing ISD_handle field
>
> Jan Kiszka (1):
>        lsi: Fix tag reference in debug print
>
> Paolo Bonzini (1):
>        makefile: extract tools-obj-y
>
> Stefan Weil (2):
>        Fix mismatching allocation and deallocation
>        linux-user: Remove unused code
>
>   Makefile            |    9 +++++----
>   console.c           |    2 +-
>   hw/gt64xxx.c        |   13 +++++++------
>   hw/lsi53c895a.c     |    2 +-
>   linux-user/signal.c |    5 +----
>   target-arm/helper.c |    2 +-
>   6 files changed, 16 insertions(+), 17 deletions(-)
>