Commit ce66d778 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-11-git-send-email-peter.maydell@linaro.org
parent fefa9256

hw/display/qxl.c

+3 −6
Original line number Diff line number Diff line
@@ -2089,16 +2089,14 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) 
    pci_set_byte(&config[PCI_INTERRUPT_PIN], 1);



    qxl->rom_size = qxl_rom_size();

    memory_region_init_ram_nomigrate(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom",

    memory_region_init_ram(&qxl->rom_bar, OBJECT(qxl), "qxl.vrom",

                           qxl->rom_size, &error_fatal);

    vmstate_register_ram(&qxl->rom_bar, &qxl->pci.qdev);

    init_qxl_rom(qxl);

    init_qxl_ram(qxl);



    qxl->guest_surfaces.cmds = g_new0(QXLPHYSICAL, qxl->ssd.num_surfaces);

    memory_region_init_ram_nomigrate(&qxl->vram_bar, OBJECT(qxl), "qxl.vram",

    memory_region_init_ram(&qxl->vram_bar, OBJECT(qxl), "qxl.vram",

                           qxl->vram_size, &error_fatal);

    vmstate_register_ram(&qxl->vram_bar, &qxl->pci.qdev);

    memory_region_init_alias(&qxl->vram32_bar, OBJECT(qxl), "qxl.vram32",

                             &qxl->vram_bar, 0, qxl->vram32_size);
@@ -2198,9 +2196,8 @@ static void qxl_realize_secondary(PCIDevice *dev, Error **errp) 


    qxl->id = device_id++;

    qxl_init_ramsize(qxl);

    memory_region_init_ram_nomigrate(&qxl->vga.vram, OBJECT(dev), "qxl.vgavram",

    memory_region_init_ram(&qxl->vga.vram, OBJECT(dev), "qxl.vgavram",

                           qxl->vga.vram_size, &error_fatal);

    vmstate_register_ram(&qxl->vga.vram, &qxl->pci.qdev);

    qxl->vga.vram_ptr = memory_region_get_ram_ptr(&qxl->vga.vram);

    qxl->vga.con = graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl);