diff mbox series

[v2,16/20] colo: use local path for local headers

Message ID 1527266793-301361-17-git-send-email-mst@redhat.com
State New
Headers show
Series include cleanups | expand

Commit Message

Michael S. Tsirkin May 25, 2018, 4:48 p.m. UTC 
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.

Reviewed-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 net/colo-compare.c    | 2 +-
 net/colo.c            | 2 +-
 net/filter-rewriter.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé May 26, 2018, 4:31 a.m. UTC | #1 
On 05/25/2018 01:48 PM, Michael S. Tsirkin wrote:
> 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.
> 
> Reviewed-by: Zhang Chen <zhangckid@gmail.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  net/colo-compare.c    | 2 +-
>  net/colo.c            | 2 +-
>  net/filter-rewriter.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 23b2d2c..c3a2be4 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -25,7 +25,7 @@
>  #include "net/queue.h"
>  #include "chardev/char-fe.h"
>  #include "qemu/sockets.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  #include "sysemu/iothread.h"
>  
>  #define TYPE_COLO_COMPARE "colo-compare"
> diff --git a/net/colo.c b/net/colo.c
> index 8426265..6dda4ed 100644
> --- a/net/colo.c
> +++ b/net/colo.c
> @@ -14,7 +14,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "trace.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  
>  uint32_t connection_key_hash(const void *opaque)
>  {
> diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
> index 62dad2d..f584e4e 100644
> --- a/net/filter-rewriter.c
> +++ b/net/filter-rewriter.c
> @@ -11,7 +11,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "trace.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  #include "net/filter.h"
>  #include "net/net.h"
>  #include "qemu-common.h"
>
diff mbox series

Patch

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 23b2d2c..c3a2be4 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -25,7 +25,7 @@ 
 #include "net/queue.h"
 #include "chardev/char-fe.h"
 #include "qemu/sockets.h"
-#include "net/colo.h"
+#include "colo.h"
 #include "sysemu/iothread.h"
 
 #define TYPE_COLO_COMPARE "colo-compare"
diff --git a/net/colo.c b/net/colo.c
index 8426265..6dda4ed 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -14,7 +14,7 @@ 
 
 #include "qemu/osdep.h"
 #include "trace.h"
-#include "net/colo.h"
+#include "colo.h"
 
 uint32_t connection_key_hash(const void *opaque)
 {
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 62dad2d..f584e4e 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -11,7 +11,7 @@ 
 
 #include "qemu/osdep.h"
 #include "trace.h"
-#include "net/colo.h"
+#include "colo.h"
 #include "net/filter.h"
 #include "net/net.h"
 #include "qemu-common.h"