[Qemu-devel] [PATCH 01/13] vvfat: fix coding style nit

[Qemu-devel] [PATCH 01/13] vvfat: fix coding style nit

[Michael S. Tsirkin]

Put space between = and & when taking a pointer,
to avoid confusion with old-style "&=".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 block/vvfat.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index 1e37b9f..063f731 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -379,7 +379,7 @@ static void init_mbr(BDRVVVFATState* s)
 {
     /* TODO: if the files mbr.img and bootsect.img exist, use them */
     mbr_t* real_mbr=(mbr_t*)s->first_sectors;
-    partition_t* partition=&(real_mbr->partition[0]);
+    partition_t* partition = &(real_mbr->partition[0]);
     int lba;
 
     memset(s->first_sectors,0,512);
@@ -526,7 +526,7 @@ static uint16_t fat_datetime(time_t time,int return_time) {
     t=localtime(&time); /* this is not thread safe */
 #else
     struct tm t1;
-    t=&t1;
+    t = &t1;
     localtime_r(&time,t);
 #endif
     if(return_time)
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 02/13] elfload: fix coding style nit

[Michael S. Tsirkin]

Put space between = and * when dereferencing a pointer,
to avoid confusion with old-style "*="

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 bsd-user/elfload.c   |    2 +-
 linux-user/elfload.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 19981f0..33ddcc4 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -1268,7 +1268,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
             }
             if (retval >= 0) {
                 interp_ex = *((struct exec *) bprm->buf); /* aout exec-header */
-                interp_elf_ex=*((struct elfhdr *) bprm->buf); /* elf exec-header */
+                interp_elf_ex = *((struct elfhdr *) bprm->buf); /* elf exec-header */
             }
             if (retval < 0) {
                 perror("load_elf_binary3");
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 7c8e771..07277a6 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1476,7 +1476,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
 	    }
 	    if (retval >= 0) {
 		interp_ex = *((struct exec *) bprm->buf); /* aout exec-header */
-		interp_elf_ex=*((struct elfhdr *) bprm->buf); /* elf exec-header */
+		interp_elf_ex = *((struct elfhdr *) bprm->buf); /* elf exec-header */
 	    }
 	    if (retval < 0) {
 		perror("load_elf_binary3");
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 03/13] gdbstub: fix coding style nit

[Michael S. Tsirkin]

Put space between = and * when dereferencing a pointer,
to avoid confusion with old-style "*="

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 gdbstub.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gdbstub.c b/gdbstub.c
index 33d79eb..3c31fad 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1284,7 +1284,7 @@ static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n)
     else if (n<63) {
        uint64_t val;
 
-       val=*((uint64_t *)&env->fir[n-32]);
+       val = *((uint64_t *)&env->fir[n-32]);
        GET_REGL(val);
     }
     else if (n==63) {
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 04/13] escc: fix coding style nit

[Michael S. Tsirkin]

Put space between = and - assigning a negative number
to avoid confusion with old-style "-="
(which we also have, and needs to be fixed).

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/escc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/escc.c b/hw/escc.c
index 17694ed..cb34d7d 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -869,9 +869,9 @@ static void sunmouse_event(void *opaque,
     ch = dx;
 
     if (ch > 127)
-        ch=127;
+        ch = 127;
     else if (ch < -127)
-        ch=-127;
+        ch = -127;
 
     put_queue(s, ch & 0xff);
 
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 05/13] omap_dma: fix unbalanced { in commented out code

[Michael S. Tsirkin]

Fix unbalanced {} in commented out code.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/omap_dma.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/hw/omap_dma.c b/hw/omap_dma.c
index 6f5eaca..205d010 100644
--- a/hw/omap_dma.c
+++ b/hw/omap_dma.c
@@ -588,7 +588,7 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma)
 #ifdef MULTI_REQ
     /* TODO: should all of this only be done if dma->update, and otherwise
      * inside omap_dma_transfer_generic below - check what's faster.  */
-    if (dma->update) {
+    if (dma->update)
 #endif
 
     /* If the channel is element synchronized, deactivate it */
@@ -668,7 +668,9 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma)
 
         /* TODO: if the destination port is IMIF or EMIFF, set the dirty
          * bits on it.  */
+#ifndef MULTI_REQ
     }
+#endif
 
     omap_dma_interrupts_update(s);
 }
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 06/13] twl92230: fix old style increment/decrement usage

[Michael S. Tsirkin]

Modern compilers do not parse "=-" as decrement:
you must use "-=" for that. Same for "=+"/"+=".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/twl92230.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/twl92230.c b/hw/twl92230.c
index b15a8bf..68fab88 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -73,14 +73,14 @@ static inline void menelaus_update(MenelausState *s)
 
 static inline void menelaus_rtc_start(MenelausState *s)
 {
-    s->rtc.next =+ qemu_get_clock(rt_clock);
+    s->rtc.next += qemu_get_clock(rt_clock);
     qemu_mod_timer(s->rtc.hz_tm, s->rtc.next);
 }
 
 static inline void menelaus_rtc_stop(MenelausState *s)
 {
     qemu_del_timer(s->rtc.hz_tm);
-    s->rtc.next =- qemu_get_clock(rt_clock);
+    s->rtc.next -= qemu_get_clock(rt_clock);
     if (s->rtc.next < 1)
         s->rtc.next = 1;
 }
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 07/13] linux-user: fix old style decrement usage

[Michael S. Tsirkin]

Modern compilers do not parse "=-" as decrement:
you must use "-=" for that.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 linux-user/arm/nwfpe/fpa11.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
index 3ff80eb..c4461e0 100644
--- a/linux-user/arm/nwfpe/fpa11.c
+++ b/linux-user/arm/nwfpe/fpa11.c
@@ -191,7 +191,7 @@ unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs)
   if(nRc == 1 && get_float_exception_flags(&fpa11->fp_status))
   {
     //printf("fef 0x%x\n",float_exception_flags);
-    nRc=-get_float_exception_flags(&fpa11->fp_status);
+    nRc -= get_float_exception_flags(&fpa11->fp_status);
   }
 
   //printf("returning %d\n",nRc);
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 08/13] target-mips: unmatched brackets in if 0

[Michael S. Tsirkin]

Fix unmatched braket in commented out code

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 target-mips/helper.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/target-mips/helper.c b/target-mips/helper.c
index 7369025..7f659ae 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -195,7 +195,6 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
 #if 0
     qemu_log(TARGET_FMT_lx " %d %d => " TARGET_FMT_lx " %d (%d)\n",
             address, rw, access_type, *physical, *prot, ret);
-    }
 #endif
 
     return ret;
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 09/13] tests: unmatched brackets in if 0

[Michael S. Tsirkin]

Fix unmatched braket in commented out code

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/sha1.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/sha1.c b/tests/sha1.c
index 2557344..3a76555 100644
--- a/tests/sha1.c
+++ b/tests/sha1.c
@@ -190,7 +190,7 @@ unsigned char c;
 	int j;
 
 	for (j = 0; j < 4; t >>= 8, j++)
-	    *--fcp = (unsigned char) t
+	    *--fcp = (unsigned char) t;
     }
 #else
     for (i = 0; i < 8; i++) {
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 10/13] linux-user: fix coding style nit

[Michael S. Tsirkin]

Put space between = and & when taking a pointer,
to avoid confusion with old-style "&=".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 linux-user/syscall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index b42567c..bf06d14 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2067,7 +2067,7 @@ static inline abi_long target_to_host_ipc_perm(struct ipc_perm *host_ip,
 
     if (!lock_user_struct(VERIFY_READ, target_sd, target_addr, 1))
         return -TARGET_EFAULT;
-    target_ip=&(target_sd->sem_perm);
+    target_ip = &(target_sd->sem_perm);
     host_ip->__key = tswapl(target_ip->__key);
     host_ip->uid = tswapl(target_ip->uid);
     host_ip->gid = tswapl(target_ip->gid);
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 11/13] net: fix coding style nit

[Michael S. Tsirkin]

Put space between = and - assigning a negative number
to avoid confusion with old-style "-="
(which we also have, and need to be fixed).

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 net.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net.c b/net.c
index 3fdf1e6..2686f78 100644
--- a/net.c
+++ b/net.c
@@ -2044,7 +2044,7 @@ static NetSocketState *net_socket_fd_init(VLANState *vlan,
                                           const char *model, const char *name,
                                           int fd, int is_connected)
 {
-    int so_type=-1, optlen=sizeof(so_type);
+    int so_type = -1, optlen=sizeof(so_type);
 
     if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
         (socklen_t *)&optlen)< 0) {
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 12/13] slirp: fix unmatched bracket in if 0

[Michael S. Tsirkin]

Fix unmatched bracket in commented out code

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 slirp/ip_input.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index 35230f8..bb101da 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -648,8 +648,6 @@ typedef u_int32_t n_time;
 		ip_forward(m, 1);
 		return (1);
 	}
-		}
-	}
 	return (0);
 bad:
  	icmp_error(m, type, code, 0, 0);
-- 
1.6.5.rc2

[Qemu-devel] [PATCH 13/13] escc: fix another coding style nit

[Michael S. Tsirkin]

Fix another place with =- to be "= -".
to avoid confusion with old-style "-="
(which we also have, and needs to be fixed).

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/escc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/escc.c b/hw/escc.c
index cb34d7d..382719d 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -878,9 +878,9 @@ static void sunmouse_event(void *opaque,
     ch = -dy;
 
     if (ch > 127)
-        ch=127;
+        ch = 127;
     else if (ch < -127)
-        ch=-127;
+        ch = -127;
 
     put_queue(s, ch & 0xff);
 
-- 
1.6.5.rc2

[Qemu-devel] Re: [PATCH 09/13] tests: unmatched brackets in if 0

[Blue Swirl]

On Wed, Sep 30, 2009 at 8:44 PM, Michael S. Tsirkin <mst@redhat.com> wrote:
> Fix unmatched braket in commented out code

> -           *--fcp = (unsigned char) t
> +           *--fcp = (unsigned char) t;

Description does not match patch content.

Applied others, thanks!

Re: [Qemu-devel] [PATCH 09/13] tests: unmatched brackets in if 0

[Markus Armbruster]

"Michael S. Tsirkin" <mst@redhat.com> writes:

> Fix unmatched braket in commented out code
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  tests/sha1.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tests/sha1.c b/tests/sha1.c
> index 2557344..3a76555 100644
> --- a/tests/sha1.c
> +++ b/tests/sha1.c
> @@ -190,7 +190,7 @@ unsigned char c;
>  	int j;
>  
>  	for (j = 0; j < 4; t >>= 8, j++)
> -	    *--fcp = (unsigned char) t
> +	    *--fcp = (unsigned char) t;
>      }
>  #else
>      for (i = 0; i < 8; i++) {

Good fix, bad commit message :)