Break up vl.h.

[qemu] / block-raw.c

diff --git a/block-raw.c b/block-raw.c
index 8286681..732b4b8 100644 (file)
--- a/block-raw.c
+++ b/block-raw.c
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifdef QEMU_IMG
 #include "qemu-common.h"
-#else
-#include "vl.h"
+#ifndef QEMU_IMG
+#include "qemu-timer.h"
+#include "exec-all.h"
 #endif
 #include "block_int.h"
 #include <assert.h>
@@ -61,7 +61,6 @@
 
 //#define DEBUG_BLOCK
 #if defined(DEBUG_BLOCK) && !defined(QEMU_IMG)
-#include "exec-all.h"
 #define DEBUG_BLOCK_PRINT(formatCstr, args...) do { if (loglevel != 0) \
     { fprintf(logfile, formatCstr, ##args); fflush(logfile); } } while (0)
 #else