[Qemu-devel] [PATCH for-3.0] hw/net/dp8393x: don't make prom region 'nomigrate'

[Qemu-devel] [PATCH for-3.0] hw/net/dp8393x: don't make prom region 'nomigrate'

[Peter Maydell]

Currently we use memory_region_init_rom_nomigrate() to create
the "dp3893x-prom" memory region, and we don't manually register
it with vmstate_register_ram(). This currently means that its
contents are migrated but as a ram block whose name is the empty
string; in future it may mean they are not migrated at all. Use
memory_region_init_ram() instead.

Note that this is a a cross-version migration compatibility break
for the MIPS "magnum" and "pica61" machines.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
This is I think the last device that creates a RAM memory
region and never registers it for migration.  Only used on
the MIPS 'jazz' boards.

 hw/net/dp8393x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index f2d2ce344cc..b53fcaa8bc3 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -887,7 +887,7 @@ static void dp8393x_realize(DeviceState *dev, Error **errp)
     s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s);
     s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */
 
-    memory_region_init_ram_nomigrate(&s->prom, OBJECT(dev),
+    memory_region_init_ram(&s->prom, OBJECT(dev),
                            "dp8393x-prom", SONIC_PROM_SIZE, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
-- 
2.17.1

Re: [Qemu-devel] [PATCH for-3.0] hw/net/dp8393x: don't make prom region 'nomigrate'

[Aleksandar Markovic]

> Currently we use memory_region_init_rom_nomigrate() to create
> the "dp3893x-prom" memory region, and we don't manually register
> it with vmstate_register_ram(). This currently means that its
> contents are migrated but as a ram block whose name is the empty
> string; in future it may mean they are not migrated at all. Use
> memory_region_init_ram() instead.
>
> Note that this is a a cross-version migration compatibility break
> for the MIPS "magnum" and "pica61" machines.
>

As far as MIPS jazz ("magnum" and "pica61") boards are concerned:

Reviewed-by: Aleksandar Markovic <aleksandar.markovic@wavecomp.com>

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> This is I think the last device that creates a RAM memory
> region and never registers it for migration.  Only used on
> the MIPS 'jazz' boards.
>
>  hw/net/dp8393x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Re: [Qemu-devel] [PATCH for-3.0] hw/net/dp8393x: don't make prom region 'nomigrate'

[Peter Maydell]

On 9 July 2018 at 12:27, Aleksandar Markovic <amarkovic@wavecomp.com> wrote:
>> Currently we use memory_region_init_rom_nomigrate() to create
>> the "dp3893x-prom" memory region, and we don't manually register
>> it with vmstate_register_ram(). This currently means that its
>> contents are migrated but as a ram block whose name is the empty
>> string; in future it may mean they are not migrated at all. Use
>> memory_region_init_ram() instead.
>>
>> Note that this is a a cross-version migration compatibility break
>> for the MIPS "magnum" and "pica61" machines.
>>
>
> As far as MIPS jazz ("magnum" and "pica61") boards are concerned:
>
> Reviewed-by: Aleksandar Markovic <aleksandar.markovic@wavecomp.com>

Thanks for the review. I'll put this in via target-arm.next,
just for convenience's sake, since I'm doing a pull request
this afternoon anyway.

-- PMM