[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/31] qga: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 25/31] qga: use local path for local headers |
Date: |
Fri, 1 Jun 2018 19:27:23 +0300 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
qga/channel-posix.c | 2 +-
qga/channel-win32.c | 4 ++--
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 4 ++--
qga/commands.c | 2 +-
qga/guest-agent-command-state.c | 2 +-
qga/main.c | 4 ++--
qga/vss-win32.c | 6 +++---
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index b812bf4d51..5a925a9818 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 7e6dc4d26f..b3597a8a0f 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 0dc219dbcf..eae817191b 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 2d48394748..70ee5379f6 100644
--- 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 a64b34ccab..cce3010f0f 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 e609d320f0..18bcb5941d 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 1e1cec708f..ea7540edcc 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 0199c2a792..a541f3ae01 100644
--- 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"
--
MST
- [Qemu-devel] [PULL 14/31] display: use local path for local headers, (continued)
- [Qemu-devel] [PULL 14/31] display: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 17/31] e1000e: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 20/31] vhost-scsi: drop an unused include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 16/31] ioapic: fix up includes, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 18/31] rocker: drop an unused include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 19/31] ppc: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 15/31] ide: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 21/31] sd: fix up include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 22/31] usb: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 24/31] colo: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 25/31] qga: use local path for local headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 27/31] arch_init: sort architectures, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 28/31] tests/.gitignore: add entry for generated file, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 29/31] nvdimm, acpi: support NFIT platform capabilities, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 26/31] ui: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 23/31] migration: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 30/31] ACPI testing: test NFIT platform capabilities, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 31/31] vhost-blk: turn on pre-defined RO feature bit, Michael S. Tsirkin, 2018/06/01
- Re: [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Peter Maydell, 2018/06/04