diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2011-12-19 17:19:30 +1100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 10:27:33 -0600 |
| commit | 77bd1119ba43dbd0e73014037a08f8b49136bf6f (patch) | |
| tree | 19bdd4c256b9f9cf06d061505f456eac2f6d3fea | |
| parent | f76d27b67ca05c7ee875e39b4f6e3d567d3e9292 (diff) | |
| download | focaccia-qemu-77bd1119ba43dbd0e73014037a08f8b49136bf6f.tar.gz focaccia-qemu-77bd1119ba43dbd0e73014037a08f8b49136bf6f.zip | |
vl.c: Move option generation logic into a wrapper file
In vl.c and qemu-options.h we define macros and include qemu-options.def in order to generate different content. Move the bulk of the def'ing and undef'ing into a wrapper, this will make it cleaner when we add another macro in the next patch. AFAICS undefining GEN_DOCS services no purpose, but I've left it for now. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qemu-options-wrapper.h | 32 | ||||
| -rw-r--r-- | qemu-options.h | 9 | ||||
| -rw-r--r-- | vl.c | 18 |
3 files changed, 38 insertions, 21 deletions
diff --git a/qemu-options-wrapper.h b/qemu-options-wrapper.h new file mode 100644 index 0000000000..202f5af9b4 --- /dev/null +++ b/qemu-options-wrapper.h @@ -0,0 +1,32 @@ + +#if defined(QEMU_OPTIONS_GENERATE_ENUM) + +#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ + opt_enum, +#define DEFHEADING(text) + +#elif defined(QEMU_OPTIONS_GENERATE_HELP) + +#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ + opt_help +#define DEFHEADING(text) stringify(text) "\n" + +#elif defined(QEMU_OPTIONS_GENERATE_OPTIONS) + +#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ + { option, opt_arg, opt_enum, arch_mask }, +#define DEFHEADING(text) + +#else +#error "qemu-options-wrapper.h included with no option defined" +#endif + +#include "qemu-options.def" + +#undef DEF +#undef DEFHEADING +#undef GEN_DOCS + +#undef QEMU_OPTIONS_GENERATE_ENUM +#undef QEMU_OPTIONS_GENERATE_HELP +#undef QEMU_OPTIONS_GENERATE_OPTIONS diff --git a/qemu-options.h b/qemu-options.h index c96f994c9b..89a009ee96 100644 --- a/qemu-options.h +++ b/qemu-options.h @@ -29,13 +29,8 @@ #define _QEMU_OPTIONS_H_ enum { -#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - opt_enum, -#define DEFHEADING(text) -#include "qemu-options.def" -#undef DEF -#undef DEFHEADING -#undef GEN_DOCS +#define QEMU_OPTIONS_GENERATE_ENUM +#include "qemu-options-wrapper.h" }; #endif diff --git a/vl.c b/vl.c index d51ac2ebfe..25ec37b563 100644 --- a/vl.c +++ b/vl.c @@ -1493,13 +1493,8 @@ static void version(void) static void help(int exitcode) { const char *options_help = -#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - opt_help -#define DEFHEADING(text) stringify(text) "\n" -#include "qemu-options.def" -#undef DEF -#undef DEFHEADING -#undef GEN_DOCS +#define QEMU_OPTIONS_GENERATE_HELP +#include "qemu-options-wrapper.h" ; version(); printf("usage: %s [options] [disk_image]\n" @@ -1529,13 +1524,8 @@ typedef struct QEMUOption { static const QEMUOption qemu_options[] = { { "h", 0, QEMU_OPTION_h, QEMU_ARCH_ALL }, -#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - { option, opt_arg, opt_enum, arch_mask }, -#define DEFHEADING(text) -#include "qemu-options.def" -#undef DEF -#undef DEFHEADING -#undef GEN_DOCS +#define QEMU_OPTIONS_GENERATE_OPTIONS +#include "qemu-options-wrapper.h" { NULL }, }; static void select_vgahw (const char *p) |