[Qemu-devel] [PATCH 17/67] colo: use local path for local headers

Michael S. Tsirkin posted 67 patches 7 years, 5 months ago
[Qemu-devel] [PATCH 17/67] colo: use local path for local headers
Posted by Michael S. Tsirkin 7 years, 5 months ago
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 <mst@redhat.com>
---
 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"
-- 
MST


Re: [Qemu-devel] [PATCH 17/67] colo: use local path for local headers
Posted by Zhang Chen 7 years, 5 months ago
On Fri, May 4, 2018 at 3:50 AM, Michael S. Tsirkin <mst@redhat.com> 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. Directory based path works more or less by accident.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>

Reviewed-by: Zhang Chen <zhangckid@gmail.com>


> ---
>  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"
> --
> MST
>
>