On 06/04/10 10:15, Markus Armbruster wrote:
> jes.soren...@redhat.com writes:
>> + * Parse OS specific command line options.
>> + * return 0 if option handled, -1 otherwise
>> + */
>> +int os_parse_cmd_args(const QEMUOption *popt, const char *optarg)
>> +{
>> + int ret = 0;
>> + switch (popt->index) {
>> +#ifdef CONFIG_SLIRP
>> + case QEMU_OPTION_smb:
>> + if (net_slirp_smb(optarg) < 0)
>> + exit(1);
>> + break;
>> +#endif
>
> Was #ifndef _WIN32 before. Impact?
It was moved to os-posix.c which is only built for non _WIN32, so it has
the same effect, except it's not full of ugly #ifdef's
>> +/*
>> + * Duplicate definition from vl.c to avoid messing up the entire build
>> + */
>> +enum {
>> +#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \
>> + opt_enum,
>> +#define DEFHEADING(text)
>> +#include "qemu-options.h"
>> +#undef DEF
>> +#undef DEFHEADING
>> +#undef GEN_DOCS
>> +};
>
> I agree with Richard: this is gross.
The enum creation is gross by itself. Only way to get around not
duplicating it is to create a new header file to hold just that?
>> +/* This is needed for vl.c and the OS specific files */
>> +typedef struct QEMUOption {
>> + const char *name;
>> + int flags;
>> + int index;
>> + uint32_t arch_mask;
>> +} QEMUOption;
>> +
>
> Ugh.
What do you mean? The real ugh! here is that it was created as a
typedef. I can change the function to pass in just the index, but I
don't know if we will have cases where the rest is needed.
> Is this minor improvement of vl.c really worth the headaches elsewhere?
vl.c as it is today is gross and un-maintainable. This patch gets rid of
a lot of the ugly #ifdefs and makes the code easier to read and maintain.
Jes
