From patchwork Mon Jul 7 02:58:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 367412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 61638140142 for ; Mon, 7 Jul 2014 13:01:03 +1000 (EST) Received: from localhost ([::1]:47868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3zAr-0004kk-FY for incoming@patchwork.ozlabs.org; Sun, 06 Jul 2014 23:01:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3zAJ-00041k-Ij for qemu-devel@nongnu.org; Sun, 06 Jul 2014 23:00:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X3zAE-0007RT-9l for qemu-devel@nongnu.org; Sun, 06 Jul 2014 23:00:27 -0400 Received: from [59.151.112.132] (port=63393 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3zAD-0007Qk-EF for qemu-devel@nongnu.org; Sun, 06 Jul 2014 23:00:22 -0400 X-IronPort-AV: E=Sophos;i="5.00,846,1396972800"; d="scan'208";a="32913888" Received: from localhost (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 07 Jul 2014 10:57:37 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s6730Iu2031094; Mon, 7 Jul 2014 11:00:18 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 7 Jul 2014 11:00:20 +0800 From: Hu Tao To: Date: Mon, 7 Jul 2014 10:58:06 +0800 Message-ID: <466c14c70c5d7396c2e0db4fe898bc9d0880b15e.1404701006.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Yasunori Goto , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov Subject: [Qemu-devel] [PATCH V2 for 2.1 1/3] memory: rename memory_region_init_ram() and memory_region_init_ram_ptr() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename memory_region_init_ram() and memory_region_init_ram_ptr() to memory_region_init_ram_nofail() and memory_region_init_ram_ptr_nofail(). These are nofail versions. We're going to introduce normal versions with errp to let callers handle the error. Signed-off-by: Hu Tao --- backends/hostmem-ram.c | 4 ++-- hw/core/loader.c | 2 +- hw/display/vga.c | 2 +- hw/display/vmware_vga.c | 3 ++- hw/i386/kvm/pci-assign.c | 9 +++++---- hw/i386/pc.c | 2 +- hw/i386/pc_sysfw.c | 4 ++-- hw/misc/ivshmem.c | 9 +++++---- hw/misc/vfio.c | 3 ++- hw/pci/pci.c | 2 +- include/exec/memory.h | 28 ++++++++++++++-------------- memory.c | 18 +++++++++--------- numa.c | 4 ++-- 13 files changed, 47 insertions(+), 43 deletions(-) diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c index d9a8290..9d4960b 100644 --- a/backends/hostmem-ram.c +++ b/backends/hostmem-ram.c @@ -26,8 +26,8 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } path = object_get_canonical_path_component(OBJECT(backend)); - memory_region_init_ram(&backend->mr, OBJECT(backend), path, - backend->size); + memory_region_init_ram_nofail(&backend->mr, OBJECT(backend), path, + backend->size); g_free(path); } diff --git a/hw/core/loader.c b/hw/core/loader.c index 2bf6b8f..fdebf86 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -632,7 +632,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char *name) void *data; rom->mr = g_malloc(sizeof(*rom->mr)); - memory_region_init_ram(rom->mr, owner, name, rom->datasize); + memory_region_init_ram_nofail(rom->mr, owner, name, rom->datasize); memory_region_set_readonly(rom->mr, true); vmstate_register_ram_global(rom->mr); diff --git a/hw/display/vga.c b/hw/display/vga.c index 4b089a3..f17a4b4 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2291,7 +2291,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = s->vram_size >> 20; s->is_vbe_vmstate = 1; - memory_region_init_ram(&s->vram, obj, "vga.vram", s->vram_size); + memory_region_init_ram_nofail(&s->vram, obj, "vga.vram", s->vram_size); 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 591b645..a3738be 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1201,7 +1201,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con = graphic_console_init(dev, 0, &vmsvga_ops, s); s->fifo_size = SVGA_FIFO_SIZE; - memory_region_init_ram(&s->fifo_ram, NULL, "vmsvga.fifo", s->fifo_size); + memory_region_init_ram_nofail(&s->fifo_ram, NULL, "vmsvga.fifo", + s->fifo_size); vmstate_register_ram_global(&s->fifo_ram); s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram); diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index de33657..52d0db0 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -454,9 +454,10 @@ static void assigned_dev_register_regions(PCIRegion *io_regions, char name[32]; snprintf(name, sizeof(name), "%s.bar%d", object_get_typename(OBJECT(pci_dev)), i); - memory_region_init_ram_ptr(&pci_dev->v_addrs[i].real_iomem, - OBJECT(pci_dev), name, - cur_region->size, virtbase); + memory_region_init_ram_ptr_nofail( + &pci_dev->v_addrs[i].real_iomem, + OBJECT(pci_dev), name, + cur_region->size, virtbase); vmstate_register_ram(&pci_dev->v_addrs[i].real_iomem, &pci_dev->dev.qdev); } @@ -1943,7 +1944,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev) snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(dev))); - memory_region_init_ram(&dev->dev.rom, OBJECT(dev), name, st.st_size); + memory_region_init_ram_nofail(&dev->dev.rom, OBJECT(dev), name, st.st_size); vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev); ptr = memory_region_get_ram_ptr(&dev->dev.rom); memset(ptr, 0xff, st.st_size); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2cf22b1..f503b0e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1272,7 +1272,7 @@ FWCfgState *pc_memory_init(MachineState *machine, pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw); option_rom_mr = g_malloc(sizeof(*option_rom_mr)); - memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE); + memory_region_init_ram_nofail(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE); 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 75a7ebb..a15963b 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -55,7 +55,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, /* map the last 128KB of the BIOS in ISA space */ 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); + memory_region_init_ram_nofail(isa_bios, NULL, "isa-bios", isa_bios_size); vmstate_register_ram_global(isa_bios); memory_region_add_subregion_overlap(rom_memory, 0x100000 - isa_bios_size, @@ -192,7 +192,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); + memory_region_init_ram_nofail(bios, NULL, "pc.bios", bios_size); vmstate_register_ram_global(bios); if (!isapc_ram_fw) { memory_region_set_readonly(bios, true); diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 768e528..e3b6e06 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -347,8 +347,8 @@ static void create_shared_memory_BAR(IVShmemState *s, int fd) { ptr = mmap(0, s->ivshmem_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); - memory_region_init_ram_ptr(&s->ivshmem, OBJECT(s), "ivshmem.bar2", - s->ivshmem_size, ptr); + memory_region_init_ram_ptr_nofail(&s->ivshmem, OBJECT(s), "ivshmem.bar2", + s->ivshmem_size, ptr); vmstate_register_ram(&s->ivshmem, DEVICE(s)); memory_region_add_subregion(&s->bar, 0, &s->ivshmem); @@ -475,8 +475,9 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags) /* mmap the region and map into the BAR2 */ map_ptr = mmap(0, s->ivshmem_size, PROT_READ|PROT_WRITE, MAP_SHARED, incoming_fd, 0); - memory_region_init_ram_ptr(&s->ivshmem, OBJECT(s), - "ivshmem.bar2", s->ivshmem_size, map_ptr); + memory_region_init_ram_ptr_nofail(&s->ivshmem, OBJECT(s), + "ivshmem.bar2", s->ivshmem_size, + map_ptr); vmstate_register_ram(&s->ivshmem, DEVICE(s)); IVSHMEM_DPRINTF("guest h/w addr = %" PRIu64 ", size = %" PRIu64 "\n", diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index aef4c9c..5bdee3e 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2894,7 +2894,8 @@ static int vfio_mmap_bar(VFIODevice *vdev, VFIOBAR *bar, goto empty_region; } - memory_region_init_ram_ptr(submem, OBJECT(vdev), name, size, *map); + memory_region_init_ram_ptr_nofail(submem, OBJECT(vdev), name, size, + *map); } else { empty_region: /* Create a zero sized sub-region to make cleanup easy. */ diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 17ed510..ba39f08 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1974,7 +1974,7 @@ static int 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); + memory_region_init_ram_nofail(&pdev->rom, OBJECT(pdev), name, size); vmstate_register_ram(&pdev->rom, &pdev->qdev); ptr = memory_region_get_ram_ptr(&pdev->rom); load_image(path, ptr); diff --git a/include/exec/memory.h b/include/exec/memory.h index e2c8e3e..28c86ee 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -304,18 +304,18 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size); /** - * memory_region_init_ram: Initialize RAM memory region. Accesses into the - * region will modify memory directly. + * memory_region_init_ram_nofail: Initialize RAM memory region. Accesses into + * the region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. */ -void memory_region_init_ram(MemoryRegion *mr, - struct Object *owner, - const char *name, - uint64_t size); +void memory_region_init_ram_nofail(MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size); #ifdef __linux__ /** @@ -340,9 +340,9 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, #endif /** - * memory_region_init_ram_ptr: Initialize RAM memory region from a - * user-provided pointer. Accesses into the - * region will modify memory directly. + * memory_region_init_ram_ptr_nofail: Initialize RAM memory region from a + * user-provided pointer. Accesses into the + * region will modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count @@ -350,11 +350,11 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, * @size: size of the region. * @ptr: memory to be mapped; must contain at least @size bytes. */ -void memory_region_init_ram_ptr(MemoryRegion *mr, - struct Object *owner, - const char *name, - uint64_t size, - void *ptr); +void memory_region_init_ram_ptr_nofail(MemoryRegion *mr, + struct Object *owner, + const char *name, + uint64_t size, + void *ptr); /** * memory_region_init_alias: Initialize a memory region that aliases all or a diff --git a/memory.c b/memory.c index 64d7176..5f8a9f5 100644 --- a/memory.c +++ b/memory.c @@ -1160,10 +1160,10 @@ void memory_region_init_io(MemoryRegion *mr, mr->ram_addr = ~(ram_addr_t)0; } -void memory_region_init_ram(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size) +void memory_region_init_ram_nofail(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size) { memory_region_init(mr, owner, name, size); mr->ram = true; @@ -1189,11 +1189,11 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, } #endif -void memory_region_init_ram_ptr(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size, - void *ptr) +void memory_region_init_ram_ptr_nofail(MemoryRegion *mr, + Object *owner, + const char *name, + uint64_t size, + void *ptr) { memory_region_init(mr, owner, name, size); mr->ram = true; diff --git a/numa.c b/numa.c index 2fde740..dabba4f 100644 --- a/numa.c +++ b/numa.c @@ -263,14 +263,14 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, if (err) { qerror_report_err(err); error_free(err); - memory_region_init_ram(mr, owner, name, ram_size); + memory_region_init_ram_nofail(mr, owner, name, ram_size); } #else fprintf(stderr, "-mem-path not supported on this host\n"); exit(1); #endif } else { - memory_region_init_ram(mr, owner, name, ram_size); + memory_region_init_ram_nofail(mr, owner, name, ram_size); } vmstate_register_ram_global(mr); }