From patchwork Fri Jul 7 14:42:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107204 Delivered-To: patches@linaro.org Received: by 10.140.101.44 with SMTP id t41csp147302qge; Fri, 7 Jul 2017 07:43:04 -0700 (PDT) X-Received: by 10.28.109.18 with SMTP id i18mr2563825wmc.97.1499438584694; Fri, 07 Jul 2017 07:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499438584; cv=none; d=google.com; s=arc-20160816; b=Lqj62D4jJZelrTAufSwvbUhdEfUXQIF30b96HEMB0/4ODq7/Xo60aOu4XX3gApUUWO pU43qg1DpIYU9UWOErp6ThuAJbIyh99QKP+G7WICanbT90EJWWPG3efwta2DCSOFxzF7 Sv66cUyzd6acybdpyZBYlHMZ01BFxgoqp5TBC1wl7yhJGvwZUIdD5eVviRTVN6QapxlS eBgzyIij4tt6FHr6TTDZC2ox5dQlb9sSFIpnqX7uVNzF8H3aBlUn2VgqcksISsJhOjdm 0E1HTtZDntssoV58FpFlrHCNSnJ6SP3o07bIswcadE53PdDXWfdW3/8jOyZH1WEyfcX5 EJVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=+ZeAMiTDOZC5mUYdj3fSaG0t9Y52/BRKEhBC9i9oNk4=; b=k7M5pJIhuB9tKq1/j4WBISBx3abj5+NqRKmLF3VfE6s66EC2/PD5YYlxyaM2DmFCb7 dLryQ67R0BkSDcP/JF4TIuyCu8KNPzO5y+90W2ePX4oWG7hwD6bdbVfUEnPN97sSTe4N rC0IO27nPN8/ouRRf7YJ4my6TF2UXrOlzpQz3gA5yOm3v8w5rqwUYVIFTJMt48rfJGxV tpj6oRBSl/khICSweYSBxqhPDLSKIXA8v5VYtaUw+DfzokkoabqVvhO7pcgFO1A1lhZO nkKI8vNt+AuFPUwXMrEtTl2gak22JbnNAaGekAVCz10XKt+NoZ2L2p/0CPEv99jyenYM su+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id r27si2344911wrr.120.2017.07.07.07.43.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jul 2017 07:43:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dTUTI-0005ut-7E; Fri, 07 Jul 2017 15:43:04 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum , Igor Mammedov Subject: [PATCH 09/11] hw/pci/pci.c: Use memory_region_init_rom() Date: Fri, 7 Jul 2017 15:42:55 +0100 Message-Id: <1499438577-7674-10-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> 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 --- hw/pci/pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.4 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);