[Qemu-devel] [PATCH v2 RESEND 0/5] clang fixes

[Qemu-devel] [PATCH v2 RESEND 0/5] clang fixes

[Paolo Bonzini]

I removed the patch that malc NACKed.

Paolo Bonzini (5):
  remove two dead assignments in target-i386/translate.c
  fix undefined shifts by >32
  exec.c: dead assignments
  vnc.c: remove dead code
  usb-linux.c: remove write-only variable

 exec.c                  |    4 ----
 target-i386/translate.c |    2 --
 usb-linux.c             |    2 --
 vl.c                    |    4 ++--
 vnc.c                   |    3 ---
 5 files changed, 2 insertions(+), 13 deletions(-)

[Qemu-devel] [PATCH v2 RESEND 1/5] remove two dead assignments in target-i386/translate.c

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target-i386/translate.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 8078112..a597e80 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -4692,8 +4692,6 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
             ot = dflag + OT_WORD;
 
         modrm = ldub_code(s->pc++);
-        mod = (modrm >> 6) & 3;
-        rm = (modrm & 7) | REX_B(s);
         reg = ((modrm >> 3) & 7) | rex_r;
 
         gen_ldst_modrm(s, modrm, ot, OR_TMP0, 0);
-- 
1.6.6

[Qemu-devel] [PATCH v2 RESEND 2/5] fix undefined shifts by >32

[Paolo Bonzini]

This one is for 0.12 too.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index 39833fc..ea9a95c 100644
--- a/vl.c
+++ b/vl.c
@@ -2380,9 +2380,9 @@ static void numa_add(const char *optarg)
                         fprintf(stderr,
                             "only 63 CPUs in NUMA mode supported.\n");
                     }
-                    value = (1 << (endvalue + 1)) - (1 << value);
+                    value = (2ULL << endvalue) - (1ULL << value);
                 } else {
-                    value = 1 << value;
+                    value = 1ULL << value;
                 }
             }
             node_cpumask[nodenr] = value;
-- 
1.6.6

[Qemu-devel] [PATCH v2 RESEND 3/5] exec.c: dead assignments

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 exec.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/exec.c b/exec.c
index 76831a1..b2a1cf1 100644
--- a/exec.c
+++ b/exec.c
@@ -2489,17 +2489,13 @@ void *qemu_get_ram_ptr(ram_addr_t addr)
 ram_addr_t qemu_ram_addr_from_host(void *ptr)
 {
     RAMBlock *prev;
-    RAMBlock **prevp;
     RAMBlock *block;
     uint8_t *host = ptr;
 
     prev = NULL;
-    prevp = &ram_blocks;
     block = ram_blocks;
     while (block && (block->host > host
                      || block->host + block->length <= host)) {
-        if (prev)
-          prevp = &prev->next;
         prev = block;
         block = block->next;
     }
-- 
1.6.6

[Qemu-devel] [PATCH v2 RESEND 4/5] vnc.c: remove dead code

[Paolo Bonzini]

to= is handled in qemu-sockets.c inet_listen.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 vnc.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/vnc.c b/vnc.c
index 92facde..a49cff2 100644
--- a/vnc.c
+++ b/vnc.c
@@ -2537,7 +2537,6 @@ int vnc_display_open(DisplayState *ds, const char *display)
     const char *options;
     int password = 0;
     int reverse = 0;
-    int to_port = 0;
 #ifdef CONFIG_VNC_TLS
     int tls = 0, x509 = 0;
 #endif
@@ -2563,8 +2562,6 @@ int vnc_display_open(DisplayState *ds, const char *display)
             password = 1; /* Require password auth */
         } else if (strncmp(options, "reverse", 7) == 0) {
             reverse = 1;
-        } else if (strncmp(options, "to=", 3) == 0) {
-            to_port = atoi(options+3) + 5900;
 #ifdef CONFIG_VNC_SASL
         } else if (strncmp(options, "sasl", 4) == 0) {
             sasl = 1; /* Require SASL auth */
-- 
1.6.6

[Qemu-devel] [PATCH v2 RESEND 5/5] usb-linux.c: remove write-only variable

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 usb-linux.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/usb-linux.c b/usb-linux.c
index 1aaa595..ba8facf 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1007,11 +1007,9 @@ USBDevice *usb_host_device_open(const char *devname)
 {
     struct USBAutoFilter filter;
     USBDevice *dev;
-    USBHostDevice *s;
     char *p;
 
     dev = usb_create(NULL /* FIXME */, "usb-host");
-    s = DO_UPCAST(USBHostDevice, dev, dev);
 
     if (strstr(devname, "auto:")) {
         if (parse_filter(devname, &filter) < 0)
-- 
1.6.6

Re: [Qemu-devel] [PATCH v2 RESEND 0/5] clang fixes

[Blue Swirl]

Thanks, applied.


On Thu, Feb 4, 2010 at 3:31 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> I removed the patch that malc NACKed.
>
> Paolo Bonzini (5):
>  remove two dead assignments in target-i386/translate.c
>  fix undefined shifts by >32
>  exec.c: dead assignments
>  vnc.c: remove dead code
>  usb-linux.c: remove write-only variable
>
>  exec.c                  |    4 ----
>  target-i386/translate.c |    2 --
>  usb-linux.c             |    2 --
>  vl.c                    |    4 ++--
>  vnc.c                   |    3 ---
>  5 files changed, 2 insertions(+), 13 deletions(-)
>
>
>
>

[Qemu-devel] Re: [PATCH v2 RESEND 0/5] clang fixes

[Paolo Bonzini]

On 02/05/2010 07:26 PM, Blue Swirl wrote:
> Thanks, applied.

Thanks Blue Swirl, can you please cherry-pick commit 0dfbd514 (fix 
undefined shifts by >32) into stable-0.12?

Paolo

[Qemu-devel] [PING 0.12] [PATCH v2 RESEND 2/5] fix undefined shifts by >32

[Paolo Bonzini]

On 02/04/2010 02:31 PM, Paolo Bonzini wrote:
> This one is for 0.12 too.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
>   vl.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 39833fc..ea9a95c 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2380,9 +2380,9 @@ static void numa_add(const char *optarg)
>                           fprintf(stderr,
>                               "only 63 CPUs in NUMA mode supported.\n");
>                       }
> -                    value = (1<<  (endvalue + 1)) - (1<<  value);
> +                    value = (2ULL<<  endvalue) - (1ULL<<  value);
>                   } else {
> -                    value = 1<<  value;
> +                    value = 1ULL<<  value;
>                   }
>               }
>               node_cpumask[nodenr] = value;

Ping for 0.12 (commit 0dfbd51).

Paolo