From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZijO-0001RD-8B for qemu-devel@nongnu.org; Tue, 07 May 2013 10:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZijH-0006MR-2i for qemu-devel@nongnu.org; Tue, 07 May 2013 10:19:02 -0400 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]:35517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZijG-0006Ls-Se for qemu-devel@nongnu.org; Tue, 07 May 2013 10:18:54 -0400 Received: by mail-we0-f170.google.com with SMTP id u54so588179wes.1 for ; Tue, 07 May 2013 07:18:54 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 7 May 2013 16:17:11 +0200 Message-Id: <1367936238-12196-34-git-send-email-pbonzini@redhat.com> In-Reply-To: <1367936238-12196-1-git-send-email-pbonzini@redhat.com> References: <1367936238-12196-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 33/40] 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: aik@ozlabs.ru, jan.kiszka@siemens.com, qemulist@gmail.com, stefanha@redhat.com, david@gibson.dropbear.id.au Signed-off-by: Paolo Bonzini --- hw/i386/kvm/pci-assign.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index c1e08ec..80cda9a 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); } @@ -1633,6 +1642,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; } @@ -1898,6 +1908,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.7.1