target-mips: Fix incorrect code and test for INSV

[qemu.git] / qemu-config.h

diff --git a/qemu-config.h b/qemu-config.h
index dca69d454b419dc20f26582b044041d43d08dc4a..812c4c5b10f0d6c9833b7c36f5c840c40e7efba7 100644 (file)
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -1,21 +1,18 @@
 #ifndef QEMU_CONFIG_H
 #define QEMU_CONFIG_H
 
-extern QemuOptsList qemu_drive_opts;
-extern QemuOptsList qemu_chardev_opts;
-#ifdef CONFIG_LINUX
+#include <stdio.h>
+#include "qemu-option.h"
+#include "error.h"
+
 extern QemuOptsList qemu_fsdev_opts;
 extern QemuOptsList qemu_virtfs_opts;
-#endif
-extern QemuOptsList qemu_device_opts;
-extern QemuOptsList qemu_netdev_opts;
-extern QemuOptsList qemu_net_opts;
-extern QemuOptsList qemu_rtc_opts;
-extern QemuOptsList qemu_global_opts;
-extern QemuOptsList qemu_mon_opts;
-extern QemuOptsList qemu_cpudef_opts;
+extern QemuOptsList qemu_spice_opts;
+extern QemuOptsList qemu_sandbox_opts;
 
 QemuOptsList *qemu_find_opts(const char *group);
+QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);
+void qemu_add_opts(QemuOptsList *list);
 int qemu_set_option(const char *str);
 int qemu_global_option(const char *str);
 void qemu_add_globals(void);
@@ -25,4 +22,8 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname);
 
 int qemu_read_config_file(const char *filename);
 
+/* Read default QEMU config files
+ */
+int qemu_read_default_config_files(bool userconfig);
+
 #endif /* QEMU_CONFIG_H */