Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20161017' into...

[qemu.git] / util / oslib-win32.c

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index a3f0664763a4defb6e7ccdbf650e10d43ac3795e..d09863cc9d22dd0f2200b74855ad6c2bfce309fb 100644 (file)
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -31,11 +31,12 @@
  */
 #include "qemu/osdep.h"
 #include <windows.h>
-#include <glib.h>
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "trace.h"
 #include "qemu/sockets.h"
+#include "qemu/cutils.h"
 
 /* this must come after including "trace.h" */
 #include <shlobj.h>
@@ -538,7 +539,7 @@ int getpagesize(void)
     return system_info.dwPageSize;
 }
 
-void os_mem_prealloc(int fd, char *area, size_t memory)
+void os_mem_prealloc(int fd, char *area, size_t memory, Error **errp)
 {
     int i;
     size_t pagesize = getpagesize();
@@ -574,6 +575,13 @@ int qemu_read_password(char *buf, int buf_size)
 }
 
 
+char *qemu_get_pid_name(pid_t pid)
+{
+    /* XXX Implement me */
+    abort();
+}
+
+
 pid_t qemu_fork(Error **errp)
 {
     errno = ENOSYS;