* [Qemu-devel] [PULL 0/2] target-mips queue
@ 2016-09-29 13:19 Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 1/2] MAINTAINERS: update target-mips maintainers Yongbok Kim
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yongbok Kim @ 2016-09-29 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aurelien
Hi,
This is my first pull-req for MIPS.
Thanks,
Yongbok
The following changes since commit c640f2849ee8775fe1bbd7a2772610aa77816f9f:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2016-09-28 23:02:56 +0100)
are available in the git repository at:
git://github.com/yongbok/upstream-qemu.git tags/mips-20160929
for you to fetch changes up to 73bfa8c0e0295df92d5fe61e0149db7b36cdc0c4:
hw/dma: vmstateify rc4030 (2016-09-29 12:07:51 +0100)
----------------------------------------------------------------
MIPS patches 2016-09-29
Changes:
* MIPS Maintainer update
* vmstateify rc4030
----------------------------------------------------------------
Dr. David Alan Gilbert (1):
hw/dma: vmstateify rc4030
Leon Alrae (1):
MAINTAINERS: update target-mips maintainers
MAINTAINERS | 2 +-
hw/dma/rc4030.c | 81 +++++++++++++++++++--------------------------------------
2 files changed, 28 insertions(+), 55 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 1/2] MAINTAINERS: update target-mips maintainers
2016-09-29 13:19 [Qemu-devel] [PULL 0/2] target-mips queue Yongbok Kim
@ 2016-09-29 13:19 ` Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 2/2] hw/dma: vmstateify rc4030 Yongbok Kim
2016-09-29 18:52 ` [Qemu-devel] [PULL 0/2] target-mips queue Peter Maydell
2 siblings, 0 replies; 6+ messages in thread
From: Yongbok Kim @ 2016-09-29 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aurelien, Leon Alrae
From: Leon Alrae <leon.alrae@imgtec.com>
Yongbok Kim takes over the target-mips maintenance from me.
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Acked-by: Yongbok Kim <yongbok.kim@imgtec.com>
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index f3c1f7f..8b18ad0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -145,7 +145,7 @@ F: disas/microblaze.c
MIPS
M: Aurelien Jarno <aurelien@aurel32.net>
-M: Leon Alrae <leon.alrae@imgtec.com>
+M: Yongbok Kim <yongbok.kim@imgtec.com>
S: Maintained
F: target-mips/
F: hw/mips/
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 2/2] hw/dma: vmstateify rc4030
2016-09-29 13:19 [Qemu-devel] [PULL 0/2] target-mips queue Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 1/2] MAINTAINERS: update target-mips maintainers Yongbok Kim
@ 2016-09-29 13:19 ` Yongbok Kim
2016-09-29 18:52 ` [Qemu-devel] [PULL 0/2] target-mips queue Peter Maydell
2 siblings, 0 replies; 6+ messages in thread
From: Yongbok Kim @ 2016-09-29 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, aurelien, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Convert rc4030 to VMState.
Now saving the whole 16 entries rather than 15.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Tested-by: Hervé Poussineau <hpoussin@reactos.org>
[Yongbok Kim: edited commit message]
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
---
hw/dma/rc4030.c | 81 +++++++++++++++++++--------------------------------------
1 file changed, 27 insertions(+), 54 deletions(-)
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 2f2576f..17c8518 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -616,34 +616,9 @@ static void rc4030_reset(DeviceState *dev)
qemu_irq_lower(s->jazz_bus_irq);
}
-static int rc4030_load(QEMUFile *f, void *opaque, int version_id)
+static int rc4030_post_load(void *opaque, int version_id)
{
rc4030State* s = opaque;
- int i, j;
-
- if (version_id != 2)
- return -EINVAL;
-
- s->config = qemu_get_be32(f);
- s->invalid_address_register = qemu_get_be32(f);
- for (i = 0; i < 8; i++)
- for (j = 0; j < 4; j++)
- s->dma_regs[i][j] = qemu_get_be32(f);
- s->dma_tl_base = qemu_get_be32(f);
- s->dma_tl_limit = qemu_get_be32(f);
- s->cache_maint = qemu_get_be32(f);
- s->remote_failed_address = qemu_get_be32(f);
- s->memory_failed_address = qemu_get_be32(f);
- s->cache_ptag = qemu_get_be32(f);
- s->cache_ltag = qemu_get_be32(f);
- s->cache_bmask = qemu_get_be32(f);
- s->memory_refresh_rate = qemu_get_be32(f);
- s->nvram_protect = qemu_get_be32(f);
- for (i = 0; i < 15; i++)
- s->rem_speed[i] = qemu_get_be32(f);
- s->imr_jazz = qemu_get_be32(f);
- s->isr_jazz = qemu_get_be32(f);
- s->itr = qemu_get_be32(f);
set_next_tick(s);
update_jazz_irq(s);
@@ -651,32 +626,31 @@ static int rc4030_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
-static void rc4030_save(QEMUFile *f, void *opaque)
-{
- rc4030State* s = opaque;
- int i, j;
-
- qemu_put_be32(f, s->config);
- qemu_put_be32(f, s->invalid_address_register);
- for (i = 0; i < 8; i++)
- for (j = 0; j < 4; j++)
- qemu_put_be32(f, s->dma_regs[i][j]);
- qemu_put_be32(f, s->dma_tl_base);
- qemu_put_be32(f, s->dma_tl_limit);
- qemu_put_be32(f, s->cache_maint);
- qemu_put_be32(f, s->remote_failed_address);
- qemu_put_be32(f, s->memory_failed_address);
- qemu_put_be32(f, s->cache_ptag);
- qemu_put_be32(f, s->cache_ltag);
- qemu_put_be32(f, s->cache_bmask);
- qemu_put_be32(f, s->memory_refresh_rate);
- qemu_put_be32(f, s->nvram_protect);
- for (i = 0; i < 15; i++)
- qemu_put_be32(f, s->rem_speed[i]);
- qemu_put_be32(f, s->imr_jazz);
- qemu_put_be32(f, s->isr_jazz);
- qemu_put_be32(f, s->itr);
-}
+static const VMStateDescription vmstate_rc4030 = {
+ .name = "rc4030",
+ .version_id = 3,
+ .post_load = rc4030_post_load,
+ .fields = (VMStateField []) {
+ VMSTATE_UINT32(config, rc4030State),
+ VMSTATE_UINT32(invalid_address_register, rc4030State),
+ VMSTATE_UINT32_2DARRAY(dma_regs, rc4030State, 8, 4),
+ VMSTATE_UINT32(dma_tl_base, rc4030State),
+ VMSTATE_UINT32(dma_tl_limit, rc4030State),
+ VMSTATE_UINT32(cache_maint, rc4030State),
+ VMSTATE_UINT32(remote_failed_address, rc4030State),
+ VMSTATE_UINT32(memory_failed_address, rc4030State),
+ VMSTATE_UINT32(cache_ptag, rc4030State),
+ VMSTATE_UINT32(cache_ltag, rc4030State),
+ VMSTATE_UINT32(cache_bmask, rc4030State),
+ VMSTATE_UINT32(memory_refresh_rate, rc4030State),
+ VMSTATE_UINT32(nvram_protect, rc4030State),
+ VMSTATE_UINT32_ARRAY(rem_speed, rc4030State, 16),
+ VMSTATE_UINT32(imr_jazz, rc4030State),
+ VMSTATE_UINT32(isr_jazz, rc4030State),
+ VMSTATE_UINT32(itr, rc4030State),
+ VMSTATE_END_OF_LIST()
+ }
+};
static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, int len, int is_write)
{
@@ -753,8 +727,6 @@ static void rc4030_initfn(Object *obj)
sysbus_init_irq(sysbus, &s->timer_irq);
sysbus_init_irq(sysbus, &s->jazz_bus_irq);
- register_savevm(NULL, "rc4030", 0, 2, rc4030_save, rc4030_load, s);
-
sysbus_init_mmio(sysbus, &s->iomem_chipset);
sysbus_init_mmio(sysbus, &s->iomem_jazzio);
}
@@ -813,6 +785,7 @@ static void rc4030_class_init(ObjectClass *klass, void *class_data)
dc->realize = rc4030_realize;
dc->unrealize = rc4030_unrealize;
dc->reset = rc4030_reset;
+ dc->vmsd = &vmstate_rc4030;
}
static const TypeInfo rc4030_info = {
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] target-mips queue
2016-09-29 13:19 [Qemu-devel] [PULL 0/2] target-mips queue Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 1/2] MAINTAINERS: update target-mips maintainers Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 2/2] hw/dma: vmstateify rc4030 Yongbok Kim
@ 2016-09-29 18:52 ` Peter Maydell
2016-09-30 8:16 ` Yongbok Kim
2 siblings, 1 reply; 6+ messages in thread
From: Peter Maydell @ 2016-09-29 18:52 UTC (permalink / raw)
To: Yongbok Kim; +Cc: QEMU Developers, Aurelien Jarno, Leon Alrae
On 29 September 2016 at 06:19, Yongbok Kim <yongbok.kim@imgtec.com> wrote:
> Hi,
>
> This is my first pull-req for MIPS.
>
> Thanks,
> Yongbok
>
> The following changes since commit c640f2849ee8775fe1bbd7a2772610aa77816f9f:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2016-09-28 23:02:56 +0100)
>
> are available in the git repository at:
>
> git://github.com/yongbok/upstream-qemu.git tags/mips-20160929
>
> for you to fetch changes up to 73bfa8c0e0295df92d5fe61e0149db7b36cdc0c4:
>
> hw/dma: vmstateify rc4030 (2016-09-29 12:07:51 +0100)
>
> ----------------------------------------------------------------
> MIPS patches 2016-09-29
>
> Changes:
> * MIPS Maintainer update
> * vmstateify rc4030
Your GPG key hasn't been signed by anybody -- are you in a position
to get it signed by somebody else who can in-person verify your identity
(eg Leon)?
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] target-mips queue
2016-09-29 18:52 ` [Qemu-devel] [PULL 0/2] target-mips queue Peter Maydell
@ 2016-09-30 8:16 ` Yongbok Kim
2016-09-30 22:45 ` Peter Maydell
0 siblings, 1 reply; 6+ messages in thread
From: Yongbok Kim @ 2016-09-30 8:16 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers, Aurelien Jarno, Leon Alrae
>
> Your GPG key hasn't been signed by anybody -- are you in a position
> to get it signed by somebody else who can in-person verify your identity
> (eg Leon)?
>
> thanks
> -- PMM
>
Hi Peter,
We have just arranged the key signing and Leon has signed my key.
Thanks,
Yongbok
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] target-mips queue
2016-09-30 8:16 ` Yongbok Kim
@ 2016-09-30 22:45 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2016-09-30 22:45 UTC (permalink / raw)
To: Yongbok Kim; +Cc: QEMU Developers, Aurelien Jarno, Leon Alrae
On 30 September 2016 at 01:16, Yongbok Kim <yongbok.kim@imgtec.com> wrote:
>>
>> Your GPG key hasn't been signed by anybody -- are you in a position
>> to get it signed by somebody else who can in-person verify your identity
>> (eg Leon)?
>
> Hi Peter,
>
> We have just arranged the key signing and Leon has signed my key.
Thanks; I have applied the pull request to master.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-30 22:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-29 13:19 [Qemu-devel] [PULL 0/2] target-mips queue Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 1/2] MAINTAINERS: update target-mips maintainers Yongbok Kim
2016-09-29 13:19 ` [Qemu-devel] [PULL 2/2] hw/dma: vmstateify rc4030 Yongbok Kim
2016-09-29 18:52 ` [Qemu-devel] [PULL 0/2] target-mips queue Peter Maydell
2016-09-30 8:16 ` Yongbok Kim
2016-09-30 22:45 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.