From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Habkost Subject: [PATCH 1/3] spapr: Eliminate SPAPR_PCI_2_7_MMIO_WIN_SIZE macro Date: Mon, 7 Jan 2019 17:30:18 -0200 Message-ID: <20190107193020.21744-2-ehabkost@redhat.com> References: <20190107193020.21744-1-ehabkost@redhat.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 1ggabc-0001l5-99 for xen-devel@lists.xenproject.org; Mon, 07 Jan 2019 19:30:36 +0000 In-Reply-To: <20190107193020.21744-1-ehabkost@redhat.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: qemu-ppc@nongnu.org, Stefano Stabellini , Eduardo Habkost , David Hildenbrand , Cornelia Huck , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Paolo Bonzini , David Gibson , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org VGhlIG1hY3JvIGlzIG9ubHkgdXNlZCBpbiBvbmUgcGxhY2UsIHdoZXJlIHRoZSBwdXJwb3NlIG9m IHRoZQp2YWx1ZSBpcyBvYnZpb3VzLiAgRWxpbWluYXRlIHRoZSBtYWNybyBzbyB3ZSBkb24ndCBu ZWVkIHRvIHJlbHkKb24gc3RyaW5naWZ5KCkuCgpTaWduZWQtb2ZmLWJ5OiBFZHVhcmRvIEhhYmtv c3QgPGVoYWJrb3N0QHJlZGhhdC5jb20+Ci0tLQogaW5jbHVkZS9ody9wY2ktaG9zdC9zcGFwci5o IHwgMSAtCiBody9wcGMvc3BhcHIuYyAgICAgICAgICAgICAgfCAyICstCiAyIGZpbGVzIGNoYW5n ZWQsIDEgaW5zZXJ0aW9uKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUv aHcvcGNpLWhvc3Qvc3BhcHIuaCBiL2luY2x1ZGUvaHcvcGNpLWhvc3Qvc3BhcHIuaAppbmRleCA3 YzY2YzM4NzJmLi5hODVhOTk1YjZjIDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3BjaS1ob3N0L3Nw YXByLmgKKysrIGIvaW5jbHVkZS9ody9wY2ktaG9zdC9zcGFwci5oCkBAIC05OSw3ICs5OSw2IEBA IHN0cnVjdCBzUEFQUlBIQlN0YXRlIHsKICNkZWZpbmUgU1BBUFJfUENJX0JBU0UgICAgICAgICAg ICAgICAoMVVMTCA8PCA0NSkgLyogMzIgVGlCICovCiAjZGVmaW5lIFNQQVBSX1BDSV9MSU1JVCAg ICAgICAgICAgICAgKDFVTEwgPDwgNDYpIC8qIDY0IFRpQiAqLwogCi0jZGVmaW5lIFNQQVBSX1BD SV8yXzdfTU1JT19XSU5fU0laRSAgMHhmODAwMDAwMDAKICNkZWZpbmUgU1BBUFJfUENJX0lPX1dJ Tl9TSVpFICAgICAgICAweDEwMDAwCiAKICNkZWZpbmUgU1BBUFJfUENJX01TSV9XSU5ET1cgICAg ICAgICAweDQwMDAwMDAwMDAwVUxMCmRpZmYgLS1naXQgYS9ody9wcGMvc3BhcHIuYyBiL2h3L3Bw Yy9zcGFwci5jCmluZGV4IDU2NzE2MDhjZWEuLmJmZjQyZjBhZGIgMTAwNjQ0Ci0tLSBhL2h3L3Bw Yy9zcGFwci5jCisrKyBiL2h3L3BwYy9zcGFwci5jCkBAIC00MjI1LDcgKzQyMjUsNyBAQCBzdGF0 aWMgdm9pZCBzcGFwcl9tYWNoaW5lXzJfN19jbGFzc19vcHRpb25zKE1hY2hpbmVDbGFzcyAqbWMp CiAgICAgICAgIHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfU1BBUFJfUENJX0hPU1Rf QlJJREdFLAogICAgICAgICAgICAgLnByb3BlcnR5ID0gIm1lbV93aW5fc2l6ZSIsCi0gICAgICAg ICAgICAudmFsdWUgICAgPSBzdHJpbmdpZnkoU1BBUFJfUENJXzJfN19NTUlPX1dJTl9TSVpFKSwK KyAgICAgICAgICAgIC52YWx1ZSAgICA9ICIweGY4MDAwMDAwMCIsCiAgICAgICAgIH0sCiAgICAg ICAgIHsKICAgICAgICAgICAgIC5kcml2ZXIgICA9IFRZUEVfU1BBUFJfUENJX0hPU1RfQlJJREdF LAotLSAKMi4xOC4wLnJjMS4xLmczZjFmZjIxNDAKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggabg-0008FT-Tt for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:30:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggabe-0000Ie-Nr for qemu-devel@nongnu.org; Mon, 07 Jan 2019 14:30:40 -0500 From: Eduardo Habkost Date: Mon, 7 Jan 2019 17:30:18 -0200 Message-Id: <20190107193020.21744-2-ehabkost@redhat.com> In-Reply-To: <20190107193020.21744-1-ehabkost@redhat.com> References: <20190107193020.21744-1-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] spapr: Eliminate SPAPR_PCI_2_7_MMIO_WIN_SIZE macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Hildenbrand , Paolo Bonzini , Christian Borntraeger , Cornelia Huck , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , David Gibson , qemu-s390x@nongnu.org, Halil Pasic , Anthony Perard , Eduardo Habkost , Marcel Apfelbaum , Stefano Stabellini , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, xen-devel@lists.xenproject.org The macro is only used in one place, where the purpose of the value is obvious. Eliminate the macro so we don't need to rely on stringify(). Signed-off-by: Eduardo Habkost --- include/hw/pci-host/spapr.h | 1 - hw/ppc/spapr.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 7c66c3872f..a85a995b6c 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -99,7 +99,6 @@ struct sPAPRPHBState { #define SPAPR_PCI_BASE (1ULL << 45) /* 32 TiB */ #define SPAPR_PCI_LIMIT (1ULL << 46) /* 64 TiB */ -#define SPAPR_PCI_2_7_MMIO_WIN_SIZE 0xf80000000 #define SPAPR_PCI_IO_WIN_SIZE 0x10000 #define SPAPR_PCI_MSI_WINDOW 0x40000000000ULL diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5671608cea..bff42f0adb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4225,7 +4225,7 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, .property = "mem_win_size", - .value = stringify(SPAPR_PCI_2_7_MMIO_WIN_SIZE), + .value = "0xf80000000", }, { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, -- 2.18.0.rc1.1.g3f1ff2140