[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/67] qga: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 18/67] qga: use local path for local headers |
Date: |
Thu, 3 May 2018 22:50:57 +0300 |
When pulling in headers that are in the same directory as C file (as
opposed to one in include/), we should use its relative path, without a
directory. Directory based path works more or less by accident.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
qga/channel-posix.c | 2 +-
qga/channel-win32.c | 4 ++--
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/guest-agent-command-state.c | 2 +-
qga/main.c | 4 ++--
qga/vss-win32.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index b812bf4..5a925a9 100644
--- 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 7e6dc4d..b3597a8 100644
--- 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 0dc219d..eae8171 100644
--- 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 2d48394..bc64fe8 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -32,7 +32,7 @@
#include <wtsapi32.h>
#include <wininet.h>
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
#include "qga/vss-win32.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
diff --git a/qga/commands.c b/qga/commands.c
index a64b34c..cce3010 100644
--- 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 e609d32..18bcb59 100644
--- 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 df1888e..127b51d 100644
--- 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 0199c2a..e834ec5 100644
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -14,7 +14,7 @@
#include <windows.h>
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
#include "qga/vss-win32.h"
#include "qga/vss-win32/requester.h"
--
MST
- [Qemu-devel] [PATCH 12/67] ppc: use local path for local headers, (continued)
- [Qemu-devel] [PATCH 12/67] ppc: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 13/67] vhost-scsi: drop an unused include, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 14/67] sd: fix up include, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 15/67] usb: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 17/67] colo: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 19/67] xtensa: relative include for parent directory, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 18/67] qga: use local path for local headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 23/67] slirp: add include directory headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 20/67] tests: relative include for child directory, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 21/67] trace: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 27/67] replication: add include directory header, Michael S. Tsirkin, 2018/05/03