misc: Use QEMU header path relative to include/ directory

[PATCH] misc: Use QEMU header path relative to include/ directory

Philippe Mathieu-Daudé posted 1 patch 1 week, 4 days ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240507142737.95735-1-philmd@linaro.org

Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, Song Gao <gaosong@loongson.cn>, Paolo Bonzini <pbonzini@redhat.com>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Jesper Devantier <foss@defmacro.it>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Jeuk Kim <jeuk20.kim@samsung.com>

hw/audio/virtio-snd.c   | 2 +-
hw/rtc/ls7a_rtc.c       | 2 +-
target/i386/gdbstub.c   | 2 +-
tests/qtest/nvme-test.c | 2 +-
tests/qtest/ufs-test.c  | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

Expand all Fold all

[PATCH] misc: Use QEMU header path relative to include/ directory

Posted by Philippe Mathieu-Daudé 1 week, 4 days ago

QEMU headers are relative to the include/ directory,
not to the project root directory. Remove "include/".

See also:
https://www.qemu.org/docs/master/devel/style.html#include-directives

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/audio/virtio-snd.c   | 2 +-
 hw/rtc/ls7a_rtc.c       | 2 +-
 target/i386/gdbstub.c   | 2 +-
 tests/qtest/nvme-test.c | 2 +-
 tests/qtest/ufs-test.c  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c
index 6a2ee085c0..7d09800d1f 100644
--- a/hw/audio/virtio-snd.c
+++ b/hw/audio/virtio-snd.c
@@ -19,7 +19,7 @@
 #include "qemu/iov.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "include/qemu/lockable.h"
+#include "qemu/lockable.h"
 #include "exec/tswap.h"
 #include "sysemu/runstate.h"
 #include "trace.h"
diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c
index ac28c1165b..052201c2cd 100644
--- a/hw/rtc/ls7a_rtc.c
+++ b/hw/rtc/ls7a_rtc.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
-#include "include/hw/register.h"
+#include "hw/register.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c
index ebb000df6a..4acf485879 100644
--- a/target/i386/gdbstub.c
+++ b/target/i386/gdbstub.c
@@ -19,7 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "include/gdbstub/helpers.h"
+#include "gdbstub/helpers.h"
 
 #ifdef TARGET_X86_64
 static const int gpr_map[16] = {
diff --git a/tests/qtest/nvme-test.c b/tests/qtest/nvme-test.c
index 008d189b0f..5ad6821f7a 100644
--- a/tests/qtest/nvme-test.c
+++ b/tests/qtest/nvme-test.c
@@ -13,7 +13,7 @@
 #include "libqtest.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
-#include "include/block/nvme.h"
+#include "block/nvme.h"
 
 typedef struct QNvme QNvme;
 
diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
index 95e82f9472..82ec3f0671 100644
--- a/tests/qtest/ufs-test.c
+++ b/tests/qtest/ufs-test.c
@@ -13,7 +13,7 @@
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 #include "scsi/constants.h"
-#include "include/block/ufs.h"
+#include "block/ufs.h"
 
 /* Test images sizes in Bytes */
 #define TEST_IMAGE_SIZE (64 * 1024 * 1024)
-- 
2.41.0

Re: [PATCH] misc: Use QEMU header path relative to include/ directory

Posted by Philippe Mathieu-Daudé 1 week, 3 days ago

On 7/5/24 16:27, Philippe Mathieu-Daudé wrote:
> QEMU headers are relative to the include/ directory,
> not to the project root directory. Remove "include/".
> 
> See also:
> https://www.qemu.org/docs/master/devel/style.html#include-directives
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/audio/virtio-snd.c   | 2 +-
>   hw/rtc/ls7a_rtc.c       | 2 +-
>   target/i386/gdbstub.c   | 2 +-
>   tests/qtest/nvme-test.c | 2 +-
>   tests/qtest/ufs-test.c  | 2 +-
>   5 files changed, 5 insertions(+), 5 deletions(-)

Thanks, patch queued to hw-misc tree.

Re: [PATCH] misc: Use QEMU header path relative to include/ directory

Posted by Richard Henderson 1 week, 4 days ago

On 5/7/24 07:27, Philippe Mathieu-Daudé wrote:
> QEMU headers are relative to the include/ directory,
> not to the project root directory. Remove "include/".
> 
> See also:
> https://www.qemu.org/docs/master/devel/style.html#include-directives
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   hw/audio/virtio-snd.c   | 2 +-
>   hw/rtc/ls7a_rtc.c       | 2 +-
>   target/i386/gdbstub.c   | 2 +-
>   tests/qtest/nvme-test.c | 2 +-
>   tests/qtest/ufs-test.c  | 2 +-
>   5 files changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Re: [PATCH] misc: Use QEMU header path relative to include/ directory

Posted by Peter Maydell 1 week, 4 days ago

On Tue, 7 May 2024 at 15:28, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> QEMU headers are relative to the include/ directory,
> not to the project root directory. Remove "include/".
>
> See also:
> https://www.qemu.org/docs/master/devel/style.html#include-directives
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  hw/audio/virtio-snd.c   | 2 +-
>  hw/rtc/ls7a_rtc.c       | 2 +-
>  target/i386/gdbstub.c   | 2 +-
>  tests/qtest/nvme-test.c | 2 +-
>  tests/qtest/ufs-test.c  | 2 +-

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM