[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phan
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phandle_start |
Date: |
Thu, 04 Jul 2013 17:01:55 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
Alexander Graf <address@hidden> writes:
> 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)
uint32_t qemu_devtree_alloc_phandle(void *fdt)
{
static int phandle = 0x0;
/*
>> * 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".
We get here only when phandle is zero (which it initially is).
If opts don't contain a value for "phandle_start", we set phandle to
zero, i.e. do nothing. Exactly the same as before.
If that's wrong, it should be fixed in a separate patch.
- Re: [Qemu-devel] [PATCH 1/7] qemu-option: Fix qemu_opts_find() for null id arguments, (continued)
- [Qemu-devel] [PATCH 5/7] microblaze: Fix latent bug with default DTB lookup, Markus Armbruster, 2013/07/04
- [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Peter Maydell, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Peter Maydell, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
[Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phandle_start, Markus Armbruster, 2013/07/04
[Qemu-devel] [PATCH 6/7] Simplify -machine option queries with qemu_get_machine_opts(), Markus Armbruster, 2013/07/04
Re: [Qemu-devel] [PATCH 0/7] Fixes around -machine, Anthony Liguori, 2013/07/10