From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:38350)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1SsWC9-0006At-3I
	for qemu-devel@nongnu.org; Sat, 21 Jul 2012 05:41:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1SsWC8-0005o4-8l
	for qemu-devel@nongnu.org; Sat, 21 Jul 2012 05:41:53 -0400
Date: Sat, 21 Jul 2012 10:41:45 +0100
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20120721094145.GA13913@stefanha-thinkpad.localdomain>
References: <1342599771-13844-1-git-send-email-aik@ozlabs.ru>
	<5006D8F8.5050306@weilnetz.de> <5006D930.8080205@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5006D930.8080205@suse.de>
Subject: Re: [Qemu-devel] [PATCH] powerpc pci: fixed packing of ranges[]
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alexander Graf <agraf@suse.de>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, Stefan Weil <sw@weilnetz.de>, qemu-devel@nongnu.org, qemu-trivial <qemu-trivial@nongnu.org>, qemu-ppc@nongnu.org, David Gibson <david@gibson.dropbear.id.au>

On Wed, Jul 18, 2012 at 05:41:36PM +0200, Alexander Graf wrote:
> On 07/18/2012 05:40 PM, Stefan Weil wrote:
> >Am 18.07.2012 10:22, schrieb Alexey Kardashevskiy:
> >>By default mingw-gcc is trying to pack structures the way to
> >>preserve binary compatibility with MS Visual C what leads to
> >>incorrect and unexpected padding in the PCI bus ranges property of
> >>the sPAPR PHB.
> >>
> >>The patch replaces __attribute__((packed)) with more strict QEMU_PACKED
> >>which actually is __attribute__((gcc_struct, packed)) on Windows.
> >>
> >>Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> >>---
> >>  hw/spapr_pci.c |    2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
> >>index b3032d2..0261d2e 100644
> >>--- a/hw/spapr_pci.c
> >>+++ b/hw/spapr_pci.c
> >>@@ -418,7 +418,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
> >>          uint64_t child;
> >>          uint64_t parent;
> >>          uint64_t size;
> >>-    } __attribute__((packed)) ranges[] = {
> >>+    } QEMU_PACKED ranges[] = {
> >>          {
> >>              cpu_to_be32(b_ss(1)), cpu_to_be64(0),
> >>              cpu_to_be64(phb->io_win_addr),
> >
> >
> >The patch changes sizeof(ranges[0]) from 32 to 28 bytes
> >and can be applied as a trivial patch.
> >
> >Tested-by: Stefan Weil <sw@weilnetz.de>
> >Reviewed-by: Stefan Weil <sw@weilnetz.de>
> >
> 
> So do you want to take it through the trivial queue? I'm fine either way.
> 
> Acked-by: Alexander Graf <agraf@suse.de>

Merged into the trivial patches tree with your Acked-by:.

Stefan