qga: use local path for local headers

When pulling in headers that are in the same directory as the C file (as
opposed to one in include/), we should use its relative path, without a
directory.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index b812bf4d51d686e54f19e439ace8bce87c4e6c85..5a925a9818430eff0ebe5a3b68de555196dfd93c 100644 (file)
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -2,7 +2,7 @@
 #include <termios.h>
 #include "qapi/error.h"
 #include "qemu/sockets.h"
-#include "qga/channel.h"
+#include "channel.h"
 
 #ifdef CONFIG_SOLARIS
 #include <stropts.h>

diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 7e6dc4d26f462ca329b3850c5938c69b612e9190..b3597a8a0f4558709c55d12360e8a981fec21b68 100644 (file)
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -1,8 +1,8 @@
 #include "qemu/osdep.h"
 #include <windows.h>
 #include <io.h>
-#include "qga/guest-agent-core.h"
-#include "qga/channel.h"
+#include "guest-agent-core.h"
+#include "channel.h"
 
 typedef struct GAChannelReadState {
     guint thread_id;

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0dc219dbcf57343f55d4fb29575d01cbf8ba7163..eae817191bdbb62978a79fd272f85e041bacab9f 100644 (file)
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -16,7 +16,7 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <dirent.h>
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 2d4839474849369c86d0fc27dfeab062ffa4d7d4..70ee5379f64650a827858012b7c99a4ff497aee2 100644 (file)
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -32,8 +32,8 @@
 #include <wtsapi32.h>
 #include <wininet.h>
 
-#include "qga/guest-agent-core.h"
-#include "qga/vss-win32.h"
+#include "guest-agent-core.h"
+#include "vss-win32.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qga/commands.c b/qga/commands.c
index a64b34ccab7dca9495180ca849b7e6b5ff73584e..cce3010f0fcd6be9342daa04b2ab935d95233ec6 100644 (file)
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c
index e609d320f0d2231cf2861bd2900b22e0efc099c5..18bcb5941d51ddc99d389efccfdfd1c3f0cab4ff 100644 (file)
--- a/qga/guest-agent-command-state.c
+++ b/qga/guest-agent-command-state.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 
 struct GACommandState {
     GSList *groups;

diff --git a/qga/main.c b/qga/main.c
index 1e1cec708f806b5ed4a22a51e10701ce9e8ff8a4..ea7540edccf4ead9e5d2fe3662d1004a3956d745 100644 (file)
--- a/qga/main.c
+++ b/qga/main.c
@@ -23,12 +23,12 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qstring.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qemu/module.h"
 #include "qga-qapi-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/error.h"
-#include "qga/channel.h"
+#include "channel.h"
 #include "qemu/bswap.h"
 #include "qemu/help_option.h"
 #include "qemu/sockets.h"

diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index 0199c2a792255a167e7b6f987b088739e8ada092..a541f3ae01d329fc9aa4043660effa317305fdf9 100644 (file)
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -14,9 +14,9 @@
 #include <windows.h>
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "qga/guest-agent-core.h"
-#include "qga/vss-win32.h"
-#include "qga/vss-win32/requester.h"
+#include "guest-agent-core.h"
+#include "vss-win32.h"
+#include "vss-win32/requester.h"
 
 #define QGA_VSS_DLL "qga-vss.dll"