* Re: [Qemu-devel] [PATCH 1/3] vl.c: Move option generation logic into a wrapper file
[not found] <4eeed796.c7cde00a.740c.740aSMTPIN_ADDED@mx.google.com>
@ 2011-12-19 20:19 ` Anthony Liguori
0 siblings, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2011-12-19 20:19 UTC (permalink / raw)
To: Michael Ellerman; +Cc: qemu-devel
On 12/19/2011 12:19 AM, y@ozlabs.org wrote:
> From: Michael Ellerman<michael@ellerman.id.au>
>
> 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>
Applied all. Thanks.
Regards,
Anthony Liguori
> ---
> qemu-options-wrapper.h | 32 ++++++++++++++++++++++++++++++++
> qemu-options.h | 9 ++-------
> vl.c | 18 ++++--------------
> 3 files changed, 38 insertions(+), 21 deletions(-)
> create mode 100644 qemu-options-wrapper.h
>
> diff --git a/qemu-options-wrapper.h b/qemu-options-wrapper.h
> new file mode 100644
> index 0000000..202f5af
> --- /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 c96f994..89a009e 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 d51ac2e..25ec37b 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)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 1/3] vl.c: Move option generation logic into a wrapper file
@ 2011-12-19 6:19 y
2011-12-19 6:23 ` Michael Ellerman
0 siblings, 1 reply; 3+ messages in thread
From: y @ 2011-12-19 6:19 UTC (permalink / raw)
To: qemu-devel
From: Michael Ellerman <michael@ellerman.id.au>
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>
---
qemu-options-wrapper.h | 32 ++++++++++++++++++++++++++++++++
qemu-options.h | 9 ++-------
vl.c | 18 ++++--------------
3 files changed, 38 insertions(+), 21 deletions(-)
create mode 100644 qemu-options-wrapper.h
diff --git a/qemu-options-wrapper.h b/qemu-options-wrapper.h
new file mode 100644
index 0000000..202f5af
--- /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 c96f994..89a009e 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 d51ac2e..25ec37b 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)
--
1.7.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-19 20:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <4eeed796.c7cde00a.740c.740aSMTPIN_ADDED@mx.google.com>
2011-12-19 20:19 ` [Qemu-devel] [PATCH 1/3] vl.c: Move option generation logic into a wrapper file Anthony Liguori
2011-12-19 6:19 y
2011-12-19 6:23 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).