qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

hw/display/qxl.c Use memory_region_init_ram()

Switch to memory_region_init_ram(), since we pass the same DeviceState
to both memory_region_init_ram_nomigrate() and vmstate_register_ram().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-11-git-send-email-peter.maydell@linaro.org

+3 -6
+3 -6
hw/display/qxl.c
··· 2089 2089 pci_set_byte(&config[PCI_INTERRUPT_PIN], 1); 2090 2090 2091 2091 qxl->rom_size = qxl_rom_size(); 2092 - memory_region_init_ram_nomigrate(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom", 2092 + memory_region_init_ram(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom", 2093 2093 qxl->rom_size, &error_fatal); 2094 - vmstate_register_ram(&qxl->rom_bar, &qxl->pci.qdev); 2095 2094 init_qxl_rom(qxl); 2096 2095 init_qxl_ram(qxl); 2097 2096 2098 2097 qxl->guest_surfaces.cmds = g_new0(QXLPHYSICAL, qxl->ssd.num_surfaces); 2099 - memory_region_init_ram_nomigrate(&qxl->vram_bar, OBJECT(qxl), "qxl.vram", 2098 + memory_region_init_ram(&qxl->vram_bar, OBJECT(qxl), "qxl.vram", 2100 2099 qxl->vram_size, &error_fatal); 2101 - vmstate_register_ram(&qxl->vram_bar, &qxl->pci.qdev); 2102 2100 memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32", 2103 2101 &qxl->vram_bar, 0, qxl->vram32_size); 2104 2102 ··· 2198 2196 2199 2197 qxl->id = device_id++; 2200 2198 qxl_init_ramsize(qxl); 2201 - memory_region_init_ram_nomigrate(&qxl->vga.vram, OBJECT(dev), "qxl.vgavram", 2199 + memory_region_init_ram(&qxl->vga.vram, OBJECT(dev), "qxl.vgavram", 2202 2200 qxl->vga.vram_size, &error_fatal); 2203 - vmstate_register_ram(&qxl->vga.vram, &qxl->pci.qdev); 2204 2201 qxl->vga.vram_ptr = memory_region_get_ram_ptr(&qxl->vga.vram); 2205 2202 qxl->vga.con = graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl); 2206 2203