From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56650 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PITy6-0004ID-E5 for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PITy5-0001Jy-5a for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:38 -0500 Received: from mail-qw0-f45.google.com ([209.85.216.45]:46732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PITy5-0001Jt-2F for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:37 -0500 Received: by qwi2 with SMTP id 2so464598qwi.4 for ; Tue, 16 Nov 2010 14:25:36 -0800 (PST) Message-ID: <4CE304E2.5030504@codemonkey.ws> Date: Tue, 16 Nov 2010 16:25:38 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Add missing braces References: <1289488204-11153-1-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1289488204-11153-1-git-send-email-Jes.Sorensen@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jes.Sorensen@redhat.com Cc: blauwirbel@gmail.com, qemu-devel@nongnu.org On 11/11/2010 09:10 AM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > This patch adds missing braces around if/else statements that call > macros which are likely to result in errors if the macro is > changed. It also makes the code comply better with CODING_STYLE. > > Signed-off-by: Jes Sorensen > Applied. Thanks. Regards, Anthony Liguori > --- > hw/e1000.c | 13 ++++++++----- > 1 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/hw/e1000.c b/hw/e1000.c > index 532efdc..724dfbe 100644 > --- a/hw/e1000.c > +++ b/hw/e1000.c > @@ -444,9 +444,10 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) > // data descriptor > tp->sum_needed = le32_to_cpu(dp->upper.data)>> 8; > tp->cptse = ( txd_lower& E1000_TXD_CMD_TSE ) ? 1 : 0; > - } else > + } else { > // legacy descriptor > tp->cptse = 0; > + } > > if (vlan_enabled(s)&& is_vlan_txd(txd_lower)&& > (tp->cptse || txd_lower& E1000_TXD_CMD_EOP)) { > @@ -682,8 +683,9 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) > (void *)(buf + vlan_offset), size); > desc.length = cpu_to_le16(size + fcs_len(s)); > desc.status |= E1000_RXD_STAT_EOP|E1000_RXD_STAT_IXSM; > - } else // as per intel docs; skip descriptors with null buf addr > + } else { // as per intel docs; skip descriptors with null buf addr > DBGOUT(RX, "Null RX descriptor!!\n"); > + } > cpu_physical_memory_write(base, (void *)&desc, sizeof(desc)); > > if (++s->mac_reg[RDH] * sizeof(desc)>= s->mac_reg[RDLEN]) > @@ -855,13 +857,14 @@ e1000_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val) > #ifdef TARGET_WORDS_BIGENDIAN > val = bswap32(val); > #endif > - if (index< NWRITEOPS&& macreg_writeops[index]) > + if (index< NWRITEOPS&& macreg_writeops[index]) { > macreg_writeops[index](s, index, val); > - else if (index< NREADOPS&& macreg_readops[index]) > + } else if (index< NREADOPS&& macreg_readops[index]) { > DBGOUT(MMIO, "e1000_mmio_writel RO %x: 0x%04x\n", index<<2, val); > - else > + } else { > DBGOUT(UNKNOWN, "MMIO unknown write addr=0x%08x,val=0x%08x\n", > index<<2, val); > + } > } > > static void >