From b59821a95bd1d7cb4697fd7748725c910582e0e7 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 7 Jul 2017 15:42:50 +0100 Subject: memory: Rename memory_region_init_rom() and _rom_device() to _nomigrate() Rename memory_region_init_rom() to memory_region_init_rom_nomigrate() and memory_region_init_rom_device() to memory_region_init_rom_device_nomigrate(). Signed-off-by: Peter Maydell Reviewed-by: Paolo Bonzini Message-id: 1499438577-7674-5-git-send-email-peter.maydell@linaro.org --- hw/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/pci/pci.c') diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 0c6f74a347..e73279a0c9 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2235,7 +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(&pdev->rom, OBJECT(pdev), name, size, &error_fatal); + memory_region_init_rom_nomigrate(&pdev->rom, OBJECT(pdev), name, size, &error_fatal); vmstate_register_ram(&pdev->rom, &pdev->qdev); ptr = memory_region_get_ram_ptr(&pdev->rom); load_image(path, ptr); -- cgit 1.4.1