cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 3d461e82d134f7370f28ff2def581d39a3e19729 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <3d461e82d134f7370f28ff2def581d39a3e19729.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:18:09 +0100
0a122b
Subject: [PATCH 31/56] q35: expose mmcfg size as a property
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-32-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56337
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 31/57] q35: expose mmcfg size as a property
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
Address is already exposed, expose size for symmetry.
0a122b
0a122b
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
0a122b
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
0a122b
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Tested-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
(cherry picked from commit cbcaf79e3ce1b14084f3e3f4f64365e9bfd70e6a)
0a122b
---
0a122b
 include/hw/pci/pcie_host.h |  1 +
0a122b
 hw/pci-host/q35.c          | 14 ++++++++++++++
0a122b
 2 files changed, 15 insertions(+)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/pci-host/q35.c          | 14 ++++++++++++++
0a122b
 include/hw/pci/pcie_host.h |  1 +
0a122b
 2 files changed, 15 insertions(+)
0a122b
0a122b
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
0a122b
index 72d97c8..87691d1 100644
0a122b
--- a/hw/pci-host/q35.c
0a122b
+++ b/hw/pci-host/q35.c
0a122b
@@ -108,6 +108,16 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v,
0a122b
     visit_type_uint64(v, &w64.end, name, errp);
0a122b
 }
0a122b
 
0a122b
+static void q35_host_get_mmcfg_size(Object *obj, Visitor *v,
0a122b
+                                    void *opaque, const char *name,
0a122b
+                                    Error **errp)
0a122b
+{
0a122b
+    PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
0a122b
+    uint32_t value = e->size;
0a122b
+
0a122b
+    visit_type_uint32(v, &value, name, errp);
0a122b
+}
0a122b
+
0a122b
 static Property mch_props[] = {
0a122b
     DEFINE_PROP_UINT64(PCIE_HOST_MCFG_BASE, Q35PCIHost, host.base_addr,
0a122b
                        MCH_HOST_BRIDGE_PCIEXBAR_DEFAULT),
0a122b
@@ -152,6 +162,10 @@ static void q35_host_initfn(Object *obj)
0a122b
                         q35_host_get_pci_hole64_end,
0a122b
                         NULL, NULL, NULL, NULL);
0a122b
 
0a122b
+    object_property_add(obj, PCIE_HOST_MCFG_SIZE, "int",
0a122b
+                        q35_host_get_mmcfg_size,
0a122b
+                        NULL, NULL, NULL, NULL);
0a122b
+
0a122b
     /* Leave enough space for the biggest MCFG BAR */
0a122b
     /* TODO: this matches current bios behaviour, but
0a122b
      * it's not a power of two, which means an MTRR
0a122b
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
0a122b
index 33d75bd..acca45e 100644
0a122b
--- a/include/hw/pci/pcie_host.h
0a122b
+++ b/include/hw/pci/pcie_host.h
0a122b
@@ -29,6 +29,7 @@
0a122b
     OBJECT_CHECK(PCIExpressHost, (obj), TYPE_PCIE_HOST_BRIDGE)
0a122b
 
0a122b
 #define PCIE_HOST_MCFG_BASE "MCFG"
0a122b
+#define PCIE_HOST_MCFG_SIZE "mcfg_size"
0a122b
 
0a122b
 /* pcie_host::base_addr == PCIE_BASE_ADDR_UNMAPPED when it isn't mapped. */
0a122b
 #define PCIE_BASE_ADDR_UNMAPPED  ((hwaddr)-1ULL)
0a122b
-- 
0a122b
1.7.11.7
0a122b