diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu-common.h | 6 | ||||
| -rw-r--r-- | include/qom/object.h | 2 | ||||
| -rw-r--r-- | include/sysemu/os-win32.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index 22b010c7d7..f557be78e3 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -330,12 +330,6 @@ bool tcg_enabled(void); void cpu_exec_init_all(void); -/* CPU save/load. */ -#ifdef CPU_SAVE_VERSION -void cpu_save(QEMUFile *f, void *opaque); -int cpu_load(QEMUFile *f, void *opaque, int version_id); -#endif - /* Unblock cpu */ void qemu_cpu_kick_self(void); diff --git a/include/qom/object.h b/include/qom/object.h index 698827d948..33abce930b 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1115,7 +1115,7 @@ void object_property_set_int(Object *obj, int64_t value, * @name: the name of the property * @errp: returns an error if this function fails * - * Returns: the value of the property, converted to an integer, or NULL if + * Returns: the value of the property, converted to an integer, or negative if * an error occurs (including when the property value is not an integer). */ int64_t object_property_get_int(Object *obj, const char *name, diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 400e098607..fbed346716 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -26,8 +26,8 @@ #ifndef QEMU_OS_WIN32_H #define QEMU_OS_WIN32_H -#include <windows.h> #include <winsock2.h> +#include <windows.h> /* Workaround for older versions of MinGW. */ #ifndef ECONNREFUSED |