From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Zel-00066X-GW for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:44:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4Zei-0001ZS-Qi for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:44:43 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:33064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Zei-0001Yl-KA for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:44:40 -0400 Received: by gxk26 with SMTP id 26so4728074gxk.4 for ; Fri, 16 Sep 2011 07:44:40 -0700 (PDT) Message-ID: <4E7360D5.5020500@codemonkey.ws> Date: Fri, 16 Sep 2011 09:44:37 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1315859581-27703-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1315859581-27703-1-git-send-email-weil@mail.berlios.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Remove blanks before \n in output strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: qemu-devel@nongnu.org On 09/12/2011 03:33 PM, Stefan Weil wrote: > Those blanks violate the coding conventions, see > scripts/checkpatch.pl. > > Blanks missing after colons in the changed lines were added. > > This patch does not try to fix tabs, long lines and other > problems in the changed lines, therefore checkpatch.pl reports > many violations. > > Signed-off-by: Stefan Weil Applied. Thanks. Regards, Anthony Liguori > --- > block/vvfat.c | 2 +- > darwin-user/machload.c | 4 ++-- > hw/bonito.c | 24 ++++++++++++------------ > hw/fmopl.c | 2 +- > hw/hpet.c | 8 ++++---- > hw/loader.c | 4 ++-- > hw/mips_fulong2e.c | 2 +- > hw/mst_fpga.c | 4 ++-- > hw/vt82c686.c | 12 ++++++------ > linux-user/syscall.c | 2 +- > mips-dis.c | 2 +- > qemu-io.c | 2 +- > slirp/tcp_input.c | 8 ++++---- > slirp/tcp_subr.c | 2 +- > target-ppc/helper.c | 2 +- > tests/test-i386.c | 2 +- > 16 files changed, 41 insertions(+), 41 deletions(-) > > diff --git a/block/vvfat.c b/block/vvfat.c > index 187ac96..f567c9a 100644 > --- a/block/vvfat.c > +++ b/block/vvfat.c > @@ -1789,7 +1789,7 @@ DLOG(fprintf(stderr, "read cluster %d (sector %d)\n", (int)cluster_num, (int)clu > for (i = 0; i< 0x10 * s->sectors_per_cluster; i++) { > int cluster_count = 0; > > -DLOG(fprintf(stderr, "check direntry %d: \n", i); print_direntry(direntries + i)); > +DLOG(fprintf(stderr, "check direntry %d:\n", i); print_direntry(direntries + i)); > if (is_volume_label(direntries + i) || is_dot(direntries + i) || > is_free(direntries + i)) > continue; > diff --git a/darwin-user/machload.c b/darwin-user/machload.c > index 3bc3b65..0aa8282 100644 > --- a/darwin-user/machload.c > +++ b/darwin-user/machload.c > @@ -865,11 +865,11 @@ unsigned long setup_arg_pages(void * mh, char ** argv, char ** env) > page_set_flags((int)argv[i], (int)(argv[i]+strlen(argv[i])), PROT_READ | PAGE_VALID); > } > > - DPRINTF("pushing argc %d \n", argc); > + DPRINTF("pushing argc %d\n", argc); > stl(stack, argc); > stack--; > > - DPRINTF("pushing mh 0x%x \n", (int)mh); > + DPRINTF("pushing mh 0x%x\n", (int)mh); > stl(stack, (int) mh); > > /* Stack points on the mh */ > diff --git a/hw/bonito.c b/hw/bonito.c > index 8708e95..fdb8198 100644 > --- a/hw/bonito.c > +++ b/hw/bonito.c > @@ -241,7 +241,7 @@ static void bonito_writel(void *opaque, target_phys_addr_t addr, uint32_t val) > > saddr = (addr - BONITO_REGBASE)>> 2; > > - DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x \n", addr, val, saddr); > + DPRINTF("bonito_writel "TARGET_FMT_plx" val %x saddr %x\n", addr, val, saddr); > switch (saddr) { > case BONITO_BONPONCFG: > case BONITO_IODEVCFG: > @@ -287,10 +287,10 @@ static void bonito_writel(void *opaque, target_phys_addr_t addr, uint32_t val) > break; > case BONITO_INTEN: > case BONITO_INTISR: > - DPRINTF("write to readonly bonito register %x \n", saddr); > + DPRINTF("write to readonly bonito register %x\n", saddr); > break; > default: > - DPRINTF("write to unknown bonito register %x \n", saddr); > + DPRINTF("write to unknown bonito register %x\n", saddr); > break; > } > } > @@ -302,7 +302,7 @@ static uint32_t bonito_readl(void *opaque, target_phys_addr_t addr) > > saddr = (addr - BONITO_REGBASE)>> 2; > > - DPRINTF("bonito_readl "TARGET_FMT_plx" \n", addr); > + DPRINTF("bonito_readl "TARGET_FMT_plx"\n", addr); > switch (saddr) { > case BONITO_INTISR: > return s->regs[saddr]; > @@ -328,7 +328,7 @@ static void bonito_pciconf_writel(void *opaque, target_phys_addr_t addr, > { > PCIBonitoState *s = opaque; > > - DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %x \n", addr, val); > + DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %x\n", addr, val); > s->dev.config_write(&s->dev, addr, val, 4); > } > > @@ -443,7 +443,7 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, target_phys_addr_t addr) > exit(1); > } > pciaddr = PCI_ADDR(pci_bus_num(s->pcihost->bus), devno, funno, regno); > - DPRINTF("cfgaddr %x pciaddr %x busno %x devno %d funno %d regno %d \n", > + DPRINTF("cfgaddr %x pciaddr %x busno %x devno %d funno %d regno %d\n", > cfgaddr, pciaddr, pci_bus_num(s->pcihost->bus), devno, funno, regno); > > return pciaddr; > @@ -456,7 +456,7 @@ static void bonito_spciconf_writeb(void *opaque, target_phys_addr_t addr, > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_writeb "TARGET_FMT_plx" val %x \n", addr, val); > + DPRINTF("bonito_spciconf_writeb "TARGET_FMT_plx" val %x\n", addr, val); > pciaddr = bonito_sbridge_pciaddr(s, addr); > > if (pciaddr == 0xffffffff) { > @@ -480,7 +480,7 @@ static void bonito_spciconf_writew(void *opaque, target_phys_addr_t addr, > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_writew "TARGET_FMT_plx" val %x \n", addr, val); > + DPRINTF("bonito_spciconf_writew "TARGET_FMT_plx" val %x\n", addr, val); > assert((addr&0x1)==0); > > pciaddr = bonito_sbridge_pciaddr(s, addr); > @@ -506,7 +506,7 @@ static void bonito_spciconf_writel(void *opaque, target_phys_addr_t addr, > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_writel "TARGET_FMT_plx" val %x \n", addr, val); > + DPRINTF("bonito_spciconf_writel "TARGET_FMT_plx" val %x\n", addr, val); > assert((addr&0x3)==0); > > pciaddr = bonito_sbridge_pciaddr(s, addr); > @@ -531,7 +531,7 @@ static uint32_t bonito_spciconf_readb(void *opaque, target_phys_addr_t addr) > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_readb "TARGET_FMT_plx" \n", addr); > + DPRINTF("bonito_spciconf_readb "TARGET_FMT_plx"\n", addr); > pciaddr = bonito_sbridge_pciaddr(s, addr); > > if (pciaddr == 0xffffffff) { > @@ -555,7 +555,7 @@ static uint32_t bonito_spciconf_readw(void *opaque, target_phys_addr_t addr) > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_readw "TARGET_FMT_plx" \n", addr); > + DPRINTF("bonito_spciconf_readw "TARGET_FMT_plx"\n", addr); > assert((addr&0x1)==0); > > pciaddr = bonito_sbridge_pciaddr(s, addr); > @@ -581,7 +581,7 @@ static uint32_t bonito_spciconf_readl(void *opaque, target_phys_addr_t addr) > uint32_t pciaddr; > uint16_t status; > > - DPRINTF("bonito_spciconf_readl "TARGET_FMT_plx" \n", addr); > + DPRINTF("bonito_spciconf_readl "TARGET_FMT_plx"\n", addr); > assert((addr&0x3) == 0); > > pciaddr = bonito_sbridge_pciaddr(s, addr); > diff --git a/hw/fmopl.c b/hw/fmopl.c > index d8a0f36..5ad52ab 100644 > --- a/hw/fmopl.c > +++ b/hw/fmopl.c > @@ -606,7 +606,7 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) > } > #if 0 > for (i = 0;i< 64 ;i++){ /* make for overflow area */ > - LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, > + LOG(LOG_WAR, ("rate %2d , ar %f ms , dr %f ms\n", i, > ((double)(EG_ENT<AR_TABLE[i]) * (1000.0 / OPL->rate), > ((double)(EG_ENT<DR_TABLE[i]) * (1000.0 / OPL->rate) )); > } > diff --git a/hw/hpet.c b/hw/hpet.c > index 4eda33d..12bd64d 100644 > --- a/hw/hpet.c > +++ b/hw/hpet.c > @@ -397,7 +397,7 @@ static uint32_t hpet_ram_readl(void *opaque, target_phys_addr_t addr) > case HPET_CFG: > return s->config; > case HPET_CFG + 4: > - DPRINTF("qemu: invalid HPET_CFG + 4 hpet_ram_readl \n"); > + DPRINTF("qemu: invalid HPET_CFG + 4 hpet_ram_readl\n"); > return 0; > case HPET_COUNTER: > if (hpet_enabled(s)) { > @@ -458,7 +458,7 @@ static void hpet_ram_writel(void *opaque, target_phys_addr_t addr, > uint8_t timer_id = (addr - 0x100) / 0x20; > HPETTimer *timer =&s->timer[timer_id]; > > - DPRINTF("qemu: hpet_ram_writel timer_id = %#x \n", timer_id); > + DPRINTF("qemu: hpet_ram_writel timer_id = %#x\n", timer_id); > if (timer_id> s->num_timers) { > DPRINTF("qemu: timer id out of range\n"); > return; > @@ -485,7 +485,7 @@ static void hpet_ram_writel(void *opaque, target_phys_addr_t addr, > DPRINTF("qemu: invalid HPET_TN_CFG+4 write\n"); > break; > case HPET_TN_CMP: // comparator register > - DPRINTF("qemu: hpet_ram_writel HPET_TN_CMP \n"); > + DPRINTF("qemu: hpet_ram_writel HPET_TN_CMP\n"); > if (timer->config& HPET_TN_32BIT) { > new_val = (uint32_t)new_val; > } > @@ -570,7 +570,7 @@ static void hpet_ram_writel(void *opaque, target_phys_addr_t addr, > } > break; > case HPET_CFG + 4: > - DPRINTF("qemu: invalid HPET_CFG+4 write \n"); > + DPRINTF("qemu: invalid HPET_CFG+4 write\n"); > break; > case HPET_STATUS: > val = new_val& s->isr; > diff --git a/hw/loader.c b/hw/loader.c > index 8efb146..5676c18 100644 > --- a/hw/loader.c > +++ b/hw/loader.c > @@ -779,13 +779,13 @@ void do_info_roms(Monitor *mon) > QTAILQ_FOREACH(rom,&roms, next) { > if (!rom->fw_file) { > monitor_printf(mon, "addr=" TARGET_FMT_plx > - " size=0x%06zx mem=%s name=\"%s\" \n", > + " size=0x%06zx mem=%s name=\"%s\"\n", > rom->addr, rom->romsize, > rom->isrom ? "rom" : "ram", > rom->name); > } else { > monitor_printf(mon, "fw=%s/%s" > - " size=0x%06zx name=\"%s\" \n", > + " size=0x%06zx name=\"%s\"\n", > rom->fw_dir, > rom->fw_file, > rom->romsize, > diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c > index abe3056..f52b8c5 100644 > --- a/hw/mips_fulong2e.c > +++ b/hw/mips_fulong2e.c > @@ -343,7 +343,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, > > via_devfn = vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 0)); > if (via_devfn< 0) { > - fprintf(stderr, "vt82c686b_init error \n"); > + fprintf(stderr, "vt82c686b_init error\n"); > exit(1); > } > > diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c > index 4e47574..7bcd5d7 100644 > --- a/hw/mst_fpga.c > +++ b/hw/mst_fpga.c > @@ -118,7 +118,7 @@ mst_fpga_readb(void *opaque, target_phys_addr_t addr) > return s->pcmcia1; > default: > printf("Mainstone - mst_fpga_readb: Bad register offset " > - "0x" TARGET_FMT_plx " \n", addr); > + "0x" TARGET_FMT_plx "\n", addr); > } > return 0; > } > @@ -171,7 +171,7 @@ mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) > break; > default: > printf("Mainstone - mst_fpga_writeb: Bad register offset " > - "0x" TARGET_FMT_plx " \n", addr); > + "0x" TARGET_FMT_plx "\n", addr); > } > } > > diff --git a/hw/vt82c686.c b/hw/vt82c686.c > index 5c973ed..b9fcc0e 100644 > --- a/hw/vt82c686.c > +++ b/hw/vt82c686.c > @@ -49,7 +49,7 @@ static void superio_ioport_writeb(void *opaque, uint32_t addr, uint32_t data) > int can_write; > SuperIOConfig *superio_conf = opaque; > > - DPRINTF("superio_ioport_writeb address 0x%x val 0x%x \n", addr, data); > + DPRINTF("superio_ioport_writeb address 0x%x val 0x%x\n", addr, data); > if (addr == 0x3f0) { > superio_conf->index = data& 0xff; > } else { > @@ -73,12 +73,12 @@ static void superio_ioport_writeb(void *opaque, uint32_t addr, uint32_t data) > switch (superio_conf->index) { > case 0xe7: > if ((data& 0xff) != 0xfe) { > - DPRINTF("chage uart 1 base. unsupported yet \n"); > + DPRINTF("chage uart 1 base. unsupported yet\n"); > } > break; > case 0xe8: > if ((data& 0xff) != 0xbe) { > - DPRINTF("chage uart 2 base. unsupported yet \n"); > + DPRINTF("chage uart 2 base. unsupported yet\n"); > } > break; > > @@ -95,7 +95,7 @@ static uint32_t superio_ioport_readb(void *opaque, uint32_t addr) > { > SuperIOConfig *superio_conf = opaque; > > - DPRINTF("superio_ioport_readb address 0x%x \n", addr); > + DPRINTF("superio_ioport_readb address 0x%x\n", addr); > return (superio_conf->config[superio_conf->index]); > } > > @@ -133,7 +133,7 @@ static void vt82c686b_write_config(PCIDevice * d, uint32_t address, > { > VT82C686BState *vt686 = DO_UPCAST(VT82C686BState, dev, d); > > - DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x \n", > + DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n", > address, val, len); > > pci_default_write_config(d, address, val, len); > @@ -285,7 +285,7 @@ static void pm_io_space_update(VT686PMState *s) > static void pm_write_config(PCIDevice *d, > uint32_t address, uint32_t val, int len) > { > - DPRINTF("pm_write_config address 0x%x val 0x%x len 0x%x \n", > + DPRINTF("pm_write_config address 0x%x val 0x%x len 0x%x\n", > address, val, len); > pci_default_write_config(d, address, val, len); > } > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index e87e174..6b73769 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1504,7 +1504,7 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, > break; > default: > unimplemented: > - gemu_log("Unsupported setsockopt level=%d optname=%d \n", level, optname); > + gemu_log("Unsupported setsockopt level=%d optname=%d\n", level, optname); > ret = -TARGET_ENOPROTOOPT; > } > return ret; > diff --git a/mips-dis.c b/mips-dis.c > index 4d8e85b..e3a6e0b 100644 > --- a/mips-dis.c > +++ b/mips-dis.c > @@ -4841,7 +4841,7 @@ with the -M switch (multiple options should be separated by commas):\n")); > Default: based on binary being disassembled.\n")); > > fprintf (stream, _("\n\ > - hwr-names=ARCH Print HWR names according to specified \n\ > + hwr-names=ARCH Print HWR names according to specified\n\ > architecture.\n\ > Default: based on binary being disassembled.\n")); > > diff --git a/qemu-io.c b/qemu-io.c > index 5e46213..e91af37 100644 > --- a/qemu-io.c > +++ b/qemu-io.c > @@ -880,7 +880,7 @@ static void multiwrite_help(void) > " in a batch of requests that may be merged by qemu\n" > "\n" > " Example:\n" > -" 'multiwrite 512 1k 1k ; 4k 1k' \n" > +" 'multiwrite 512 1k 1k ; 4k 1k'\n" > " writes 2 kB at 512 bytes and 1 kB at 4 kB into the open file\n" > "\n" > " Writes into a segment of the currently open file, using a buffer\n" > diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c > index c1214c0..8bbd70c 100644 > --- a/slirp/tcp_input.c > +++ b/slirp/tcp_input.c > @@ -231,7 +231,7 @@ tcp_input(struct mbuf *m, int iphlen, struct socket *inso) > Slirp *slirp; > > DEBUG_CALL("tcp_input"); > - DEBUG_ARGS((dfd," m = %8lx iphlen = %2d inso = %lx\n", > + DEBUG_ARGS((dfd, " m = %8lx iphlen = %2d inso = %lx\n", > (long )m, iphlen, (long )inso )); > > /* > @@ -580,7 +580,7 @@ findso: > > if((tcp_fconnect(so) == -1)&& (errno != EINPROGRESS)&& (errno != EWOULDBLOCK)) { > u_char code=ICMP_UNREACH_NET; > - DEBUG_MISC((dfd," tcp fconnect errno = %d-%s\n", > + DEBUG_MISC((dfd, " tcp fconnect errno = %d-%s\n", > errno,strerror(errno))); > if(errno == ECONNREFUSED) { > /* ACK the SYN, send RST to refuse the connection */ > @@ -910,7 +910,7 @@ trimthenstep6: > > if (SEQ_LEQ(ti->ti_ack, tp->snd_una)) { > if (ti->ti_len == 0&& tiwin == tp->snd_wnd) { > - DEBUG_MISC((dfd," dup ack m = %lx so = %lx \n", > + DEBUG_MISC((dfd, " dup ack m = %lx so = %lx\n", > (long )m, (long )so)); > /* > * If we have outstanding data (other than > @@ -1293,7 +1293,7 @@ tcp_dooptions(struct tcpcb *tp, u_char *cp, int cnt, struct tcpiphdr *ti) > int opt, optlen; > > DEBUG_CALL("tcp_dooptions"); > - DEBUG_ARGS((dfd," tp = %lx cnt=%i \n", (long )tp, cnt)); > + DEBUG_ARGS((dfd, " tp = %lx cnt=%i\n", (long)tp, cnt)); > > for (; cnt> 0; cnt -= optlen, cp += optlen) { > opt = cp[0]; > diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c > index 61079b1..143a238 100644 > --- a/slirp/tcp_subr.c > +++ b/slirp/tcp_subr.c > @@ -902,7 +902,7 @@ int tcp_ctl(struct socket *so) > return 1; > } > do_pty = ex_ptr->ex_pty; > - DEBUG_MISC((dfd, " executing %s \n",ex_ptr->ex_exec)); > + DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec)); > return fork_exec(so, ex_ptr->ex_exec, do_pty); > } > } > diff --git a/target-ppc/helper.c b/target-ppc/helper.c > index 5ec83f2..96ea464 100644 > --- a/target-ppc/helper.c > +++ b/target-ppc/helper.c > @@ -553,7 +553,7 @@ static inline int get_bat(CPUState *env, mmu_ctx_t *ctx, target_ulong virtual, > BEPIl = *BATu& 0x0FFE0000; > bl = (*BATu& 0x00001FFC)<< 15; > LOG_BATS("%s: %cBAT%d v " TARGET_FMT_lx " BATu " TARGET_FMT_lx > - " BATl " TARGET_FMT_lx " \n\t" TARGET_FMT_lx " " > + " BATl " TARGET_FMT_lx "\n\t" TARGET_FMT_lx " " > TARGET_FMT_lx " " TARGET_FMT_lx "\n", > __func__, type == ACCESS_CODE ? 'I' : 'D', i, virtual, > *BATu, *BATl, BEPIu, BEPIl, bl); > diff --git a/tests/test-i386.c b/tests/test-i386.c > index 9cb5b51..8e64bba 100644 > --- a/tests/test-i386.c > +++ b/tests/test-i386.c > @@ -802,7 +802,7 @@ void test_fcmp(double a, double b) > "fstsw %%ax\n" > : "=a" (fpus) > : "t" (a), "u" (b)); > - printf("fcom(%f %f)=%04lx \n", > + printf("fcom(%f %f)=%04lx\n", > a, b, fpus& (0x4500 | FPUS_EMASK)); > fpu_clear_exceptions(); > asm("fucom %2\n"