Răsfoiți Sursa

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>
Michael S. Tsirkin 7 ani în urmă
părinte
comite
dc03272da6

+ 1 - 1
qga/channel-posix.c

@@ -2,7 +2,7 @@
 #include <termios.h>
 #include <termios.h>
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "qemu/sockets.h"
-#include "qga/channel.h"
+#include "channel.h"
 
 
 #ifdef CONFIG_SOLARIS
 #ifdef CONFIG_SOLARIS
 #include <stropts.h>
 #include <stropts.h>

+ 2 - 2
qga/channel-win32.c

@@ -1,8 +1,8 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include <windows.h>
 #include <windows.h>
 #include <io.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 {
 typedef struct GAChannelReadState {
     guint thread_id;
     guint thread_id;

+ 1 - 1
qga/commands-posix.c

@@ -16,7 +16,7 @@
 #include <sys/utsname.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <sys/wait.h>
 #include <dirent.h>
 #include <dirent.h>
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"

+ 2 - 2
qga/commands-win32.c

@@ -32,8 +32,8 @@
 #include <wtsapi32.h>
 #include <wtsapi32.h>
 #include <wininet.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 "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"

+ 1 - 1
qga/commands.c

@@ -11,7 +11,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"

+ 1 - 1
qga/guest-agent-command-state.c

@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  * See the COPYING file in the top-level directory.
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 
 
 struct GACommandState {
 struct GACommandState {
     GSList *groups;
     GSList *groups;

+ 2 - 2
qga/main.c

@@ -23,12 +23,12 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qstring.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "qga-qapi-commands.h"
 #include "qga-qapi-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
-#include "qga/channel.h"
+#include "channel.h"
 #include "qemu/bswap.h"
 #include "qemu/bswap.h"
 #include "qemu/help_option.h"
 #include "qemu/help_option.h"
 #include "qemu/sockets.h"
 #include "qemu/sockets.h"

+ 3 - 3
qga/vss-win32.c

@@ -14,9 +14,9 @@
 #include <windows.h>
 #include <windows.h>
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/error-report.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"
 #define QGA_VSS_DLL "qga-vss.dll"