From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57501 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ovr27-0005MO-3v for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ovr25-00038W-FH for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54129) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ovr25-00038M-8y for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:13 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 15 Sep 2010 14:24:00 +0200 Message-Id: <1284553440-17985-6-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1284553440-17985-1-git-send-email-Jes.Sorensen@redhat.com> References: <1284553440-17985-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] Remove obsolete 'f' double parameter type List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, quintela@redhat.com From: Jes Sorensen 'f' double is no longer used, and we should be using floating point variables to store byte sizes. Remove it. Signed-off-by: Jes Sorensen --- monitor.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/monitor.c b/monitor.c index 3630061..ffeb4ee 100644 --- a/monitor.c +++ b/monitor.c @@ -83,10 +83,6 @@ * suffix, which multiplies the value by 2^40 for * suffixes T and t, 2^30 for suffixes G and g, 2^20 for * M and m, 2^10 for K and k - * 'f' double - * user mode accepts an optional G, g, M, m, K, k suffix, - * which multiplies the value by 2^30 for suffixes G and - * g, 2^20 for M and m, 2^10 for K and k * 'T' double * user mode accepts an optional ms, us, ns suffix, * which divides the value by 1e3, 1e6, 1e9, respectively @@ -3621,7 +3617,6 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, p = end; } break; - case 'f': case 'T': { double val; @@ -3637,17 +3632,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, if (get_double(mon, &val, &p) < 0) { goto fail; } - if (c == 'f' && *p) { - switch (*p) { - case 'K': case 'k': - val *= 1 << 10; p++; break; - case 'M': case 'm': - val *= 1 << 20; p++; break; - case 'G': case 'g': - val *= 1 << 30; p++; break; - } - } - if (c == 'T' && p[0] && p[1] == 's') { + if (p[0] && p[1] == 's') { switch (*p) { case 'm': val /= 1e3; p += 2; break; -- 1.7.2.2