Re: [Qemu-devel] [PATCH] vl.c && linux-user/main.c : removed **envp from main() arguments

[Yoni Bettan <ybettan@redhat.com>]

On 11/21/2017 09:30 AM, Laurent Vivier wrote:
> Le 21/11/2017 à 07:41, Yoni Bettan a écrit :
>>          * it was added on 2008 902b3d5c392bb6f48ef340ad8ecc3311705d2800
>>            when introduced cache-utils.[ch]
>>          * since then cache-utils.[ch] were removed but **envp was left
>>            behind
>>
>> Signed-off-by: Yoni Bettan <ybettan@redhat.com>
>> ---
>>   linux-user/main.c | 2 +-
>>   vl.c              | 6 +++---
>>   2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/linux-user/main.c b/linux-user/main.c
>> index aa02f25b85..ca5628c1ca 100644
>> --- a/linux-user/main.c
>> +++ b/linux-user/main.c
>> @@ -4233,7 +4233,7 @@ static int parse_args(int argc, char **argv)
>>       return optind;
>>   }
>>   
>> -int main(int argc, char **argv, char **envp)
>> +int main(int argc, char **argv)
>>   {
>>       struct target_pt_regs regs1, *regs = &regs1;
>>       struct image_info info1, *info = &info1;
>> diff --git a/vl.c b/vl.c
>> index 1ad1c04637..9667756ccc 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -35,10 +35,10 @@
>>   #ifdef CONFIG_SDL
>>   #if defined(__APPLE__) || defined(main)
>>   #include <SDL.h>
>> -int qemu_main(int argc, char **argv, char **envp);
>> +int qemu_main(int argc, char **argv);
>>   int main(int argc, char **argv)
>>   {
>> -    return qemu_main(argc, argv, NULL);
>> +    return qemu_main(argc, argv);
>>   }
>>   #undef main
>>   #define main qemu_main
> I think this part can be removed now. As it seems it has been added
> because of the envp parameter.

Thanks Laurent for your response and sorry for my late response.
I think this part was added for another purpose as described here 
880fec5d086

As i see it the env param was added in 2008 in order to support cache-utils
as shown in 902b3d5c392bb6f48ef340ad8ecc3311705d2800 and in 2009
another main function was added in order to unbreak SDL on Mac-OS X and 
the env param
was added only for consistency I suppose...

What do you think?

Thanks,
Yoni
> Thanks,
> Laurent