From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8L-0008B6-A5 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ujq8G-0002Z0-HY for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:37 -0400 Received: from mail-bk0-x230.google.com ([2a00:1450:4008:c01::230]:37629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8G-0002Yl-AH for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:32 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf17so90102bkc.21 for ; Tue, 04 Jun 2013 05:14:31 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 14:13:56 +0200 Message-Id: <1370348041-6768-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> References: <1370348041-6768-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 12/17] pci-assign: add memory_region_set_owner calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Signed-off-by: Paolo Bonzini --- hw/i386/kvm/pci-assign.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index ff85590..4b1c2d9 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -300,6 +300,7 @@ static void assigned_dev_iomem_setup(PCIDevice *pci_dev, int region_num, if (e_size > 0) { memory_region_init(®ion->container, "assigned-dev-container", e_size); + memory_region_set_owner(®ion->container, OBJECT(pci_dev)); memory_region_add_subregion(®ion->container, 0, ®ion->real_iomem); /* deal with MSI-X MMIO page */ @@ -330,9 +331,12 @@ static void assigned_dev_ioport_setup(PCIDevice *pci_dev, int region_num, region->e_size = size; memory_region_init(®ion->container, "assigned-dev-container", size); + memory_region_set_owner(®ion->container, OBJECT(pci_dev)); + memory_region_init_io(®ion->real_iomem, &assigned_dev_ioport_ops, r_dev->v_addrs + region_num, "assigned-dev-iomem", size); + memory_region_set_owner(®ion->real_iomem, OBJECT(pci_dev)); memory_region_add_subregion(®ion->container, 0, ®ion->real_iomem); } @@ -482,6 +486,8 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, &slow_bar_ops, &pci_dev->v_addrs[i], "assigned-dev-slow-bar", cur_region->size); + memory_region_set_owner(&pci_dev->v_addrs[i].real_iomem, + OBJECT(pci_dev)); } else { void *virtbase = pci_dev->v_addrs[i].u.r_virtbase; char name[32]; @@ -490,6 +496,9 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, memory_region_init_ram_ptr(&pci_dev->v_addrs[i].real_iomem, name, cur_region->size, virtbase); + memory_region_set_owner(&pci_dev->v_addrs[i].real_iomem, + OBJECT(pci_dev)); + vmstate_register_ram(&pci_dev->v_addrs[i].real_iomem, &pci_dev->dev.qdev); } @@ -1651,6 +1660,7 @@ static int assigned_dev_register_msix_mmio(AssignedDevice *dev) memory_region_init_io(&dev->mmio, &assigned_dev_msix_mmio_ops, dev, "assigned-dev-msix", MSIX_PAGE_SIZE); + memory_region_set_owner(&dev->mmio, OBJECT(dev)); return 0; } @@ -1916,6 +1926,7 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev) snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(dev))); memory_region_init_ram(&dev->dev.rom, name, st.st_size); + memory_region_set_owner(&dev->dev.rom, OBJECT(dev)); vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev); ptr = memory_region_get_ram_ptr(&dev->dev.rom); memset(ptr, 0xff, st.st_size); -- 1.8.1.4