cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From e1b5da9a17a3c41e469122b76a760be28263a18e Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <e1b5da9a17a3c41e469122b76a760be28263a18e.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:02 +0100
0a122b
Subject: [PATCH 28/56] pcie_host: expose UNMAPPED macro
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-29-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56334
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 28/57] pcie_host: expose UNMAPPED macro
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
Make it possible to test unmapped status through QMP.
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 079e3e7012a0e3ff80b4786e67f5a5d4341dcd51)
0a122b
---
0a122b
 include/hw/pci/pcie_host.h | 3 +++
0a122b
 hw/pci/pcie_host.c         | 3 ---
0a122b
 2 files changed, 3 insertions(+), 3 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/pci/pcie_host.c         | 3 ---
0a122b
 include/hw/pci/pcie_host.h | 3 +++
0a122b
 2 files changed, 3 insertions(+), 3 deletions(-)
0a122b
0a122b
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
0a122b
index b2d942b..0a78a8f 100644
0a122b
--- a/hw/pci/pcie_host.c
0a122b
+++ b/hw/pci/pcie_host.c
0a122b
@@ -104,9 +104,6 @@ static const MemoryRegionOps pcie_mmcfg_ops = {
0a122b
     .endianness = DEVICE_NATIVE_ENDIAN,
0a122b
 };
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
 int pcie_host_init(PCIExpressHost *e)
0a122b
 {
0a122b
     e->base_addr = PCIE_BASE_ADDR_UNMAPPED;
0a122b
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
0a122b
index 1228e36..bac3c67 100644
0a122b
--- a/include/hw/pci/pcie_host.h
0a122b
+++ b/include/hw/pci/pcie_host.h
0a122b
@@ -28,6 +28,9 @@
0a122b
 #define PCIE_HOST_BRIDGE(obj) \
0a122b
     OBJECT_CHECK(PCIExpressHost, (obj), TYPE_PCIE_HOST_BRIDGE)
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
 struct PCIExpressHost {
0a122b
     PCIHostState pci;
0a122b
 
0a122b
-- 
0a122b
1.7.11.7
0a122b