[Qemu-devel] [PULL] Trivial patches for May 22 to May 29 2011

[Qemu-devel] [PULL] Trivial patches for May 22 to May 29 2011

[Stefan Hajnoczi]

The following changes since commit 2eb9f241824d000fcd90bd7f4b49e40b88e62975:

  bitbang_i2c: Fix spurious slave read after NACK (2011-05-28 16:20:43 +0200)

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

Stefan Weil (2):
      pflash_cfi02: Fix a typo in debug code (TARGET_FMT_pld -> TARGET_FMT_plx)
      Fix spelling in comment (additon -> addition)

 hw/pflash_cfi02.c |    2 +-
 tcg/tcg.h         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.7.4.4

[Qemu-devel] [PATCH 1/2] pflash_cfi02: Fix a typo in debug code (TARGET_FMT_pld -> TARGET_FMT_plx)

[Stefan Hajnoczi]

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

Thanks to Tobias Hoffmann <th55@gmx.de> for this patch.

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

diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index 8fdafe6..725cd1e 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -188,7 +188,7 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset,
         default:
             goto flash_read;
         }
-        DPRINTF("%s: ID " TARGET_FMT_pld " %x\n", __func__, boff, ret);
+        DPRINTF("%s: ID " TARGET_FMT_plx " %x\n", __func__, boff, ret);
         break;
     case 0xA0:
     case 0x10:
-- 
1.7.4.4

[Qemu-devel] [PATCH 2/2] Fix spelling in comment (additon -> addition)

[Stefan Hajnoczi]

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

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

diff --git a/tcg/tcg.h b/tcg/tcg.h
index 2b985ac..746378a 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -129,7 +129,7 @@ typedef tcg_target_ulong TCGArg;
    We use plain int by default to avoid this runtime overhead.
    Users of tcg_gen_* don't need to know about any of this, and should
    treat TCGv as an opaque type.
-   In additon we do typechecking for different types of variables.  TCGv_i32
+   In addition we do typechecking for different types of variables.  TCGv_i32
    and TCGv_i64 are 32/64-bit variables respectively.  TCGv and TCGv_ptr
    are aliases for target_ulong and host pointer sized values respectively.
  */
-- 
1.7.4.4

Re: [Qemu-devel] [PULL] Trivial patches for May 22 to May 29 2011

[Anthony Liguori]

On 05/29/2011 06:36 AM, Stefan Hajnoczi wrote:
> The following changes since commit 2eb9f241824d000fcd90bd7f4b49e40b88e62975:
>
>    bitbang_i2c: Fix spurious slave read after NACK (2011-05-28 16:20:43 +0200)
>
> are available in the git repository at:
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches
>
> Stefan Weil (2):
>        pflash_cfi02: Fix a typo in debug code (TARGET_FMT_pld ->  TARGET_FMT_plx)
>        Fix spelling in comment (additon ->  addition)
>
>   hw/pflash_cfi02.c |    2 +-
>   tcg/tcg.h         |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>

Pulled.  Thanks.

Regards,

Anthony Liguori