Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request...

[mirror_qemu.git] / qemu-options.h

diff --git a/qemu-options.h b/qemu-options.h
index c96f994c9b421a9d24b8be5e91dc11176e631bf1..b4ee63cd6011a3d376a6dc85cae9dbaef5056a31 100644 (file)
--- a/qemu-options.h
+++ b/qemu-options.h
@@ -25,17 +25,12 @@
  * THE SOFTWARE.
  */
 
-#ifndef _QEMU_OPTIONS_H_
-#define _QEMU_OPTIONS_H_
+#ifndef QEMU_OPTIONS_H
+#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