Merge remote branch 'kwolf/for-anthony' into staging

Conflicts:
	hw/pc.c

1 files changed, 1 insertions, 1 deletions

diff --git a/savevm.c b/savevm.c
index af92ba2982..1173a22e65 100644
--- a/savevm.c
+++ b/savevm.c
@@ -77,7 +77,7 @@
 #include "sysemu.h"
 #include "qemu-timer.h"
 #include "qemu-char.h"
-#include "block.h"
+#include "blockdev.h"
 #include "audio/audio.h"
 #include "migration.h"
 #include "qemu_socket.h"