[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/11] hw/net/dp8393x: don't make prom region 'nomigr
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 11/11] hw/net/dp8393x: don't make prom region 'nomigrate' |
Date: |
Mon, 9 Jul 2018 14:54:35 +0100 |
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 <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 00/11] target-arm queue, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 03/11] hw/timer/cmsdk-apb-timer: Correct ptimer policy settings, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 02/11] ptimer: Add TRIGGER_ONLY_ON_DECREMENT policy option, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 01/11] hw/arm/smmu-common: Fix devfn computation in smmu_iommu_mr, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 04/11] hw/timer/cmsdk-apb-timer: Correctly identify and set one-shot mode, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 05/11] hw/timer/cmsdk-apb-timer: run or stop timer on writes to RELOAD and VALUE, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 06/11] target/arm: Suppress Coverity warning for PRF, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 07/11] tcg: Restrict check_size_impl to multiples of the line size, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 10/11] boards.h: Remove doc comment reference to nonexistent function, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 08/11] target/arm: Fix do_predset for large VL, Peter Maydell, 2018/07/09
- [Qemu-devel] [PULL 11/11] hw/net/dp8393x: don't make prom region 'nomigrate',
Peter Maydell <=
- [Qemu-devel] [PULL 09/11] hw/sd/omap_mmc: Split 'pseudo-reset' from 'power-on-reset', Peter Maydell, 2018/07/09
- Re: [Qemu-devel] [PULL 00/11] target-arm queue, Peter Maydell, 2018/07/09