From 09de0f469c3c2a277c7874f6c60992c8b94719a9 Mon Sep 17 00:00:00 2001 From: TeLeMan Date: Mon, 16 May 2011 19:50:55 +0800 Subject: [PATCH 1/4] piix_pci: fix piix3_set_irq_pic() If pic_irq is greater than 7, the irq level is always 0 on 32bits. Signed-off-by: TeLeMan Signed-off-by: Stefan Hajnoczi --- hw/piix_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 7f1c4cca31..85a320e729 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)))); } From 1cd087251a488f8731efee4118332d0d6abdd815 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 19 May 2011 16:21:57 +0100 Subject: [PATCH 2/4] hw/realview.c: Remove duplicate #include line Remove a duplicate #include of sysbus.h. Signed-off-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- hw/realview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/realview.c b/hw/realview.c index 96fb9da241..82f3d82d44 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 From 39e594dbcd897849f2ca95b3310ea00fff29ea99 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 20 May 2011 10:11:53 +0100 Subject: [PATCH 3/4] hw/sd.c: Don't complain about SDIO commands CMD52/CMD53 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 Signed-off-by: Stefan Hajnoczi --- hw/sd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/sd.c b/hw/sd.c index f44a97092b..cedfb20249 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) From a57d23e4f7e7e81c839a7b53a973ac71eefe91da Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 30 Apr 2011 22:49:26 +0200 Subject: [PATCH 4/4] Fix typos in comments (chek -> check) Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- exec.c | 2 +- target-ppc/STATUS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index a6df2d6139..563e9743f9 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 32e7ffa493..c8e9018bfc 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