[Qemu-devel] [PATCH 1/3] mainstone: fix name of the allocated memory for roms

[Qemu-devel] [PATCH 1/3] mainstone: fix name of the allocated memory for roms

[Dmitry Eremin-Solenikov]

Mainstone board has two flash chips (emulated by two ram regions), however
currently code tries to allocate them with the same name, which fails.
Fix that to make mainstone emulation work again.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 hw/mainstone.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/mainstone.c b/hw/mainstone.c
index efa2959..d8e41cf 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -106,7 +106,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
         }
 
         if (!pflash_cfi01_register(mainstone_flash_base[i],
-                                   qemu_ram_alloc(NULL, "mainstone.flash",
+                                   qemu_ram_alloc(NULL, i ? "mainstone.flash1" :
+                                                  "mainstone.flash0",
                                                   MAINSTONE_FLASH),
                                    dinfo->bdrv, sector_len,
                                    MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0,
-- 
1.7.2.3

[Qemu-devel] [PATCH 2/3] Scoop: fix access to registers from second instance

[Dmitry Eremin-Solenikov]

Second instance of scoop contains registers shifted to 0x40 from the start
of the page. Instead of messing with register mapping, just limit register
address to 0x00..0x3f.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 hw/zaurus.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/zaurus.c b/hw/zaurus.c
index 54ec3f0..36be94a 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -70,7 +70,7 @@ static uint32_t scoop_readb(void *opaque, target_phys_addr_t addr)
 {
     ScoopInfo *s = (ScoopInfo *) opaque;
 
-    switch (addr) {
+    switch (addr & 0x3f) {
     case SCOOP_MCR:
         return s->mcr;
     case SCOOP_CDR:
@@ -104,7 +104,7 @@ static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
     ScoopInfo *s = (ScoopInfo *) opaque;
     value &= 0xffff;
 
-    switch (addr) {
+    switch (addr & 0x3f) {
     case SCOOP_MCR:
         s->mcr = value;
         break;
-- 
1.7.2.3

[Qemu-devel] [PATCH 3/3] pxa2xx: fix vmstate_pxa2xx_i2c

[Dmitry Eremin-Solenikov]

vmstate_pxa2xx_i2c incorrectly recursed to itself instead of going
to store slave device. Fix that stop stop qemu from segfaulting
during savevm for pxa2xx-based devices.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 hw/pxa2xx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index ab524a7..6e72a5c 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -1476,7 +1476,7 @@ static const VMStateDescription vmstate_pxa2xx_i2c = {
         VMSTATE_UINT8(ibmr, PXA2xxI2CState),
         VMSTATE_UINT8(data, PXA2xxI2CState),
         VMSTATE_STRUCT_POINTER(slave, PXA2xxI2CState,
-                               vmstate_pxa2xx_i2c, PXA2xxI2CSlaveState *),
+                               vmstate_pxa2xx_i2c_slave, PXA2xxI2CSlaveState *),
         VMSTATE_END_OF_LIST()
     }
 };
-- 
1.7.2.3

[Qemu-devel] Re: [PATCH 1/3] mainstone: fix name of the allocated memory for roms

[Dmitry Eremin-Solenikov]

Hi,

Sorry, what about these patches?

On 1/13/11, Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> wrote:
> Mainstone board has two flash chips (emulated by two ram regions), however
> currently code tries to allocate them with the same name, which fails.
> Fix that to make mainstone emulation work again.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  hw/mainstone.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/mainstone.c b/hw/mainstone.c
> index efa2959..d8e41cf 100644
> --- a/hw/mainstone.c
> +++ b/hw/mainstone.c
> @@ -106,7 +106,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
>          }
>
>          if (!pflash_cfi01_register(mainstone_flash_base[i],
> -                                   qemu_ram_alloc(NULL, "mainstone.flash",
> +                                   qemu_ram_alloc(NULL, i ?
> "mainstone.flash1" :
> +                                                  "mainstone.flash0",
>                                                    MAINSTONE_FLASH),
>                                     dinfo->bdrv, sector_len,
>                                     MAINSTONE_FLASH / sector_len, 4, 0, 0,
> 0, 0,
> --
> 1.7.2.3
>
>


-- 
With best wishes
Dmitry

Re: [Qemu-devel] [PATCH 1/3] mainstone: fix name of the allocated memory for roms

[Aurelien Jarno]

On Thu, Jan 13, 2011 at 06:37:10PM +0300, Dmitry Eremin-Solenikov wrote:
> Mainstone board has two flash chips (emulated by two ram regions), however
> currently code tries to allocate them with the same name, which fails.
> Fix that to make mainstone emulation work again.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  hw/mainstone.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/mainstone.c b/hw/mainstone.c
> index efa2959..d8e41cf 100644
> --- a/hw/mainstone.c
> +++ b/hw/mainstone.c
> @@ -106,7 +106,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
>          }
>  
>          if (!pflash_cfi01_register(mainstone_flash_base[i],
> -                                   qemu_ram_alloc(NULL, "mainstone.flash",
> +                                   qemu_ram_alloc(NULL, i ? "mainstone.flash1" :
> +                                                  "mainstone.flash0",
>                                                    MAINSTONE_FLASH),
>                                     dinfo->bdrv, sector_len,
>                                     MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0,
> -- 
> 1.7.2.3
> 

Thanks, all three patches applied.

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