From 1de7afc984b49af164e2619e6850b9732b173b34 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 17 Dec 2012 18:20:00 +0100
Subject: misc: move include files to include/qemu/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/qapi/error.h        | 2 +-
 include/qapi/opts-visitor.h | 2 +-
 include/qapi/qmp/qdict.h    | 2 +-
 include/qapi/qmp/qerror.h   | 2 +-
 include/qapi/qmp/qjson.h    | 2 +-
 include/qapi/qmp/qlist.h    | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'include/qapi')

diff --git a/include/qapi/error.h b/include/qapi/error.h
index 4d52e7369..5cd2f0c30 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -12,7 +12,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "compiler.h"
+#include "qemu/compiler.h"
 #include "qapi-types.h"
 #include <stdbool.h>
 
diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h
index 31fa4c562..5939eeebc 100644
--- a/include/qapi/opts-visitor.h
+++ b/include/qapi/opts-visitor.h
@@ -14,7 +14,7 @@
 #define OPTS_VISITOR_H
 
 #include "qapi/visitor.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
 
 typedef struct OptsVisitor OptsVisitor;
 
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index c815981d3..6d9a4be3a 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -15,7 +15,7 @@
 
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qlist.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
 #include <stdint.h>
 
 #define QDICT_BUCKET_MAX 512
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index d91229759..6c0a18dfc 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -14,7 +14,7 @@
 
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
-#include "qemu-error.h"
+#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi-types.h"
 #include <stdarg.h>
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index 0473374bf..73351ed6d 100644
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -15,7 +15,7 @@
 #define QJSON_H
 
 #include <stdarg.h>
-#include "compiler.h"
+#include "qemu/compiler.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index ffa0846d4..382f04c3c 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -14,8 +14,8 @@
 #define QLIST_H
 
 #include "qapi/qmp/qobject.h"
-#include "qemu-queue.h"
-#include "qemu-queue.h"
+#include "qemu/queue.h"
+#include "qemu/queue.h"
 
 typedef struct QListEntry {
     QObject *value;
-- 
cgit v1.2.3