Merge with current master.

2017-01-20 18:22:28 +11:00
parent 5c7c8375f9 b887c3bb25
commit 92392e0f57
115 changed files with 7 additions and 10001 deletions
--- a/qemu/util/oslib-win32.c
+++ b/qemu/util/oslib-win32.c
@@ -32,8 +32,6 @@
 #include <stdlib.h>
 #include "config-host.h"
 #include "sysemu/sysemu.h"
-// #include "trace.h"
-//#include "qemu/sockets.h"

 /* this must come after including "trace.h" */
 #include <shlobj.h>