From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFyX-0006HZ-AF for qemu-devel@nongnu.org; Fri, 31 Oct 2014 13:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkFyR-0007hZ-4y for qemu-devel@nongnu.org; Fri, 31 Oct 2014 13:27:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFyQ-0007gZ-Ub for qemu-devel@nongnu.org; Fri, 31 Oct 2014 13:26:55 -0400 From: Paolo Bonzini Date: Fri, 31 Oct 2014 18:25:55 +0100 Message-Id: <1414776373-9704-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1414776373-9704-1-git-send-email-pbonzini@redhat.com> References: <1414776373-9704-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 17/35] Add skip_dump flag to ignore memory region during dump List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Nikunj A Dadhania From: Nikunj A Dadhania The PCI MMIO might be disabled or the device in the reset state. Make sure we do not dump these memory regions. Signed-off-by: Nikunj A Dadhania Acked-by: Alex Williamson CC: Paolo Bonzini Signed-off-by: Paolo Bonzini --- hw/misc/vfio.c | 1 + include/exec/memory.h | 19 +++++++++++++++++++ memory.c | 10 ++++++++++ memory_mapping.c | 3 ++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index b5e7981..fd318a1 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2911,6 +2911,7 @@ static int vfio_mmap_bar(VFIODevice *vdev, VFIOBAR *bar, } memory_region_init_ram_ptr(submem, OBJECT(vdev), name, size, *map); + memory_region_set_skip_dump(submem); } else { empty_region: /* Create a zero sized sub-region to make cleanup easy. */ diff --git a/include/exec/memory.h b/include/exec/memory.h index 072aad2..74a58b4 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -150,6 +150,7 @@ struct MemoryRegion { bool terminates; bool romd_mode; bool ram; + bool skip_dump; bool readonly; /* For RAM regions */ bool enabled; bool rom_device; @@ -457,6 +458,24 @@ uint64_t memory_region_size(MemoryRegion *mr); bool memory_region_is_ram(MemoryRegion *mr); /** + * memory_region_is_skip_dump: check whether a memory region should not be + * dumped + * + * Returns %true is a memory region should not be dumped(e.g. VFIO BAR MMAP). + * + * @mr: the memory region being queried + */ +bool memory_region_is_skip_dump(MemoryRegion *mr); + +/** + * memory_region_set_skip_dump: Set skip_dump flag, dump will ignore this memory + * region + * + * @mr: the memory region being queried + */ +void memory_region_set_skip_dump(MemoryRegion *mr); + +/** * memory_region_is_romd: check whether a memory region is in ROMD mode * * Returns %true if a memory region is a ROM device and currently set to allow diff --git a/memory.c b/memory.c index 30f77b2..0f4fdc7 100644 --- a/memory.c +++ b/memory.c @@ -1185,6 +1185,11 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, mr->ram_addr = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } +void memory_region_set_skip_dump(MemoryRegion *mr) +{ + mr->skip_dump = true; +} + void memory_region_init_alias(MemoryRegion *mr, Object *owner, const char *name, @@ -1306,6 +1311,11 @@ bool memory_region_is_ram(MemoryRegion *mr) return mr->ram; } +bool memory_region_is_skip_dump(MemoryRegion *mr) +{ + return mr->skip_dump; +} + bool memory_region_is_logging(MemoryRegion *mr) { return mr->dirty_log_mask; diff --git a/memory_mapping.c b/memory_mapping.c index 87a6ed5..7b69801 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -203,7 +203,8 @@ static void guest_phys_blocks_region_add(MemoryListener *listener, GuestPhysBlock *predecessor; /* we only care about RAM */ - if (!memory_region_is_ram(section->mr)) { + if (!memory_region_is_ram(section->mr) || + memory_region_is_skip_dump(section->mr)) { return; } -- 1.8.3.1