|
 |
9ae3a8 |
From 5c582371601d239c3e8692fa51549ae915a48f41 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <5c582371601d239c3e8692fa51549ae915a48f41.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 17 Dec 2013 15:17:42 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 21/56] piix: use 64 bit window programmed by guest
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1387293161-4085-22-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56327
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 21/57] piix: use 64 bit window programmed by guest
|
|
|
9ae3a8 |
Bugzilla: 1034876
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Detect the 64 bit window programmed by firmware
|
|
|
9ae3a8 |
and configure properties accordingly.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2028fdf3791e14c5ad156252afa0e792192a3e92)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci-host/piix.c | 14 ++++++++++----
|
|
|
9ae3a8 |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/pci-host/piix.c | 14 ++++++++++----
|
|
|
9ae3a8 |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
|
|
|
9ae3a8 |
index 167d1fd..0c26835 100644
|
|
|
9ae3a8 |
--- a/hw/pci-host/piix.c
|
|
|
9ae3a8 |
+++ b/hw/pci-host/piix.c
|
|
|
9ae3a8 |
@@ -229,18 +229,24 @@ static void i440fx_pcihost_get_pci_hole64_start(Object *obj, Visitor *v,
|
|
|
9ae3a8 |
void *opaque, const char *name,
|
|
|
9ae3a8 |
Error **errp)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- I440FXState *s = I440FX_PCI_HOST_BRIDGE(obj);
|
|
|
9ae3a8 |
+ PCIHostState *h = PCI_HOST_BRIDGE(obj);
|
|
|
9ae3a8 |
+ Range w64;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ pci_bus_get_w64_range(h->bus, &w64);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- visit_type_uint64(v, &s->pci_info.w64.begin, name, errp);
|
|
|
9ae3a8 |
+ visit_type_uint64(v, &w64.begin, name, errp);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v,
|
|
|
9ae3a8 |
void *opaque, const char *name,
|
|
|
9ae3a8 |
Error **errp)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- I440FXState *s = I440FX_PCI_HOST_BRIDGE(obj);
|
|
|
9ae3a8 |
+ PCIHostState *h = PCI_HOST_BRIDGE(obj);
|
|
|
9ae3a8 |
+ Range w64;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ pci_bus_get_w64_range(h->bus, &w64);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- visit_type_uint64(v, &s->pci_info.w64.end, name, errp);
|
|
|
9ae3a8 |
+ visit_type_uint64(v, &w64.end, name, errp);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static int i440fx_pcihost_initfn(SysBusDevice *dev)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|