[Qemu-devel] [PULL 0/4] Trivial patches for May 16 to May 20

[Qemu-devel] [PULL 0/4] Trivial patches for May 16 to May 20

[Stefan Hajnoczi]

The following changes since commit dcfd14b3741983c466ad92fa2ae91eeafce3e5d5:

  Delete unused tb_invalidate_page_range (2011-05-22 10:47:28 +0000)

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

I must have lost Stefan Weil's patch last pull request.  He noticed and it has
been added.

Peter Maydell (2):
      hw/realview.c: Remove duplicate #include line
      hw/sd.c: Don't complain about SDIO commands CMD52/CMD53

Stefan Weil (1):
      Fix typos in comments (chek -> check)

TeLeMan (1):
      piix_pci: fix piix3_set_irq_pic()

 exec.c            |    2 +-
 hw/piix_pci.c     |    2 +-
 hw/realview.c     |    1 -
 hw/sd.c           |   11 +++++++++++
 target-ppc/STATUS |    2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

-- 
1.7.4.4

[Qemu-devel] [PATCH 1/4] piix_pci: fix piix3_set_irq_pic()

[Stefan Hajnoczi]

From: TeLeMan <geleman@gmail.com>

If pic_irq is greater than 7, the irq level is always 0 on 32bits.

Signed-off-by: TeLeMan <geleman@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/piix_pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 7f1c4cc..85a320e 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -312,7 +312,7 @@ static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
 {
     qemu_set_irq(piix3->pic[pic_irq],
                  !!(piix3->pic_levels &
-                    (((1UL << PIIX_NUM_PIRQS) - 1) <<
+                    (((1ULL << PIIX_NUM_PIRQS) - 1) <<
                      (pic_irq * PIIX_NUM_PIRQS))));
 }
 
-- 
1.7.4.4

[Qemu-devel] [PATCH 2/4] hw/realview.c: Remove duplicate #include line

[Stefan Hajnoczi]

From: Peter Maydell <peter.maydell@linaro.org>

Remove a duplicate #include of sysbus.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/realview.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/hw/realview.c b/hw/realview.c
index 96fb9da..82f3d82 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -17,7 +17,6 @@
 #include "sysemu.h"
 #include "boards.h"
 #include "bitbang_i2c.h"
-#include "sysbus.h"
 #include "blockdev.h"
 
 #define SMP_BOOT_ADDR 0xe0000000
-- 
1.7.4.4

[Qemu-devel] [PATCH 3/4] hw/sd.c: Don't complain about SDIO commands CMD52/CMD53

[Stefan Hajnoczi]

From: Peter Maydell <peter.maydell@linaro.org>

The SDIO specification introduces new commands 52 and 53.
Handle as illegal command but do not complain on stderr,
as SDIO-aware OSes (including Linux) may legitimately use
these in their probing for presence of an SDIO card.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/sd.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/hw/sd.c b/hw/sd.c
index f44a970..cedfb20 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -1104,6 +1104,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
         }
         break;
 
+    case 52:
+    case 53:
+        /* CMD52, CMD53: reserved for SDIO cards
+         * (see the SDIO Simplified Specification V2.0)
+         * Handle as illegal command but do not complain
+         * on stderr, as some OSes may use these in their
+         * probing for presence of an SDIO card.
+         */
+        sd->card_status |= ILLEGAL_COMMAND;
+        return sd_r0;
+
     /* Application specific commands (Class 8) */
     case 55:	/* CMD55:  APP_CMD */
         if (sd->rca != rca)
-- 
1.7.4.4

[Qemu-devel] [PATCH 4/4] Fix typos in comments (chek -> check)

[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>
---
 exec.c            |    2 +-
 target-ppc/STATUS |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exec.c b/exec.c
index a6df2d6..563e974 100644
--- a/exec.c
+++ b/exec.c
@@ -2061,7 +2061,7 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
     /* we modify the TLB cache so that the dirty bit will be set again
        when accessing the range */
     start1 = (unsigned long)qemu_safe_ram_ptr(start);
-    /* Chek that we don't span multiple blocks - this breaks the
+    /* Check that we don't span multiple blocks - this breaks the
        address comparisons below.  */
     if ((unsigned long)qemu_safe_ram_ptr(end - 1) - start1
             != (end - 1) - start) {
diff --git a/target-ppc/STATUS b/target-ppc/STATUS
index 32e7ffa..c8e9018 100644
--- a/target-ppc/STATUS
+++ b/target-ppc/STATUS
@@ -11,7 +11,7 @@ INSN: instruction set.
 SPR:  special purpose registers set
       OK => all SPR registered (but some may be fake)
       KO => some SPR are missing or should be removed
-      ?  => uncheked
+      ?  => unchecked
 MSR:  MSR bits definitions
       OK => all MSR bits properly defined
       KO => MSR definition is incorrect
-- 
1.7.4.4

Re: [Qemu-devel] [PULL 0/4] Trivial patches for May 16 to May 20

[Aurelien Jarno]

On Sun, May 22, 2011 at 11:01:13PM +0100, Stefan Hajnoczi wrote:
> The following changes since commit dcfd14b3741983c466ad92fa2ae91eeafce3e5d5:
> 
>   Delete unused tb_invalidate_page_range (2011-05-22 10:47:28 +0000)
> 
> are available in the git repository at:
>   git://repo.or.cz/qemu/stefanha.git trivial-patches
> 
> I must have lost Stefan Weil's patch last pull request.  He noticed and it has
> been added.
> 
> Peter Maydell (2):
>       hw/realview.c: Remove duplicate #include line
>       hw/sd.c: Don't complain about SDIO commands CMD52/CMD53
> 
> Stefan Weil (1):
>       Fix typos in comments (chek -> check)
> 
> TeLeMan (1):
>       piix_pci: fix piix3_set_irq_pic()
> 
>  exec.c            |    2 +-
>  hw/piix_pci.c     |    2 +-
>  hw/realview.c     |    1 -
>  hw/sd.c           |   11 +++++++++++
>  target-ppc/STATUS |    2 +-
>  5 files changed, 14 insertions(+), 4 deletions(-)
> 

Thanks, pulled.


-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net