[PULL,15/31] ide: use local path for local headers

Message ID	20180601162620.32362-16-mst@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> Date: Fri, 1 Jun 2018 19:27:07 +0300 From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Message-ID: <20180601162620.32362-16-mst@redhat.com> References: <20180601162620.32362-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180601162620.32362-1-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 15/31] ide: use local path for local headers Precedence: list Cc: Peter Maydell <peter.maydell@linaro.org>, John Snow <jsnow@redhat.com>, Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/31] vhost: allow backends to filter memory sections \| expand [PULL,01/31] vhost: allow backends to filter memory sections [PULL,02/31] vhost-user: allow slave to send fds via slave channel [PULL,03/31] vhost-user: introduce shared vhost-user state [PULL,04/31] vhost-user: support registering external host notifiers [PULL,05/31] libvhost-user: support host notifier [PULL,06/31] vhost-user-bridge: support host notifier [PULL,07/31] osdep: add wait.h compat macros [PULL,08/31] libqtest: fail if child coredumps [PULL,09/31] block: use local path for local headers [PULL,10/31] crypto: use local path for local headers [PULL,12/31] migration: drop an unused include [PULL,11/31] hppa: use local path for local headers [PULL,13/31] trace: use local path for local headers [PULL,14/31] display: use local path for local headers [PULL,15/31] ide: use local path for local headers [PULL,16/31] ioapic: fix up includes [PULL,18/31] rocker: drop an unused include [PULL,17/31] e1000e: use local path for local headers [PULL,19/31] ppc: use local path for local headers [PULL,20/31] vhost-scsi: drop an unused include [PULL,21/31] sd: fix up include [PULL,22/31] usb: use local path for local headers [PULL,23/31] migration: use local path for local headers [PULL,24/31] colo: use local path for local headers [PULL,25/31] qga: use local path for local headers [PULL,26/31] ui: use local path for local headers [PULL,27/31] arch_init: sort architectures [PULL,28/31] tests/.gitignore: add entry for generated file [PULL,29/31] nvdimm, acpi: support NFIT platform capabilities [PULL,30/31] ACPI testing: test NFIT platform capabilities [PULL,31/31] vhost-blk: turn on pre-defined RO feature bit

Message ID

20180601162620.32362-16-mst@redhat.com

State

New

Headers

Date: Fri, 1 Jun 2018 19:27:07 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Message-ID: <20180601162620.32362-16-mst@redhat.com>
References: <20180601162620.32362-1-mst@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20180601162620.32362-1-mst@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PULL 15/31] ide: use local path for local headers
Precedence: list
Cc: Peter Maydell <peter.maydell@linaro.org>, John Snow <jsnow@redhat.com>,
	Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,
	qemu-block@nongnu.org
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

[PULL,01/31] vhost: allow backends to filter memory sections | expand

Commit Message

Michael S. Tsirkin June 1, 2018, 4:27 p.m. UTC

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>
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 2fd95078ba..f98e6cb3d4 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 e22d7be05f..24dbad5125 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 134478ebb2..51c935a0da 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

[PULL,15/31] ide: use local path for local headers

Commit Message

Patch