From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8K-00089K-GN for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ujq8I-0002ZV-LF for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:36 -0400 Received: from mail-bk0-x22b.google.com ([2a00:1450:4008:c01::22b]:40749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujq8I-0002ZI-Er for qemu-devel@nongnu.org; Tue, 04 Jun 2013 08:14:34 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm19so92657bkc.2 for ; Tue, 04 Jun 2013 05:14:33 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 14:13:57 +0200 Message-Id: <1370348041-6768-14-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 13/17] vfio: 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/misc/vfio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index a1f5803..3c0dc9f 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -1156,6 +1156,7 @@ static void vfio_vga_probe_ati_3c3_quirk(VFIODevice *vdev) memory_region_init_io(&quirk->mem, &vfio_ati_3c3_quirk, quirk, "vfio-ati-3c3-quirk", 1); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem, 3, &quirk->mem); @@ -1247,6 +1248,7 @@ static void vfio_probe_ati_4010_quirk(VFIODevice *vdev, int nr) memory_region_init_io(&quirk->mem, &vfio_ati_4010_quirk, quirk, "vfio-ati-4010-quirk", 8); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion_overlap(&vdev->bars[nr].mem, 0, &quirk->mem, 1); QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next); @@ -1333,6 +1335,7 @@ static void vfio_probe_ati_f10_quirk(VFIODevice *vdev, int nr) memory_region_init_io(&quirk->mem, &vfio_ati_f10_quirk, quirk, "vfio-ati-f10-quirk", 8); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion_overlap(&vdev->bars[nr].mem, 0, &quirk->mem, 1); QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next); @@ -1453,6 +1456,7 @@ static void vfio_vga_probe_nvidia_3d0_quirk(VFIODevice *vdev) memory_region_init_io(&quirk->mem, &vfio_nvidia_3d0_quirk, quirk, "vfio-nvidia-3d0-quirk", 6); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem, 0x10, &quirk->mem); @@ -1568,6 +1572,7 @@ static void vfio_probe_nvidia_bar5_window_quirk(VFIODevice *vdev, int nr) memory_region_init_io(&quirk->mem, &vfio_nvidia_bar5_window_quirk, quirk, "vfio-nvidia-bar5-window-quirk", 16); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion_overlap(&vdev->bars[nr].mem, 0, &quirk->mem, 1); QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next); @@ -1647,6 +1652,7 @@ static void vfio_probe_nvidia_bar0_88000_quirk(VFIODevice *vdev, int nr) memory_region_init_io(&quirk->mem, &vfio_nvidia_bar0_88000_quirk, quirk, "vfio-nvidia-bar0-88000-quirk", TARGET_PAGE_ALIGN(PCIE_CONFIG_SPACE_SIZE)); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion_overlap(&vdev->bars[nr].mem, 0x88000 & TARGET_PAGE_MASK, &quirk->mem, 1); @@ -1726,6 +1732,7 @@ static void vfio_probe_nvidia_bar0_1800_quirk(VFIODevice *vdev, int nr) memory_region_init_io(&quirk->mem, &vfio_nvidia_bar0_1800_quirk, quirk, "vfio-nvidia-bar0-1800-quirk", TARGET_PAGE_ALIGN(PCI_CONFIG_SPACE_SIZE)); + memory_region_set_owner(&quirk->mem, OBJECT(vdev)); memory_region_add_subregion_overlap(&vdev->bars[nr].mem, 0x1800 & TARGET_PAGE_MASK, &quirk->mem, 1); @@ -2237,6 +2244,7 @@ empty_region: memory_region_init(submem, name, 0); } + memory_region_set_owner(submem, memory_region_owner(mem)); memory_region_add_subregion(mem, offset, submem); return ret; -- 1.8.1.4