[Qemu-devel] [PATCH v2 07/20] ide: use local path for local headers

Michael S. Tsirkin posted 20 patches 7 years, 5 months ago
[Qemu-devel] [PATCH v2 07/20] ide: 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.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/ide/ahci-allwinner.c | 2 +-
 hw/ide/ahci.c           | 2 +-
 hw/ide/ich.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index 2fd9507..f98e6cb 100644
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #include "trace.h"
 
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e22d7be..24dbad5 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -31,7 +31,7 @@
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #include "trace.h"
 
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 134478e..51c935a 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -67,7 +67,7 @@
 #include "hw/isa/isa.h"
 #include "sysemu/dma.h"
 #include "hw/ide/pci.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #define ICH9_MSI_CAP_OFFSET     0x80
 #define ICH9_SATA_CAP_OFFSET    0xA8
-- 
MST


Re: [Qemu-devel] [PATCH v2 07/20] ide: use local path for local headers
Posted by Philippe Mathieu-Daudé 7 years, 5 months ago
On 05/25/2018 01:47 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.
> 
> 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>

> ---
>  hw/ide/ahci-allwinner.c | 2 +-
>  hw/ide/ahci.c           | 2 +-
>  hw/ide/ich.c            | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
> index 2fd9507..f98e6cb 100644
> --- a/hw/ide/ahci-allwinner.c
> +++ b/hw/ide/ahci-allwinner.c
> @@ -20,7 +20,7 @@
>  #include "qemu/error-report.h"
>  #include "sysemu/dma.h"
>  #include "hw/ide/internal.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #include "trace.h"
>  
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index e22d7be..24dbad5 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -31,7 +31,7 @@
>  #include "sysemu/dma.h"
>  #include "hw/ide/internal.h"
>  #include "hw/ide/pci.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #include "trace.h"
>  
> diff --git a/hw/ide/ich.c b/hw/ide/ich.c
> index 134478e..51c935a 100644
> --- a/hw/ide/ich.c
> +++ b/hw/ide/ich.c
> @@ -67,7 +67,7 @@
>  #include "hw/isa/isa.h"
>  #include "sysemu/dma.h"
>  #include "hw/ide/pci.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #define ICH9_MSI_CAP_OFFSET     0x80
>  #define ICH9_SATA_CAP_OFFSET    0xA8
>