From patchwork Thu Jul 4 13:09:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 256898 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 007272C008A for ; Thu, 4 Jul 2013 23:13:21 +1000 (EST) Received: from localhost ([::1]:38559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujLa-0001a9-Nb for incoming@patchwork.ozlabs.org; Thu, 04 Jul 2013 09:13:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHw-0003vz-Co for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UujHs-000075-CP for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:32 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:36916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHs-00006r-64 for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:28 -0400 Received: from blackfin.pond.sub.org (p5B32B473.dip0.t-ipconnect.de [91.50.180.115]) by oxygen.pond.sub.org (Postfix) with ESMTPA id C7D4EA62D8; Thu, 4 Jul 2013 15:09:25 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 538E5200BD; Thu, 4 Jul 2013 15:09:24 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 Jul 2013 15:09:23 +0200 Message-Id: <1372943363-24081-8-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1372943363-24081-1-git-send-email-armbru@redhat.com> References: <1372943363-24081-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com, Alexander Graf Subject: [Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phandle_start 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 Make it QEMU_OPT_NUMBER, so it gets parsed by generic code, which actually bothers to check for errors, rather than its user, which doesn't. Cc: Alexander Graf Signed-off-by: Markus Armbruster Acked-by: Alexander Graf --- device_tree.c | 7 ++----- vl.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/device_tree.c b/device_tree.c index 0e7fe2d..10cf3d0 100644 --- a/device_tree.c +++ b/device_tree.c @@ -240,11 +240,8 @@ uint32_t qemu_devtree_alloc_phandle(void *fdt) * which phandle id to start allocting phandles. */ if (!phandle) { - const char *phandle_start = qemu_opt_get(qemu_get_machine_opts(), - "phandle_start"); - if (phandle_start) { - phandle = strtoul(phandle_start, NULL, 0); - } + phandle = qemu_opt_get_number(qemu_get_machine_opts(), + "phandle_start", 0); } if (!phandle) { diff --git a/vl.c b/vl.c index fb69f22..bea1a10 100644 --- a/vl.c +++ b/vl.c @@ -409,7 +409,7 @@ static QemuOptsList qemu_machine_opts = { .help = "Dump current dtb to a file and quit", }, { .name = "phandle_start", - .type = QEMU_OPT_STRING, + .type = QEMU_OPT_NUMBER, .help = "The first phandle ID we may generate dynamically", }, { .name = "dt_compatible",