[Qemu-devel] [PATCH 09/11] hw/pci/pci.c: Use memory_region_init_rom()

[Peter Maydell]

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