summaryrefslogtreecommitdiff
path: root/qemu-options.h
diff options
context:
space:
mode:
authorEvgeny Voevodin <e.voevodin@samsung.com>2012-06-08 13:45:29 +0400
committerEvgeny Voevodin <e.voevodin@samsung.com>2012-06-15 11:21:10 +0400
commit02935a553fb88f79fb0c79f094fb5ca0b42c96f3 (patch)
tree7a317e392c43f920faa1044cdb3df4c75b2c3639 /qemu-options.h
parent5b1adc390502140a03bc1e872b0b103d09e048f6 (diff)
downloadqemu-02935a553fb88f79fb0c79f094fb5ca0b42c96f3.tar.gz
qemu-02935a553fb88f79fb0c79f094fb5ca0b42c96f3.tar.bz2
qemu-02935a553fb88f79fb0c79f094fb5ca0b42c96f3.zip
Upgrade to upstream v1.1.0.
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Diffstat (limited to 'qemu-options.h')
-rw-r--r--qemu-options.h9
1 files changed, 2 insertions, 7 deletions
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