From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTuf-0007Li-A2 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTue-0002px-39 for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:45 -0500 From: Samuel Ortiz Date: Mon, 5 Nov 2018 02:40:32 +0100 Message-Id: <20181105014047.26447-10-sameo@linux.intel.com> In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 09/24] hw: i386: Move PCI host definitions to pci_host.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost The PCI hole properties are not pc or i386 specific. They belong to the PCI host header instead. Signed-off-by: Samuel Ortiz --- include/hw/i386/pc.h | 5 ----- include/hw/pci/pci_host.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fed136fcdd..bbbdb33ea3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -182,11 +182,6 @@ void pc_acpi_init(const char *default_dsdt); void pc_guest_info_init(PCMachineState *pcms); -#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" -#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" -#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" -#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" -#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" #define PCI_HOST_BELOW_4G_MEM_SIZE "below-4g-mem-size" #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index ba31595fc7..e343f4d9ca 100644 --- a/include/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h @@ -38,6 +38,12 @@ #define PCI_HOST_BRIDGE_GET_CLASS(obj) \ OBJECT_GET_CLASS(PCIHostBridgeClass, (obj), TYPE_PCI_HOST_BRIDGE) +#define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" +#define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end" +#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start" +#define PCI_HOST_PROP_PCI_HOLE64_END "pci-hole64-end" +#define PCI_HOST_PROP_PCI_HOLE64_SIZE "pci-hole64-size" + struct PCIHostState { SysBusDevice busdev; -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: [PATCH v5 09/24] hw: i386: Move PCI host definitions to pci_host.h Date: Mon, 5 Nov 2018 02:40:32 +0100 Message-ID: <20181105014047.26447-10-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gJTuM-0003kM-5O for xen-devel@lists.xenproject.org; Mon, 05 Nov 2018 01:42:26 +0000 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org VGhlIFBDSSBob2xlIHByb3BlcnRpZXMgYXJlIG5vdCBwYyBvciBpMzg2IHNwZWNpZmljLiBUaGV5 IGJlbG9uZyB0byB0aGUKUENJIGhvc3QgaGVhZGVyIGluc3RlYWQuCgpTaWduZWQtb2ZmLWJ5OiBT YW11ZWwgT3J0aXogPHNhbWVvQGxpbnV4LmludGVsLmNvbT4KLS0tCiBpbmNsdWRlL2h3L2kzODYv cGMuaCAgICAgIHwgNSAtLS0tLQogaW5jbHVkZS9ody9wY2kvcGNpX2hvc3QuaCB8IDYgKysrKysr CiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9pbmNsdWRlL2h3L2kzODYvcGMuaCBiL2luY2x1ZGUvaHcvaTM4Ni9wYy5oCmluZGV4 IGZlZDEzNmZjZGQuLmJiYmRiMzNlYTMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcvaTM4Ni9wYy5o CisrKyBiL2luY2x1ZGUvaHcvaTM4Ni9wYy5oCkBAIC0xODIsMTEgKzE4Miw2IEBAIHZvaWQgcGNf YWNwaV9pbml0KGNvbnN0IGNoYXIgKmRlZmF1bHRfZHNkdCk7CiAKIHZvaWQgcGNfZ3Vlc3RfaW5m b19pbml0KFBDTWFjaGluZVN0YXRlICpwY21zKTsKIAotI2RlZmluZSBQQ0lfSE9TVF9QUk9QX1BD SV9IT0xFX1NUQVJUICAgInBjaS1ob2xlLXN0YXJ0IgotI2RlZmluZSBQQ0lfSE9TVF9QUk9QX1BD SV9IT0xFX0VORCAgICAgInBjaS1ob2xlLWVuZCIKLSNkZWZpbmUgUENJX0hPU1RfUFJPUF9QQ0lf SE9MRTY0X1NUQVJUICJwY2ktaG9sZTY0LXN0YXJ0IgotI2RlZmluZSBQQ0lfSE9TVF9QUk9QX1BD SV9IT0xFNjRfRU5EICAgInBjaS1ob2xlNjQtZW5kIgotI2RlZmluZSBQQ0lfSE9TVF9QUk9QX1BD SV9IT0xFNjRfU0laRSAgInBjaS1ob2xlNjQtc2l6ZSIKICNkZWZpbmUgUENJX0hPU1RfQkVMT1df NEdfTUVNX1NJWkUgICAgICJiZWxvdy00Zy1tZW0tc2l6ZSIKICNkZWZpbmUgUENJX0hPU1RfQUJP VkVfNEdfTUVNX1NJWkUgICAgICJhYm92ZS00Zy1tZW0tc2l6ZSIKIApkaWZmIC0tZ2l0IGEvaW5j bHVkZS9ody9wY2kvcGNpX2hvc3QuaCBiL2luY2x1ZGUvaHcvcGNpL3BjaV9ob3N0LmgKaW5kZXgg YmEzMTU5NWZjNy4uZTM0M2Y0ZDljYSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody9wY2kvcGNpX2hv c3QuaAorKysgYi9pbmNsdWRlL2h3L3BjaS9wY2lfaG9zdC5oCkBAIC0zOCw2ICszOCwxMiBAQAog I2RlZmluZSBQQ0lfSE9TVF9CUklER0VfR0VUX0NMQVNTKG9iaikgXAogICAgICBPQkpFQ1RfR0VU X0NMQVNTKFBDSUhvc3RCcmlkZ2VDbGFzcywgKG9iaiksIFRZUEVfUENJX0hPU1RfQlJJREdFKQog CisjZGVmaW5lIFBDSV9IT1NUX1BST1BfUENJX0hPTEVfU1RBUlQgICAicGNpLWhvbGUtc3RhcnQi CisjZGVmaW5lIFBDSV9IT1NUX1BST1BfUENJX0hPTEVfRU5EICAgICAicGNpLWhvbGUtZW5kIgor I2RlZmluZSBQQ0lfSE9TVF9QUk9QX1BDSV9IT0xFNjRfU1RBUlQgInBjaS1ob2xlNjQtc3RhcnQi CisjZGVmaW5lIFBDSV9IT1NUX1BST1BfUENJX0hPTEU2NF9FTkQgICAicGNpLWhvbGU2NC1lbmQi CisjZGVmaW5lIFBDSV9IT1NUX1BST1BfUENJX0hPTEU2NF9TSVpFICAicGNpLWhvbGU2NC1zaXpl IgorCiBzdHJ1Y3QgUENJSG9zdFN0YXRlIHsKICAgICBTeXNCdXNEZXZpY2UgYnVzZGV2OwogCi0t IAoyLjE5LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs