Re: [Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phandle_start

[Alexander Graf]

On 04.07.2013, at 15:09, Markus Armbruster wrote:

> 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 <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> 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);

Zero is a valid phandle to start from. It shouldn't mean "default".


Alex

>     }
> 
>     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",
> -- 
> 1.7.11.7
>