[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/4] Fix bad error handling after memory_region_
|
From: |
Peter Crosthwaite |
|
Subject: |
Re: [Qemu-devel] [PATCH 2/4] Fix bad error handling after memory_region_init_ram() |
|
Date: |
Sun, 13 Sep 2015 22:13:27 -0700 |
On Fri, Sep 11, 2015 at 7:51 AM, Markus Armbruster <address@hidden> wrote:
> Symptom:
>
> $ qemu-system-x86_64 -m 10000000
> Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
> upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
> Aborted (core dumped)
>
> Root cause: commit ef701d7 screwed up handling of out-of-memory
> conditions. Before the commit, we report the error and exit(1), in
> one place, ram_block_add(). The commit lifts the error handling up
> the call chain some, to three places. Fine. Except it uses
> &error_abort in these places, changing the behavior from exit(1) to
> abort(), and thus undoing the work of commit 3922825 "exec: Don't
> abort when we can't allocate guest memory".
>
> The three places are:
>
> * memory_region_init_ram()
>
> Commit 4994653 (right after commit ef701d7) lifted the error
> handling further, through memory_region_init_ram(), multiplying the
> incorrect use of &error_abort. Later on, imitation of existing
> (bad) code may have created more.
>
> * memory_region_init_ram_ptr()
>
> The &error_abort is still there.
>
> * memory_region_init_rom_device()
>
> Doesn't need fixing, because commit 33e0eb5 (soon after commit
> ef701d7) lifted the error handling further, and in the process
> changed it from &error_abort to passing it up the call chain.
> Correct, because the callers are realize() methods.
>
> Fix the error handling after memory_region_init_ram() with a
> Coccinelle semantic patch:
>
> @r@
> expression mr, owner, name, size, err;
> position p;
> @@
> memory_region_init_ram(mr, owner, name, size,
> (
> - &error_abort
> + &error_fatal
> |
> address@hidden
> )
> );
> @script:python@
> p << r.p;
> @@
> print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
>
> When the last argument is &error_abort, it gets replaced by
> &error_fatal. This is the fix.
>
> If the last argument is anything else, its position is reported. This
> lets us check the fix is complete. Four positions get reported:
>
> * ram_backend_memory_alloc()
>
> Error is passed up the call chain, ultimately through
> user_creatable_complete(). As far as I can tell, it's callers all
> handle the error sanely.
>
> * fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
>
This is super modern code that is the exception to the rule doing it right.
> DeviceClass.realize() methods, errors handled sanely further up the
> call chain.
>
> We're good. Test case again behaves:
>
> $ qemu-system-x86_64 -m 10000000
> qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate
> memory
> [Exit 1 ]
>
> The next commits will repair the rest of commit ef701d7's damage.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> hw/arm/armv7m.c | 2 +-
> hw/arm/exynos4210.c | 8 ++++----
> hw/arm/highbank.c | 2 +-
> hw/arm/integratorcp.c | 2 +-
> hw/arm/mainstone.c | 2 +-
> hw/arm/musicpal.c | 2 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap2.c | 2 +-
> hw/arm/omap_sx1.c | 4 ++--
> hw/arm/palm.c | 2 +-
> hw/arm/pxa2xx.c | 8 ++++----
> hw/arm/realview.c | 6 +++---
> hw/arm/spitz.c | 2 +-
> hw/arm/stellaris.c | 4 ++--
> hw/arm/stm32f205_soc.c | 4 ++--
> hw/arm/tosa.c | 2 +-
> hw/arm/vexpress.c | 6 +++---
> hw/arm/xilinx_zynq.c | 2 +-
> hw/arm/xlnx-zynqmp.c | 2 +-
> hw/block/onenand.c | 2 +-
> hw/cris/axis_dev88.c | 2 +-
> hw/display/cg3.c | 4 ++--
> hw/display/qxl.c | 6 +++---
> hw/display/sm501.c | 2 +-
> hw/display/tc6393xb.c | 2 +-
> hw/display/tcx.c | 4 ++--
> hw/display/vga.c | 2 +-
> hw/display/vmware_vga.c | 2 +-
> hw/i386/pc.c | 2 +-
> hw/i386/pc_sysfw.c | 4 ++--
> hw/input/milkymist-softusb.c | 4 ++--
> hw/m68k/an5206.c | 2 +-
> hw/m68k/mcf5208.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 4 ++--
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 ++--
> hw/mips/mips_fulong2e.c | 2 +-
> hw/mips/mips_jazz.c | 4 ++--
> hw/mips/mips_malta.c | 2 +-
> hw/mips/mips_mipssim.c | 2 +-
> hw/mips/mips_r4k.c | 2 +-
> hw/moxie/moxiesim.c | 4 ++--
> hw/net/milkymist-minimac2.c | 2 +-
> hw/openrisc/openrisc_sim.c | 2 +-
> hw/pci-host/prep.c | 2 +-
> hw/pci/pci.c | 2 +-
> hw/ppc/mac_newworld.c | 2 +-
> hw/ppc/mac_oldworld.c | 2 +-
> hw/ppc/ppc405_boards.c | 7 ++++---
> hw/ppc/ppc405_uc.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> hw/s390x/sclp.c | 3 ++-
> hw/sh4/r2d.c | 2 +-
> hw/sh4/shix.c | 6 +++---
> hw/sparc/leon3.c | 2 +-
> hw/sparc/sun4m.c | 6 +++---
> hw/sparc64/sun4u.c | 4 ++--
> hw/tricore/tricore_testboard.c | 18 ++++++++++++------
> hw/unicore32/puv3.c | 2 +-
> hw/xtensa/sim.c | 4 ++--
> hw/xtensa/xtfpga.c | 7 ++++---
> numa.c | 4 ++--
> xen-hvm.c | 2 +-
So the changes here fall into a few different categories.
* Machine init code - error_fatal() is definately right (for the
moment, unless we want to support complete machine hotplug or
something crazy like that).
* SysBusDevice::init functions - These should be propagatable, but we
are really getting what we deserve with error_fatal(). They should be
desysbusified then can be converted to realize. Out of scope of this
series though.
* Device Realize functions (incl a few SoCs). In these cases we should
propagate for the sake of hotplug failure (or other reasons). I have
flagged the easy ones below.
* Common helper functions that are missing Error ** even though their
callers have them. We should added them (particular in VGA).
I think we should try and get the realize and helper ones right and do
the machine init and SBD::init ones later.
> 62 files changed, 110 insertions(+), 101 deletions(-)
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index c6eab6d..40334d7 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -229,7 +229,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int
> mem_size, int num_irq,
> /* Hack to map an additional page of ram at the top of the address
> space. This stops qemu complaining about executing code outside RAM
> when returning from an exception. */
> - memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000, &error_abort);
> + memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000, &error_fatal);
> vmstate_register_ram_global(hack);
> memory_region_add_subregion(system_memory, 0xfffff000, hack);
>
> diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
> index c55fab8..d934980 100644
> --- a/hw/arm/exynos4210.c
> +++ b/hw/arm/exynos4210.c
> @@ -259,7 +259,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
>
> /* Internal ROM */
> memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom",
> - EXYNOS4210_IROM_SIZE, &error_abort);
> + EXYNOS4210_IROM_SIZE, &error_fatal);
> vmstate_register_ram_global(&s->irom_mem);
> memory_region_set_readonly(&s->irom_mem, true);
> memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR,
> @@ -275,7 +275,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
>
> /* Internal RAM */
> memory_region_init_ram(&s->iram_mem, NULL, "exynos4210.iram",
> - EXYNOS4210_IRAM_SIZE, &error_abort);
> + EXYNOS4210_IRAM_SIZE, &error_fatal);
> vmstate_register_ram_global(&s->iram_mem);
> memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,
> &s->iram_mem);
> @@ -284,14 +284,14 @@ Exynos4210State *exynos4210_init(MemoryRegion
> *system_mem,
> mem_size = ram_size;
> if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {
> memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",
> - mem_size - EXYNOS4210_DRAM_MAX_SIZE, &error_abort);
> + mem_size - EXYNOS4210_DRAM_MAX_SIZE, &error_fatal);
> vmstate_register_ram_global(&s->dram1_mem);
> memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,
> &s->dram1_mem);
> mem_size = EXYNOS4210_DRAM_MAX_SIZE;
> }
> memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->dram0_mem);
> memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,
> &s->dram0_mem);
> diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
> index f8353a7..960bc39 100644
> --- a/hw/arm/highbank.c
> +++ b/hw/arm/highbank.c
> @@ -281,7 +281,7 @@ static void calxeda_init(MachineState *machine, enum
> cxmachines machine_id)
>
> sysram = g_new(MemoryRegion, 1);
> memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000,
> - &error_abort);
> + &error_fatal);
> memory_region_add_subregion(sysmem, 0xfff88000, sysram);
> if (bios_name != NULL) {
> sysboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
> index 0fbbf99..d87d36f 100644
> --- a/hw/arm/integratorcp.c
> +++ b/hw/arm/integratorcp.c
> @@ -266,7 +266,7 @@ static int integratorcm_init(SysBusDevice *dev)
> s->cm_refcnt_offset = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 24,
> 1000);
> memory_region_init_ram(&s->flash, OBJECT(s), "integrator.flash",
> 0x100000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->flash);
>
> memory_region_init_io(&s->iomem, OBJECT(s), &integratorcm_ops, s,
> diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
> index 0da02a6..03e9fa5 100644
> --- a/hw/arm/mainstone.c
> +++ b/hw/arm/mainstone.c
> @@ -124,7 +124,7 @@ static void mainstone_common_init(MemoryRegion
> *address_space_mem,
> /* Setup CPU & memory */
> mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size,
> cpu_model);
> memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(rom);
> memory_region_set_readonly(rom, true);
> memory_region_add_subregion(address_space_mem, 0, rom);
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 42f66b3..5cff3d4 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1599,7 +1599,7 @@ static void musicpal_init(MachineState *machine)
> memory_region_add_subregion(address_space_mem, 0, ram);
>
> memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram);
>
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 8873f94..6b1c076 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -3872,7 +3872,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion
> *system_memory,
> s->sdram_size);
> memory_region_add_subregion(system_memory, OMAP_EMIFF_BASE,
> &s->emiff_ram);
> memory_region_init_ram(&s->imif_ram, NULL, "omap1.sram", s->sram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->imif_ram);
> memory_region_add_subregion(system_memory, OMAP_IMIF_BASE, &s->imif_ram);
>
> diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
> index 1ee2d61..98ee19f 100644
> --- a/hw/arm/omap2.c
> +++ b/hw/arm/omap2.c
> @@ -2271,7 +2271,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion
> *sysmem,
> s->sdram_size);
> memory_region_add_subregion(sysmem, OMAP2_Q2_BASE, &s->sdram);
> memory_region_init_ram(&s->sram, NULL, "omap2.sram", s->sram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->sram);
> memory_region_add_subregion(sysmem, OMAP2_SRAM_BASE, &s->sram);
>
> diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
> index 4b0f7f9..4de88f3 100644
> --- a/hw/arm/omap_sx1.c
> +++ b/hw/arm/omap_sx1.c
> @@ -122,7 +122,7 @@ static void sx1_init(MachineState *machine, const int
> version)
>
> /* External Flash (EMIFS) */
> memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(flash);
> memory_region_set_readonly(flash, true);
> memory_region_add_subregion(address_space, OMAP_CS0_BASE, flash);
> @@ -166,7 +166,7 @@ static void sx1_init(MachineState *machine, const int
> version)
> (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
> MemoryRegion *flash_1 = g_new(MemoryRegion, 1);
> memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0",
> flash1_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(flash_1);
> memory_region_set_readonly(flash_1, true);
> memory_region_add_subregion(address_space, OMAP_CS1_BASE, flash_1);
> diff --git a/hw/arm/palm.c b/hw/arm/palm.c
> index 7f1cfb8..1f84dbf 100644
> --- a/hw/arm/palm.c
> +++ b/hw/arm/palm.c
> @@ -213,7 +213,7 @@ static void palmte_init(MachineState *machine)
>
> /* External Flash (EMIFS) */
> memory_region_init_ram(flash, NULL, "palmte.flash", flash_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(flash);
> memory_region_set_readonly(flash, true);
> memory_region_add_subregion(address_space_mem, OMAP_CS0_BASE, flash);
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index ec56b61..164260a 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -2078,11 +2078,11 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
>
> /* SDRAM & Internal Memory Storage */
> memory_region_init_ram(&s->sdram, NULL, "pxa270.sdram", sdram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->sdram);
> memory_region_add_subregion(address_space, PXA2XX_SDRAM_BASE, &s->sdram);
> memory_region_init_ram(&s->internal, NULL, "pxa270.internal", 0x40000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->internal);
> memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,
> &s->internal);
> @@ -2212,11 +2212,11 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space,
> unsigned int sdram_size)
>
> /* SDRAM & Internal Memory Storage */
> memory_region_init_ram(&s->sdram, NULL, "pxa255.sdram", sdram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->sdram);
> memory_region_add_subregion(address_space, PXA2XX_SDRAM_BASE, &s->sdram);
> memory_region_init_ram(&s->internal, NULL, "pxa255.internal",
> - PXA2XX_INTERNAL_SIZE, &error_abort);
> + PXA2XX_INTERNAL_SIZE, &error_fatal);
> vmstate_register_ram_global(&s->internal);
> memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE,
> &s->internal);
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index ef2788d..23779ec 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -151,13 +151,13 @@ static void realview_init(MachineState *machine,
> low_ram_size = ram_size - 0x20000000;
> ram_size = 0x20000000;
> memory_region_init_ram(ram_lo, NULL, "realview.lowmem", low_ram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(ram_lo);
> memory_region_add_subregion(sysmem, 0x20000000, ram_lo);
> }
>
> memory_region_init_ram(ram_hi, NULL, "realview.highmem", ram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(ram_hi);
> low_ram_size = ram_size;
> if (low_ram_size > 0x10000000)
> @@ -353,7 +353,7 @@ static void realview_init(MachineState *machine,
> BootROM happens to be in ROM/flash or in memory that isn't clobbered
> until after Linux boots the secondary CPUs. */
> memory_region_init_ram(ram_hack, NULL, "realview.hack", 0x1000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(ram_hack);
> memory_region_add_subregion(sysmem, SMP_BOOT_ADDR, ram_hack);
>
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index 5bf032a..1e6c814 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -913,7 +913,7 @@ static void spitz_common_init(MachineState *machine,
>
> sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
>
> - memory_region_init_ram(rom, NULL, "spitz.rom", SPITZ_ROM, &error_abort);
> + memory_region_init_ram(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal);
> vmstate_register_ram_global(rom);
> memory_region_set_readonly(rom, true);
> memory_region_add_subregion(address_space_mem, 0, rom);
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index ca4628b..a76f051 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1231,13 +1231,13 @@ static void stellaris_init(const char
> *kernel_filename, const char *cpu_model,
>
> /* Flash programming is done via the SCU, so pretend it is ROM. */
> memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(flash);
> memory_region_set_readonly(flash, true);
> memory_region_add_subregion(system_memory, 0, flash);
>
> memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(system_memory, 0x20000000, sram);
>
> diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
> index 0f3bdc7..4d26a7e 100644
> --- a/hw/arm/stm32f205_soc.c
> +++ b/hw/arm/stm32f205_soc.c
> @@ -71,7 +71,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,
> Error **errp)
> MemoryRegion *flash_alias = g_new(MemoryRegion, 1);
>
> memory_region_init_ram(flash, NULL, "STM32F205.flash", FLASH_SIZE,
> - &error_abort);
> + &error_fatal);
This should propagate
> memory_region_init_alias(flash_alias, NULL, "STM32F205.flash.alias",
> flash, 0, FLASH_SIZE);
>
> @@ -84,7 +84,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,
> Error **errp)
> memory_region_add_subregion(system_memory, 0, flash_alias);
>
> memory_region_init_ram(sram, NULL, "STM32F205.sram", SRAM_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, sram);
>
> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
> index 73572eb..2c216e9 100644
> --- a/hw/arm/tosa.c
> +++ b/hw/arm/tosa.c
> @@ -227,7 +227,7 @@ static void tosa_init(MachineState *machine)
>
> mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
>
> - memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_abort);
> + memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
> vmstate_register_ram_global(rom);
> memory_region_set_readonly(rom, true);
> memory_region_add_subregion(address_space_mem, 0, rom);
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index da21788..9ca6e83 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -391,7 +391,7 @@ static void a15_daughterboard_init(const
> VexpressMachineState *vms,
> /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */
> /* 0x2e000000: system SRAM */
> memory_region_init_ram(sram, NULL, "vexpress.a15sram", 0x10000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(sysmem, 0x2e000000, sram);
>
> @@ -671,13 +671,13 @@ static void vexpress_common_init(MachineState *machine)
>
> sram_size = 0x2000000;
> memory_region_init_ram(sram, NULL, "vexpress.sram", sram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(sysmem, map[VE_SRAM], sram);
>
> vram_size = 0x800000;
> memory_region_init_ram(vram, NULL, "vexpress.vram", vram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(vram);
> memory_region_add_subregion(sysmem, map[VE_VIDEORAM], vram);
>
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index a4e7b5c..37dc0b0 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -167,7 +167,7 @@ static void zynq_init(MachineState *machine)
>
> /* 256K of on-chip memory */
> memory_region_init_ram(ocm_ram, NULL, "zynq.ocm_ram", 256 << 10,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(ocm_ram);
> memory_region_add_subregion(address_space_mem, 0xFFFC0000, ocm_ram);
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 2955f3b..43b3e5a 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -113,7 +113,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> char *ocm_name = g_strdup_printf("zynqmp.ocm_ram_bank_%d", i);
>
> memory_region_init_ram(&s->ocm_ram[i], NULL, ocm_name,
> - XLNX_ZYNQMP_OCM_RAM_SIZE, &error_abort);
> + XLNX_ZYNQMP_OCM_RAM_SIZE, &error_fatal);
This should propagate.
> vmstate_register_ram_global(&s->ocm_ram[i]);
> memory_region_add_subregion(get_system_memory(),
> XLNX_ZYNQMP_OCM_RAM_0_ADDRESS +
> diff --git a/hw/block/onenand.c b/hw/block/onenand.c
> index 1b2c893..58eff50 100644
> --- a/hw/block/onenand.c
> +++ b/hw/block/onenand.c
> @@ -786,7 +786,7 @@ static int onenand_initfn(SysBusDevice *sbd)
> s->otp = memset(g_malloc((64 + 2) << PAGE_SHIFT),
> 0xff, (64 + 2) << PAGE_SHIFT);
> memory_region_init_ram(&s->ram, OBJECT(s), "onenand.ram",
> - 0xc000 << s->shift, &error_abort);
> + 0xc000 << s->shift, &error_fatal);
> vmstate_register_ram_global(&s->ram);
> ram = memory_region_get_ram_ptr(&s->ram);
> s->boot[0] = ram + (0x0000 << s->shift);
> diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
> index 3cae480..b57051e 100644
> --- a/hw/cris/axis_dev88.c
> +++ b/hw/cris/axis_dev88.c
> @@ -277,7 +277,7 @@ void axisdev88_init(MachineState *machine)
> /* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
> internal memory. */
> memory_region_init_ram(phys_intmem, NULL, "axisdev88.chipram",
> INTMEM_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(phys_intmem);
> memory_region_add_subregion(address_space_mem, 0x38000000, phys_intmem);
>
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index 34dcbc3..d2a0d97 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -281,7 +281,7 @@ static void cg3_initfn(Object *obj)
> CG3State *s = CG3(obj);
>
> memory_region_init_ram(&s->rom, NULL, "cg3.prom", FCODE_MAX_ROM_SIZE,
> - &error_abort);
> + &error_fatal);
> memory_region_set_readonly(&s->rom, true);
> sysbus_init_mmio(sbd, &s->rom);
>
> @@ -310,7 +310,7 @@ static void cg3_realizefn(DeviceState *dev, Error **errp)
> }
>
> memory_region_init_ram(&s->vram_mem, NULL, "cg3.vram", s->vram_size,
> - &error_abort);
> + &error_fatal);
> memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA);
> vmstate_register_ram_global(&s->vram_mem);
> sysbus_init_mmio(sbd, &s->vram_mem);
> diff --git a/hw/display/qxl.c b/hw/display/qxl.c
> index 2288238..9c961da 100644
> --- a/hw/display/qxl.c
> +++ b/hw/display/qxl.c
> @@ -1970,14 +1970,14 @@ static void qxl_realize_common(PCIQXLDevice *qxl,
> Error **errp)
>
> qxl->rom_size = qxl_rom_size();
> memory_region_init_ram(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom",
> - qxl->rom_size, &error_abort);
> + qxl->rom_size, &error_fatal);
Propagate.
> vmstate_register_ram(&qxl->rom_bar, &qxl->pci.qdev);
> init_qxl_rom(qxl);
> init_qxl_ram(qxl);
>
> qxl->guest_surfaces.cmds = g_new0(QXLPHYSICAL, qxl->ssd.num_surfaces);
> memory_region_init_ram(&qxl->vram_bar, OBJECT(qxl), "qxl.vram",
> - qxl->vram_size, &error_abort);
> + qxl->vram_size, &error_fatal);
> vmstate_register_ram(&qxl->vram_bar, &qxl->pci.qdev);
> memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",
> &qxl->vram_bar, 0, qxl->vram32_size);
> @@ -2079,7 +2079,7 @@ static void qxl_realize_secondary(PCIDevice *dev, Error
> **errp)
> qxl->id = device_id++;
> qxl_init_ramsize(qxl);
> memory_region_init_ram(&qxl->vga.vram, OBJECT(dev), "qxl.vgavram",
> - qxl->vga.vram_size, &error_abort);
> + qxl->vga.vram_size, &error_fatal);
Propagate.
> vmstate_register_ram(&qxl->vga.vram, &qxl->pci.qdev);
> qxl->vga.vram_ptr = memory_region_get_ram_ptr(&qxl->vga.vram);
> qxl->vga.con = graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl);
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 15a5ba8..3c3f978 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1411,7 +1411,7 @@ void sm501_init(MemoryRegion *address_space_mem,
> uint32_t base,
>
> /* allocate local memory */
> memory_region_init_ram(&s->local_mem_region, NULL, "sm501.local",
> - local_mem_bytes, &error_abort);
> + local_mem_bytes, &error_fatal);
> vmstate_register_ram_global(&s->local_mem_region);
> memory_region_set_log(&s->local_mem_region, true, DIRTY_MEMORY_VGA);
> s->local_mem = memory_region_get_ram_ptr(&s->local_mem_region);
> diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
> index f5f3f3e..516af1a 100644
> --- a/hw/display/tc6393xb.c
> +++ b/hw/display/tc6393xb.c
> @@ -584,7 +584,7 @@ TC6393xbState *tc6393xb_init(MemoryRegion *sysmem,
> uint32_t base, qemu_irq irq)
> memory_region_add_subregion(sysmem, base, &s->iomem);
>
> memory_region_init_ram(&s->vram, NULL, "tc6393xb.vram", 0x100000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(&s->vram);
> s->vram_ptr = memory_region_get_ram_ptr(&s->vram);
> memory_region_add_subregion(sysmem, base + 0x100000, &s->vram);
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index 6acdc2d..4635800 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -945,7 +945,7 @@ static void tcx_initfn(Object *obj)
> TCXState *s = TCX(obj);
>
> memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE,
> - &error_abort);
> + &error_fatal);
I guess this one is particularly difficult, and indicates the RAM init
needs to move to realize.
> memory_region_set_readonly(&s->rom, true);
> sysbus_init_mmio(sbd, &s->rom);
>
> @@ -1007,7 +1007,7 @@ static void tcx_realizefn(DeviceState *dev, Error
> **errp)
> char *fcode_filename;
>
> memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",
> - s->vram_size * (1 + 4 + 4), &error_abort);
> + s->vram_size * (1 + 4 + 4), &error_fatal);
Propagate.
> vmstate_register_ram_global(&s->vram_mem);
> memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA);
> vram_base = memory_region_get_ram_ptr(&s->vram_mem);
> diff --git a/hw/display/vga.c b/hw/display/vga.c
> index b35d523..9f68394 100644
> --- a/hw/display/vga.c
> +++ b/hw/display/vga.c
> @@ -2139,7 +2139,7 @@ void vga_common_init(VGACommonState *s, Object *obj,
> bool global_vmstate)
>
Can this function accept error ** ? Most of the callers are realize fns.
> s->is_vbe_vmstate = 1;
> memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size,
> - &error_abort);
> + &error_fatal);
Then this becomes a propagation.
> vmstate_register_ram(&s->vram, global_vmstate ? NULL : DEVICE(obj));
> xen_register_framebuffer(&s->vram);
> s->vram_ptr = memory_region_get_ram_ptr(&s->vram);
> diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
> index 7f397d3..8e93509 100644
> --- a/hw/display/vmware_vga.c
> +++ b/hw/display/vmware_vga.c
> @@ -1244,7 +1244,7 @@ static void vmsvga_init(DeviceState *dev, struct
> vmsvga_state_s *s,
>
> s->fifo_size = SVGA_FIFO_SIZE;
> memory_region_init_ram(&s->fifo_ram, NULL, "vmsvga.fifo", s->fifo_size,
> - &error_abort);
> + &error_fatal);
Can add errp to this function from caller and propagate.
> vmstate_register_ram_global(&s->fifo_ram);
> s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram);
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index b5107f7..6c2a405 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1400,7 +1400,7 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
>
> option_rom_mr = g_malloc(sizeof(*option_rom_mr));
> memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(option_rom_mr);
> memory_region_add_subregion_overlap(rom_memory,
> PC_ROM_MIN_VGA,
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index 662d997..579461f 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -56,7 +56,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory,
> isa_bios_size = MIN(flash_size, 128 * 1024);
> isa_bios = g_malloc(sizeof(*isa_bios));
> memory_region_init_ram(isa_bios, NULL, "isa-bios", isa_bios_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(isa_bios);
> memory_region_add_subregion_overlap(rom_memory,
> 0x100000 - isa_bios_size,
> @@ -193,7 +193,7 @@ static void old_pc_system_rom_init(MemoryRegion
> *rom_memory, bool isapc_ram_fw)
> goto bios_error;
> }
> bios = g_malloc(sizeof(*bios));
> - memory_region_init_ram(bios, NULL, "pc.bios", bios_size, &error_abort);
> + memory_region_init_ram(bios, NULL, "pc.bios", bios_size, &error_fatal);
> vmstate_register_ram_global(bios);
> if (!isapc_ram_fw) {
> memory_region_set_readonly(bios, true);
> diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
> index 7b0f4db..8a02d35 100644
> --- a/hw/input/milkymist-softusb.c
> +++ b/hw/input/milkymist-softusb.c
> @@ -255,12 +255,12 @@ static int milkymist_softusb_init(SysBusDevice *dev)
>
> /* register pmem and dmem */
> memory_region_init_ram(&s->pmem, OBJECT(s), "milkymist-softusb.pmem",
> - s->pmem_size, &error_abort);
> + s->pmem_size, &error_fatal);
> vmstate_register_ram_global(&s->pmem);
> s->pmem_ptr = memory_region_get_ram_ptr(&s->pmem);
> sysbus_init_mmio(dev, &s->pmem);
> memory_region_init_ram(&s->dmem, OBJECT(s), "milkymist-softusb.dmem",
> - s->dmem_size, &error_abort);
> + s->dmem_size, &error_fatal);
> vmstate_register_ram_global(&s->dmem);
> s->dmem_ptr = memory_region_get_ram_ptr(&s->dmem);
> sysbus_init_mmio(dev, &s->dmem);
> diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
> index f63ab2b..b18dc7f 100644
> --- a/hw/m68k/an5206.c
> +++ b/hw/m68k/an5206.c
> @@ -54,7 +54,7 @@ static void an5206_init(MachineState *machine)
> memory_region_add_subregion(address_space_mem, 0, ram);
>
> /* Internal SRAM. */
> - memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_abort);
> + memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram);
>
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index 326a42d..c38ffb8 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -222,7 +222,7 @@ static void mcf5208evb_init(MachineState *machine)
> memory_region_add_subregion(address_space_mem, 0x40000000, ram);
>
> /* Internal SRAM. */
> - memory_region_init_ram(sram, NULL, "mcf5208.sram", 16384, &error_abort);
> + memory_region_init_ram(sram, NULL, "mcf5208.sram", 16384, &error_fatal);
> vmstate_register_ram_global(sram);
> memory_region_add_subregion(address_space_mem, 0x80000000, sram);
>
> diff --git a/hw/microblaze/petalogix_ml605_mmu.c
> b/hw/microblaze/petalogix_ml605_mmu.c
> index ed84a37..d75b053 100644
> --- a/hw/microblaze/petalogix_ml605_mmu.c
> +++ b/hw/microblaze/petalogix_ml605_mmu.c
> @@ -92,12 +92,12 @@ petalogix_ml605_init(MachineState *machine)
>
> /* Attach emulated BRAM through the LMB. */
> memory_region_init_ram(phys_lmb_bram, NULL, "petalogix_ml605.lmb_bram",
> - LMB_BRAM_SIZE, &error_abort);
> + LMB_BRAM_SIZE, &error_fatal);
> vmstate_register_ram_global(phys_lmb_bram);
> memory_region_add_subregion(address_space_mem, 0x00000000,
> phys_lmb_bram);
>
> memory_region_init_ram(phys_ram, NULL, "petalogix_ml605.ram", ram_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(phys_ram);
> memory_region_add_subregion(address_space_mem, MEMORY_BASEADDR,
> phys_ram);
>
> diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
> b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> index 0c2140c..701b435 100644
> --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
> +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> @@ -71,12 +71,12 @@ petalogix_s3adsp1800_init(MachineState *machine)
> /* Attach emulated BRAM through the LMB. */
> memory_region_init_ram(phys_lmb_bram, NULL,
> "petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(phys_lmb_bram);
> memory_region_add_subregion(sysmem, 0x00000000, phys_lmb_bram);
>
> memory_region_init_ram(phys_ram, NULL, "petalogix_s3adsp1800.ram",
> - ram_size, &error_abort);
> + ram_size, &error_fatal);
> vmstate_register_ram_global(phys_ram);
> memory_region_add_subregion(sysmem, ddr_base, phys_ram);
>
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index dea941a..e8fc8fe 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -304,7 +304,7 @@ static void mips_fulong2e_init(MachineState *machine)
> /* allocate RAM */
> memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram",
> ram_size);
> memory_region_init_ram(bios, NULL, "fulong2e.bios", bios_size,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(bios);
> memory_region_set_readonly(bios, true);
>
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 9d60633..e163d40 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -184,7 +184,7 @@ static void mips_jazz_init(MachineState *machine,
> memory_region_add_subregion(address_space, 0, ram);
>
> memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(bios);
> memory_region_set_readonly(bios, true);
> memory_region_init_alias(bios2, NULL, "mips_jazz.bios", bios,
> @@ -252,7 +252,7 @@ static void mips_jazz_init(MachineState *machine,
> /* Simple ROM, so user doesn't have to provide one */
> MemoryRegion *rom_mr = g_new(MemoryRegion, 1);
> memory_region_init_ram(rom_mr, NULL, "g364fb.rom", 0x80000,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(rom_mr);
> memory_region_set_readonly(rom_mr, true);
> uint8_t *rom = memory_region_get_ram_ptr(rom_mr);
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 3082e75..e115850 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1130,7 +1130,7 @@ void mips_malta_init(MachineState *machine)
> * regions are not executable.
> */
> memory_region_init_ram(bios_copy, NULL, "bios.1fc", BIOS_SIZE,
> - &error_abort);
> + &error_fatal);
> if (!rom_copy(memory_region_get_ram_ptr(bios_copy),
> FLASH_ADDRESS, BIOS_SIZE)) {
> memcpy(memory_region_get_ram_ptr(bios_copy),
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index 61f74a6..063151f 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -174,7 +174,7 @@ mips_mipssim_init(MachineState *machine)
> memory_region_allocate_system_memory(ram, NULL, "mips_mipssim.ram",
> ram_size);
> memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(bios);
> memory_region_set_readonly(bios, true);
>
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index f4dcacd..7bc8f95 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -233,7 +233,7 @@ void mips_r4k_init(MachineState *machine)
> if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) {
> bios = g_new(MemoryRegion, 1);
> memory_region_init_ram(bios, NULL, "mips_r4k.bios", BIOS_SIZE,
> - &error_abort);
> + &error_fatal);
> vmstate_register_ram_global(bios);
> memory_region_set_readonly(bios, true);
> memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios);
> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
> index 80bcc5b..5e69e11 100644
> --- a/hw/moxie/moxiesim.c
> +++ b/hw/moxie/moxiesim.c
> @@ -123,11 +123,11 @@ static void moxiesim_init(MachineState *machine)
> qemu_register_reset(main_cpu_reset, cpu);
>
> /* Allocate RAM. */
> - memory_region_init_ram(ram, NULL, "moxiesim.ram", ram_size,
> &error_abort);
> + memory_region_init_ram(ram, NULL, "moxiesim.ram", ram_size,
> &error_fatal);
> vmstate_register_ram_global(ram);
> memory_region_add_subregion(address_space_mem, ram_base, ram);
>
> - memory_region_init_ram(rom, NULL, "moxie.rom", 128*0x1000, &error_abort);
> + memory_region_init_ram(rom, NULL, "moxie.rom", 128*0x1000, &error_fatal);
> vmstate_register_ram_global(rom);
> memory_region_add_subregion(get_system_memory(), 0x1000, rom);
>
> diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
> index 5d1cf08..6302b8b 100644
> --- a/hw/net/milkymist-minimac2.c
> +++ b/hw/net/milkymist-minimac2.c
> @@ -463,7 +463,7 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)
>
> /* register buffers memory */
> memory_region_init_ram(&s->buffers, OBJECT(dev),
> "milkymist-minimac2.buffers",
> - buffers_size, &error_abort);
> + buffers_size, &error_fatal);
> vmstate_register_ram_global(&s->buffers);
> s->rx0_buf = memory_region_get_ram_ptr(&s->buffers);
> s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE;
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 1da0657..09285bd 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -114,7 +114,7 @@ static void openrisc_sim_init(MachineState *machine)
> }
>
> ram = g_malloc(sizeof(*ram));
> - memory_region_init_ram(ram, NULL, "openrisc.ram", ram_size,
> &error_abort);
> + memory_region_init_ram(ram, NULL, "openrisc.ram", ram_size,
> &error_fatal);
> vmstate_register_ram_global(ram);
> memory_region_add_subregion(get_system_memory(), 0, ram);
>
> diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
> index c63f45d..c93426b 100644
> --- a/hw/pci-host/prep.c
> +++ b/hw/pci-host/prep.c
> @@ -302,7 +302,7 @@ static void raven_realize(PCIDevice *d, Error **errp)
> d->config[0x34] = 0x00; // capabilities_pointer
>
> memory_region_init_ram(&s->bios, OBJECT(s), "bios", BIOS_SIZE,
> - &error_abort);
> + &error_fatal);
> memory_region_set_readonly(&s->bios, true);
> memory_region_add_subregion(get_system_memory(), (uint32_t)(-BIOS_SIZE),
> &s->bios);
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index ccea628..b0bf540 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -2081,7 +2081,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool
> is_default_rom,
> snprintf(name, sizeof(name), "%s.rom",
> object_get_typename(OBJECT(pdev)));
> }
> pdev->has_rom = true;
> - memory_region_init_ram(&pdev->rom, OBJECT(pdev), name, size,
> &error_abort);
> + memory_region_init_ram(&pdev->rom, OBJECT(pdev), name, size,
> &error_fatal);
Propagate.
Regards,
Peter
> vmstate_register_ram(&pdev->rom, &pdev->qdev);
> ptr = memory_region_get_ram_ptr(&pdev->rom);
> load_image(path, ptr);
- [Qemu-devel] [PATCH 0/4] Don't abort when we can't allocate guest memory (again), Markus Armbruster, 2015/09/11
- [Qemu-devel] [PATCH 3/4] loader: Fix memory_region_init_resizeable_ram() error handling, Markus Armbruster, 2015/09/11
- [Qemu-devel] [PATCH 4/4] memory: Fix bad error handling in memory_region_init_ram_ptr(), Markus Armbruster, 2015/09/11
- [Qemu-devel] [PATCH 1/4] error: New error_fatal, Markus Armbruster, 2015/09/11
- [Qemu-devel] [PATCH 2/4] Fix bad error handling after memory_region_init_ram(), Markus Armbruster, 2015/09/11
- Re: [Qemu-devel] [PATCH 2/4] Fix bad error handling after memory_region_init_ram(),
Peter Crosthwaite <=
- Re: [Qemu-devel] [PATCH 0/4] Don't abort when we can't allocate guest memory (again), Markus Armbruster, 2015/09/11
- Re: [Qemu-devel] [PATCH 0/4] Don't abort when we can't allocate guest memory (again), Peter Crosthwaite, 2015/09/14