Skip to content

Commit

Permalink
qga: use local path for local headers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mstsirkin committed Jun 1, 2018
1 parent f27f01d commit dc03272
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion qga/channel-posix.c
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions 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;
Expand Down
2 changes: 1 addition & 1 deletion qga/commands-posix.c
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions qga/commands-win32.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion qga/commands.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion qga/guest-agent-command-state.c
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions qga/main.c
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions qga/vss-win32.c
Expand Up @@ -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"

Expand Down

0 comments on commit dc03272

Please sign in to comment.