Il 09/09/2014 07:27, Hu Tao ha scritto: > This is merely a rebase of v7, and fixes two merge conflicts. > > This series includes two parts: > > 1. part 1 includes patches 1-4, which improves error handling of > memory_region_init_ram, memory_region_init_ram_ptr and > memory_region_init_rom_device > > 2. part 2 includes patches 5-8, each fixes a bug of memory backend. > > changes: > > v7: > - split the memory-file preallocation fix into its own patch(patch 6) > - some commit messages tweaks > > v6: > - split patch 6 in v5 into 2 > - use local_err instead of errp > - typo fixes > > v5: > - don't introduce _may_fail and _nofail versions of memory API > - the patches order of bug fix and memory API change is exchanged, first > comes the API change, then bug fix. > > v4: > - fix build on 32bit host > - add memory API renaming > - rebase on latest master > > v3: > - introduce memory_region_init_ram_may_fail and > memory_region_init_ram_ptr_may_fail > - address comments by MST > - missing the functions renaming. will send later. > > v2: > - split patch 1 in v1 into 2 patches > - don't rely on ram_block_add to return -1 > - error message tweak in file_ram_alloc > - add error messages reported by qemu to commit message of patch 3 > > v1: > - initial version > > > Hu Tao (8): > exec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr > memory: add parameter errp to memory_region_init_ram > memory: add parameter errp to memory_region_init_ram_ptr > memory: add parameter errp to memory_region_init_rom_device > hostmem-ram: don't exit qemu if size of memory-backend-ram is way too > big > exec: file_ram_alloc: don't exit if failed to preallocate memory > exec: report error when memory < hpagesize > exec: add parameter errp to gethugepagesize > > backends/hostmem-ram.c | 2 +- > exec.c | 60 > ++++++++++++++++++++++---------- > hw/alpha/typhoon.c | 3 +- > hw/arm/armv7m.c | 7 ++-- > hw/arm/cubieboard.c | 2 +- > hw/arm/digic_boards.c | 2 +- > hw/arm/exynos4210.c | 9 ++--- > hw/arm/highbank.c | 5 +-- > hw/arm/integratorcp.c | 5 +-- > hw/arm/kzm.c | 4 +-- > hw/arm/mainstone.c | 3 +- > hw/arm/musicpal.c | 6 ++-- > hw/arm/omap1.c | 6 ++-- > hw/arm/omap2.c | 6 ++-- > hw/arm/omap_sx1.c | 6 ++-- > hw/arm/palm.c | 3 +- > hw/arm/pxa2xx.c | 11 +++--- > hw/arm/realview.c | 9 +++-- > hw/arm/spitz.c | 2 +- > hw/arm/strongarm.c | 3 +- > hw/arm/tosa.c | 2 +- > hw/arm/versatilepb.c | 3 +- > hw/arm/vexpress.c | 15 +++++--- > hw/arm/virt.c | 3 +- > hw/arm/xilinx_zynq.c | 6 ++-- > hw/block/onenand.c | 2 +- > hw/block/pflash_cfi01.c | 2 +- > hw/block/pflash_cfi02.c | 2 +- > hw/core/loader.c | 2 +- > hw/cris/axis_dev88.c | 6 ++-- > hw/display/cg3.c | 6 ++-- > hw/display/g364fb.c | 2 +- > hw/display/qxl.c | 6 ++-- > hw/display/sm501.c | 2 +- > hw/display/tc6393xb.c | 3 +- > hw/display/tcx.c | 5 +-- > hw/display/vga.c | 3 +- > hw/display/vmware_vga.c | 3 +- > hw/i386/kvm/pci-assign.c | 6 ++-- > hw/i386/pc.c | 3 +- > hw/i386/pc_sysfw.c | 5 +-- > hw/input/milkymist-softusb.c | 4 +-- > hw/lm32/lm32_boards.c | 6 ++-- > hw/lm32/milkymist.c | 3 +- > hw/m68k/an5206.c | 4 +-- > hw/m68k/dummy_m68k.c | 2 +- > hw/m68k/mcf5208.c | 4 +-- > hw/microblaze/petalogix_ml605_mmu.c | 5 +-- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 6 ++-- > hw/mips/mips_fulong2e.c | 5 +-- > hw/mips/mips_jazz.c | 8 +++-- > hw/mips/mips_malta.c | 6 ++-- > hw/mips/mips_mipssim.c | 6 ++-- > hw/mips/mips_r4k.c | 5 +-- > hw/misc/ivshmem.c | 5 +-- > hw/misc/vfio.c | 3 +- > hw/moxie/moxiesim.c | 4 +-- > hw/net/milkymist-minimac2.c | 2 +- > hw/openrisc/openrisc_sim.c | 2 +- > hw/pci-host/prep.c | 3 +- > hw/pci/pci.c | 2 +- > hw/ppc/mac_newworld.c | 3 +- > hw/ppc/mac_oldworld.c | 3 +- > hw/ppc/ppc405_boards.c | 8 +++-- > hw/ppc/ppc405_uc.c | 3 +- > hw/ppc/spapr.c | 2 +- > hw/s390x/s390-virtio-ccw.c | 2 +- > hw/s390x/s390-virtio.c | 2 +- > hw/sh4/r2d.c | 2 +- > hw/sh4/shix.c | 8 +++-- > hw/sparc/leon3.c | 4 +-- > hw/sparc/sun4m.c | 10 +++--- > hw/sparc64/sun4u.c | 6 ++-- > hw/unicore32/puv3.c | 3 +- > hw/xtensa/sim.c | 4 +-- > hw/xtensa/xtfpga.c | 8 +++-- > include/exec/memory.h | 12 +++++-- > include/exec/ram_addr.h | 4 +-- > memory.c | 15 ++++---- > numa.c | 4 +-- > xen-hvm.c | 3 +- > 81 files changed, 270 insertions(+), 162 deletions(-) >
Thanks, all patches except patch 6 are now in the memory branch. Paolo
