[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] hw/pci/pci.c: Use memory_region_init_rom()
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 09/11] hw/pci/pci.c: Use memory_region_init_rom() |
Date: |
Fri, 7 Jul 2017 15:42:55 +0100 |
Since we pass the same DeviceState object to
memory_region_init_rom_nomigrate() and vmstate_register_ram(), we can
switch to using memory_region_init_rom() instead.
(This isn't entirely obvious from the code since it is using
&pdev->qdev rather than DEVICE(pdov) for some reason, but
PCIDevice does indeed use 'qdev' for its parent DeviceState member.)
Signed-off-by: Peter Maydell <address@hidden>
---
hw/pci/pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e73279a..258fbe5 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2235,8 +2235,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_rom_nomigrate(&pdev->rom, OBJECT(pdev), name, size,
&error_fatal);
- vmstate_register_ram(&pdev->rom, &pdev->qdev);
+ memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, size, &error_fatal);
ptr = memory_region_get_ram_ptr(&pdev->rom);
load_image(path, ptr);
g_free(path);
--
2.7.4
- [Qemu-devel] [PATCH 00/11] Make memory_region_init_ram() and friends handle migration, Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 01/11] include/hw/boards.h: Document memory_region_allocate_system_memory(), Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 11/11] docs/devel/memory.txt: Add section about RAM migration, Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 10/11] hw/display/qxl.c Use memory_region_init_ram(), Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 09/11] hw/pci/pci.c: Use memory_region_init_rom(),
Peter Maydell <=
- [Qemu-devel] [PATCH 08/11] hw/block/pflash_cfi01, pflash_cfi02: Use memory_region_init_rom_device(), Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 06/11] scripts/coccinelle/memory-region-init-ram.cocci: New script, Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 05/11] memory.h: Add memory_region_init_{ram, rom, rom_device}() handling migration, Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 04/11] memory: Rename memory_region_init_rom() and _rom_device() to _nomigrate(), Peter Maydell, 2017/07/07
- [Qemu-devel] [PATCH 02/11] memory: Document that the RAM MR initializers do not handle migration, Peter Maydell, 2017/07/07
[Qemu-devel] [PATCH 07/11] hw: Use new memory_region_init_{ram, rom, rom_device}() functions, Peter Maydell, 2017/07/07