From 05a8be73352b862049cfe74b38b10634187c5830 Mon Sep 17 00:00:00 2001 Message-Id: <05a8be73352b862049cfe74b38b10634187c5830.1387298827.git.minovotn@redhat.com> In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> From: "Michael S. Tsirkin" Date: Tue, 17 Dec 2013 15:17:40 +0100 Subject: [PATCH 20/56] q35: use 64 bit window programmed by guest RH-Author: Michael S. Tsirkin Message-id: <1387293161-4085-21-git-send-email-mst@redhat.com> Patchwork-id: 56326 O-Subject: [PATCH qemu-kvm RHEL7.0 v2 20/57] q35: use 64 bit window programmed by guest Bugzilla: 1034876 RH-Acked-by: Igor Mammedov RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Laszlo Ersek Detect the 64 bit window programmed by firmware and configure properties accordingly. Signed-off-by: Michael S. Tsirkin (cherry picked from commit 8b42d730e3401084720f4ba59d1e18a0d6c67dc6) --- hw/pci-host/q35.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) Signed-off-by: Michal Novotny --- hw/pci-host/q35.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 70ad01f..943e55f 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -88,18 +88,24 @@ static void q35_host_get_pci_hole64_start(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { - Q35PCIHost *s = Q35_HOST_DEVICE(obj); + PCIHostState *h = PCI_HOST_BRIDGE(obj); + Range w64; + + pci_bus_get_w64_range(h->bus, &w64); - visit_type_uint64(v, &s->mch.pci_info.w64.begin, name, errp); + visit_type_uint64(v, &w64.begin, name, errp); } static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { - Q35PCIHost *s = Q35_HOST_DEVICE(obj); + PCIHostState *h = PCI_HOST_BRIDGE(obj); + Range w64; + + pci_bus_get_w64_range(h->bus, &w64); - visit_type_uint64(v, &s->mch.pci_info.w64.end, name, errp); + visit_type_uint64(v, &w64.end, name, errp); } static Property mch_props[] = { -- 1.7.11.7