From patchwork Wed Jul 10 17:52:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 258181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 65A132C02CF for ; Thu, 11 Jul 2013 03:53:32 +1000 (EST) Received: from localhost ([::1]:43304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZx-0001NQ-FR for incoming@patchwork.ozlabs.org; Wed, 10 Jul 2013 13:53:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZT-0001NA-FH for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwyZS-0004g3-Ji for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZS-0004fq-C4 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:54 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6AHqqNP006195 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Jul 2013 13:52:53 -0400 Received: from localhost (ovpn-113-20.phx2.redhat.com [10.3.113.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6AHqpw4020029; Wed, 10 Jul 2013 13:52:52 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Jul 2013 13:52:42 -0400 Message-Id: <1373478767-20965-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> References: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PULL 1/6] qemu-char: Fix ringbuf option size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Any attempt to use it trips an "opt->desc->type == QEMU_OPT_NUMBER" assertion. Broken in commit 1da48c65. Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- qemu-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index 18c42a3..800d6a6 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3115,7 +3115,7 @@ static void qemu_chr_parse_memory(QemuOpts *opts, ChardevBackend *backend, backend->memory = g_new0(ChardevMemory, 1); - val = qemu_opt_get_number(opts, "size", 0); + val = qemu_opt_get_size(opts, "size", 0); if (val != 0) { backend->memory->has_size = true; backend->memory->size = val;