Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-10-25' into staging

[qemu.git] / include / qemu / option_int.h

diff --git a/include/qemu/option_int.h b/include/qemu/option_int.h
index 8212fa4a485855cd8c71fed189a5214c27b571dd..26b1d9e4d6b14ff1883413b2c7b3426d7099a966 100644 (file)
--- a/include/qemu/option_int.h
+++ b/include/qemu/option_int.h
@@ -23,15 +23,15 @@
  * THE SOFTWARE.
  */
 
-#ifndef QEMU_OPTIONS_INTERNAL_H
-#define QEMU_OPTIONS_INTERNAL_H
+#ifndef QEMU_OPTION_INT_H
+#define QEMU_OPTION_INT_H
 
 #include "qemu/option.h"
 #include "qemu/error-report.h"
 
 struct QemuOpt {
-    const char   *name;
-    const char   *str;
+    char *name;
+    char *str;
 
     const QemuOptDesc *desc;
     union {