From a97e45c8b825c5cbf1f0eefa08e1cfb97932d8bd Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 11 Feb 2012 10:07:55 +0100 Subject: [PATCH 1/3] tcg: Remove unneeded include statements 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 Signed-off-by: Stefan Hajnoczi --- tcg/tcg.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index d43fa4a9b..351a0a303 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -33,18 +33,6 @@ #define NDEBUG #endif -#include -#include -#include -#include -#include -#ifdef _WIN32 -#include -#endif -#ifdef _AIX -#include -#endif - #include "qemu-common.h" #include "cache-utils.h" #include "host-utils.h" From 3b26486acd90186d64137a7f7e7d0cd3850a7303 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 22 Feb 2012 22:13:11 +0000 Subject: [PATCH 2/3] vl.c: Increase width of machine name column in "-M ?" output 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 Signed-off-by: Stefan Hajnoczi --- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index 7a8cc081d..f211c7178 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 != '?'); From f293d8b1f26953ccaef794785cea0619d4f8c268 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Fri, 24 Feb 2012 13:33:49 +0200 Subject: [PATCH 3/3] slirp/misc: fix gcc __warn_memset_zero_len warnings By removing memset altogether (Patch from Stefan Hajnoczi, tested compile only by me). Signed-off-by: Alon Levy Signed-off-by: Stefan Hajnoczi --- slirp/misc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/slirp/misc.c b/slirp/misc.c index 3432fbfeb..0308a62fa 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);