From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrWNm-0004HB-5V for qemu-devel@nongnu.org; Wed, 18 Jul 2012 11:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrWNk-0002QK-WA for qemu-devel@nongnu.org; Wed, 18 Jul 2012 11:41:46 -0400 Message-ID: <5006D930.8080205@suse.de> Date: Wed, 18 Jul 2012 17:41:36 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1342599771-13844-1-git-send-email-aik@ozlabs.ru> <5006D8F8.5050306@weilnetz.de> In-Reply-To: <5006D8F8.5050306@weilnetz.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] powerpc pci: fixed packing of ranges[] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Alexey Kardashevskiy , qemu-trivial , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson 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 >> --- >> 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 > Reviewed-by: Stefan Weil > So do you want to take it through the trivial queue? I'm fine either way. Acked-by: Alexander Graf Alex