mirror of https://github.com/proxmox/mirror_qemu
Merge branch 'trivial-patches' of git://repo.or.cz/qemu/stefanha
* 'trivial-patches' of git://repo.or.cz/qemu/stefanha: Fix typos in comments (chek -> check) hw/sd.c: Don't complain about SDIO commands CMD52/CMD53 hw/realview.c: Remove duplicate #include line piix_pci: fix piix3_set_irq_pic()master
commit
6eba5c82cf
2
exec.c
2
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
|
/* we modify the TLB cache so that the dirty bit will be set again
|
||||||
when accessing the range */
|
when accessing the range */
|
||||||
start1 = (unsigned long)qemu_safe_ram_ptr(start);
|
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. */
|
address comparisons below. */
|
||||||
if ((unsigned long)qemu_safe_ram_ptr(end - 1) - start1
|
if ((unsigned long)qemu_safe_ram_ptr(end - 1) - start1
|
||||||
!= (end - 1) - start) {
|
!= (end - 1) - start) {
|
||||||
|
|
|
@ -312,7 +312,7 @@ static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
|
||||||
{
|
{
|
||||||
qemu_set_irq(piix3->pic[pic_irq],
|
qemu_set_irq(piix3->pic[pic_irq],
|
||||||
!!(piix3->pic_levels &
|
!!(piix3->pic_levels &
|
||||||
(((1UL << PIIX_NUM_PIRQS) - 1) <<
|
(((1ULL << PIIX_NUM_PIRQS) - 1) <<
|
||||||
(pic_irq * PIIX_NUM_PIRQS))));
|
(pic_irq * PIIX_NUM_PIRQS))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
#include "boards.h"
|
#include "boards.h"
|
||||||
#include "bitbang_i2c.h"
|
#include "bitbang_i2c.h"
|
||||||
#include "sysbus.h"
|
|
||||||
#include "blockdev.h"
|
#include "blockdev.h"
|
||||||
|
|
||||||
#define SMP_BOOT_ADDR 0xe0000000
|
#define SMP_BOOT_ADDR 0xe0000000
|
||||||
|
|
11
hw/sd.c
11
hw/sd.c
|
@ -1104,6 +1104,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
|
||||||
}
|
}
|
||||||
break;
|
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) */
|
/* Application specific commands (Class 8) */
|
||||||
case 55: /* CMD55: APP_CMD */
|
case 55: /* CMD55: APP_CMD */
|
||||||
if (sd->rca != rca)
|
if (sd->rca != rca)
|
||||||
|
|
|
@ -11,7 +11,7 @@ INSN: instruction set.
|
||||||
SPR: special purpose registers set
|
SPR: special purpose registers set
|
||||||
OK => all SPR registered (but some may be fake)
|
OK => all SPR registered (but some may be fake)
|
||||||
KO => some SPR are missing or should be removed
|
KO => some SPR are missing or should be removed
|
||||||
? => uncheked
|
? => unchecked
|
||||||
MSR: MSR bits definitions
|
MSR: MSR bits definitions
|
||||||
OK => all MSR bits properly defined
|
OK => all MSR bits properly defined
|
||||||
KO => MSR definition is incorrect
|
KO => MSR definition is incorrect
|
||||||
|
|
Loading…
Reference in New Issue