From nobody Wed Nov 5 09:13:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499438682517650.6134414857069; Fri, 7 Jul 2017 07:44:42 -0700 (PDT) Received: from localhost ([::1]:56889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTUUp-0006oC-9o for importer@patchew.org; Fri, 07 Jul 2017 10:44:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTUTR-0005qK-9d for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTUTQ-00043k-Cg for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:13 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTUTQ-00040L-4z for qemu-devel@nongnu.org; Fri, 07 Jul 2017 10:43:12 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dTUTI-0005vO-R2; Fri, 07 Jul 2017 15:43:04 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 7 Jul 2017 15:42:56 +0100 Message-Id: <1499438577-7674-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499438577-7674-1-git-send-email-peter.maydell@linaro.org> References: <1499438577-7674-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 10/11] hw/display/qxl.c Use memory_region_init_ram() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , Paolo Bonzini , Igor Mammedov , Eduardo Habkost , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- hw/display/qxl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 40e9372..7f8c73b 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2089,16 +2089,14 @@ static void qxl_realize_common(PCIQXLDevice *qxl, E= rror **errp) pci_set_byte(&config[PCI_INTERRUPT_PIN], 1); =20 qxl->rom_size =3D 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); =20 qxl->guest_surfaces.cmds =3D g_new0(QXLPHYSICAL, qxl->ssd.num_surfaces= ); - memory_region_init_ram_nomigrate(&qxl->vram_bar, OBJECT(qxl), "qxl.vra= m", + 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); =20 @@ -2198,9 +2196,8 @@ static void qxl_realize_secondary(PCIDevice *dev, Err= or **errp) =20 qxl->id =3D device_id++; qxl_init_ramsize(qxl); - memory_region_init_ram_nomigrate(&qxl->vga.vram, OBJECT(dev), "qxl.vga= vram", + 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 =3D memory_region_get_ram_ptr(&qxl->vga.vram); qxl->vga.con =3D graphic_console_init(DEVICE(dev), 0, &qxl_ops, qxl); =20 --=20 2.7.4