[Qemu-devel] [PULL 0/3] Trivial patches for 11 to 24 February 2012

[Qemu-devel] [PULL 0/3] Trivial patches for 11 to 24 February 2012

[Stefan Hajnoczi]

The following changes since commit 235fe3bfd46b1104575b540d0bc3fdf584030b99:

  qom: add test tools (2012-02-22 12:18:26 -0600)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to f293d8b1f26953ccaef794785cea0619d4f8c268:

  slirp/misc: fix gcc __warn_memset_zero_len warnings (2012-02-24 13:24:42 +0000)

----------------------------------------------------------------
Alon Levy (1):
      slirp/misc: fix gcc __warn_memset_zero_len warnings

Peter Maydell (1):
      vl.c: Increase width of machine name column in "-M ?" output

Stefan Weil (1):
      tcg: Remove unneeded include statements

 slirp/misc.c |   21 +++++++--------------
 tcg/tcg.c    |   12 ------------
 vl.c         |    4 ++--
 3 files changed, 9 insertions(+), 28 deletions(-)

-- 
1.7.9

[Qemu-devel] [PATCH 1/3] tcg: Remove unneeded include statements

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

The standard include files are already included in qemu-common.h.

malloc.h and alloca.h were needed for alloca() which was removed
from TCG code some years ago when switching from dyngen to TCG
(see commit 49516bc0d622112caac9df628caf19010fda8b67).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 tcg/tcg.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/tcg/tcg.c b/tcg/tcg.c
index d43fa4a..351a0a3 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -33,18 +33,6 @@
 #define NDEBUG
 #endif
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#ifdef _WIN32
-#include <malloc.h>
-#endif
-#ifdef _AIX
-#include <alloca.h>
-#endif
-
 #include "qemu-common.h"
 #include "cache-utils.h"
 #include "host-utils.h"
-- 
1.7.9

[Qemu-devel] [PATCH 2/3] vl.c: Increase width of machine name column in "-M ?" output

[Stefan Hajnoczi]

From: Peter Maydell <peter.maydell@linaro.org>

Increase the width of the column used for the machine name in
the "-M ?" output from 10 to 20 spaces. This fixes the formatting
so it looks nice for architectures where a few of the machines
have overly long names. (Our current longest machine name is
"petalogix-s3adsp1800" with "realview-eb-mpcore" not far behind.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index 7a8cc08..f211c71 100644
--- a/vl.c
+++ b/vl.c
@@ -1999,9 +1999,9 @@ static QEMUMachine *machine_parse(const char *name)
     printf("Supported machines are:\n");
     for (m = first_machine; m != NULL; m = m->next) {
         if (m->alias) {
-            printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name);
+            printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
         }
-        printf("%-10s %s%s\n", m->name, m->desc,
+        printf("%-20s %s%s\n", m->name, m->desc,
                m->is_default ? " (default)" : "");
     }
     exit(!name || *name != '?');
-- 
1.7.9

[Qemu-devel] [PATCH 3/3] slirp/misc: fix gcc __warn_memset_zero_len warnings

[Stefan Hajnoczi]

From: Alon Levy <alevy@redhat.com>

By removing memset altogether (Patch from Stefan Hajnoczi, tested
compile only by me).

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 slirp/misc.c |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/slirp/misc.c b/slirp/misc.c
index 3432fbf..0308a62 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -333,7 +333,6 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
     struct socket *so;
     const char *state;
     char buf[20];
-    int n;
 
     monitor_printf(mon, "  Protocol[State]    FD  Source Address  Port   "
                         "Dest. Address  Port RecvQ SendQ\n");
@@ -357,10 +356,8 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
             dst_addr = so->so_faddr;
             dst_port = so->so_fport;
         }
-        n = snprintf(buf, sizeof(buf), "  TCP[%s]", state);
-        memset(&buf[n], ' ', 19 - n);
-        buf[19] = 0;
-        monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
+        snprintf(buf, sizeof(buf), "  TCP[%s]", state);
+        monitor_printf(mon, "%-19s %3d %15s %5d ", buf, so->s,
                        src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
                        ntohs(src.sin_port));
         monitor_printf(mon, "%15s %5d %5d %5d\n",
@@ -370,22 +367,20 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
 
     for (so = slirp->udb.so_next; so != &slirp->udb; so = so->so_next) {
         if (so->so_state & SS_HOSTFWD) {
-            n = snprintf(buf, sizeof(buf), "  UDP[HOST_FORWARD]");
+            snprintf(buf, sizeof(buf), "  UDP[HOST_FORWARD]");
             src_len = sizeof(src);
             getsockname(so->s, (struct sockaddr *)&src, &src_len);
             dst_addr = so->so_laddr;
             dst_port = so->so_lport;
         } else {
-            n = snprintf(buf, sizeof(buf), "  UDP[%d sec]",
+            snprintf(buf, sizeof(buf), "  UDP[%d sec]",
                          (so->so_expire - curtime) / 1000);
             src.sin_addr = so->so_laddr;
             src.sin_port = so->so_lport;
             dst_addr = so->so_faddr;
             dst_port = so->so_fport;
         }
-        memset(&buf[n], ' ', 19 - n);
-        buf[19] = 0;
-        monitor_printf(mon, "%s %3d %15s %5d ", buf, so->s,
+        monitor_printf(mon, "%-19s %3d %15s %5d ", buf, so->s,
                        src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*",
                        ntohs(src.sin_port));
         monitor_printf(mon, "%15s %5d %5d %5d\n",
@@ -394,13 +389,11 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
     }
 
     for (so = slirp->icmp.so_next; so != &slirp->icmp; so = so->so_next) {
-        n = snprintf(buf, sizeof(buf), "  ICMP[%d sec]",
+        snprintf(buf, sizeof(buf), "  ICMP[%d sec]",
                      (so->so_expire - curtime) / 1000);
         src.sin_addr = so->so_laddr;
         dst_addr = so->so_faddr;
-        memset(&buf[n], ' ', 19 - n);
-        buf[19] = 0;
-        monitor_printf(mon, "%s %3d %15s  -    ", buf, so->s,
+        monitor_printf(mon, "%-19s %3d %15s  -    ", buf, so->s,
                        src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*");
         monitor_printf(mon, "%15s  -    %5d %5d\n", inet_ntoa(dst_addr),
                        so->so_rcv.sb_cc, so->so_snd.sb_cc);
-- 
1.7.9

Re: [Qemu-devel] [PULL 0/3] Trivial patches for 11 to 24 February 2012

[Anthony Liguori]

On 02/24/2012 08:00 AM, Stefan Hajnoczi wrote:
> The following changes since commit 235fe3bfd46b1104575b540d0bc3fdf584030b99:
>
>    qom: add test tools (2012-02-22 12:18:26 -0600)
>
> are available in the git repository at:
>
>    git://github.com/stefanha/qemu.git trivial-patches
>
> for you to fetch changes up to f293d8b1f26953ccaef794785cea0619d4f8c268:
>
>    slirp/misc: fix gcc __warn_memset_zero_len warnings (2012-02-24 13:24:42 +0000)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> ----------------------------------------------------------------
> Alon Levy (1):
>        slirp/misc: fix gcc __warn_memset_zero_len warnings
>
> Peter Maydell (1):
>        vl.c: Increase width of machine name column in "-M ?" output
>
> Stefan Weil (1):
>        tcg: Remove unneeded include statements
>
>   slirp/misc.c |   21 +++++++--------------
>   tcg/tcg.c    |   12 ------------
>   vl.c         |    4 ++--
>   3 files changed, 9 insertions(+), 28 deletions(-)
>