* [PATCH] misc: Correct relative include path
@ 2021-05-16 20:50 Philippe Mathieu-Daudé
2021-05-17 1:43 ` Bin Meng
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-16 20:50 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, qemu-arm, qemu-ppc, Philippe Mathieu-Daudé
Headers should be included from the 'include/' directory,
not from the root directory.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/acpi-common.h | 6 +++---
include/monitor/monitor.h | 2 +-
hw/gpio/aspeed_gpio.c | 2 +-
hw/intc/ppc-uic.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
index b12cd73ea5d..a68825acf50 100644
--- a/hw/i386/acpi-common.h
+++ b/hw/i386/acpi-common.h
@@ -1,9 +1,9 @@
#ifndef HW_I386_ACPI_COMMON_H
#define HW_I386_ACPI_COMMON_H
-#include "include/hw/acpi/acpi_dev_interface.h"
-#include "include/hw/acpi/bios-linker-loader.h"
-#include "include/hw/i386/x86.h"
+#include "hw/acpi/acpi_dev_interface.h"
+#include "hw/acpi/bios-linker-loader.h"
+#include "hw/i386/x86.h"
/* Default IOAPIC ID */
#define ACPI_BUILD_IOAPIC_ID 0x0
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index af3887bb71d..1211d6e6d69 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -4,7 +4,7 @@
#include "block/block.h"
#include "qapi/qapi-types-misc.h"
#include "qemu/readline.h"
-#include "include/exec/hwaddr.h"
+#include "exec/hwaddr.h"
typedef struct MonitorHMP MonitorHMP;
typedef struct MonitorOptions MonitorOptions;
diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
index 985a259e05b..db7ef88ee56 100644
--- a/hw/gpio/aspeed_gpio.c
+++ b/hw/gpio/aspeed_gpio.c
@@ -10,7 +10,7 @@
#include "qemu/host-utils.h"
#include "qemu/log.h"
#include "hw/gpio/aspeed_gpio.h"
-#include "include/hw/misc/aspeed_scu.h"
+#include "hw/misc/aspeed_scu.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "hw/irq.h"
diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
index 7171de7b355..60013f2dde3 100644
--- a/hw/intc/ppc-uic.c
+++ b/hw/intc/ppc-uic.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "include/hw/intc/ppc-uic.h"
+#include "hw/intc/ppc-uic.h"
#include "hw/irq.h"
#include "cpu.h"
#include "hw/ppc/ppc.h"
--
2.26.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] misc: Correct relative include path
2021-05-16 20:50 [PATCH] misc: Correct relative include path Philippe Mathieu-Daudé
@ 2021-05-17 1:43 ` Bin Meng
2021-05-25 7:49 ` Philippe Mathieu-Daudé
2021-06-05 19:12 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Bin Meng @ 2021-05-17 1:43 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: QEMU Trivial, qemu-arm, qemu-ppc, qemu-devel@nongnu.org Developers
On Mon, May 17, 2021 at 4:50 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> Headers should be included from the 'include/' directory,
> not from the root directory.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/i386/acpi-common.h | 6 +++---
> include/monitor/monitor.h | 2 +-
> hw/gpio/aspeed_gpio.c | 2 +-
> hw/intc/ppc-uic.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] misc: Correct relative include path
2021-05-16 20:50 [PATCH] misc: Correct relative include path Philippe Mathieu-Daudé
2021-05-17 1:43 ` Bin Meng
@ 2021-05-25 7:49 ` Philippe Mathieu-Daudé
2021-06-05 19:12 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-25 7:49 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, qemu-arm, qemu-ppc
ping? (patch reviewed)
On 5/16/21 10:50 PM, Philippe Mathieu-Daudé wrote:
> Headers should be included from the 'include/' directory,
> not from the root directory.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/i386/acpi-common.h | 6 +++---
> include/monitor/monitor.h | 2 +-
> hw/gpio/aspeed_gpio.c | 2 +-
> hw/intc/ppc-uic.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
> index b12cd73ea5d..a68825acf50 100644
> --- a/hw/i386/acpi-common.h
> +++ b/hw/i386/acpi-common.h
> @@ -1,9 +1,9 @@
> #ifndef HW_I386_ACPI_COMMON_H
> #define HW_I386_ACPI_COMMON_H
> -#include "include/hw/acpi/acpi_dev_interface.h"
>
> -#include "include/hw/acpi/bios-linker-loader.h"
> -#include "include/hw/i386/x86.h"
> +#include "hw/acpi/acpi_dev_interface.h"
> +#include "hw/acpi/bios-linker-loader.h"
> +#include "hw/i386/x86.h"
>
> /* Default IOAPIC ID */
> #define ACPI_BUILD_IOAPIC_ID 0x0
> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
> index af3887bb71d..1211d6e6d69 100644
> --- a/include/monitor/monitor.h
> +++ b/include/monitor/monitor.h
> @@ -4,7 +4,7 @@
> #include "block/block.h"
> #include "qapi/qapi-types-misc.h"
> #include "qemu/readline.h"
> -#include "include/exec/hwaddr.h"
> +#include "exec/hwaddr.h"
>
> typedef struct MonitorHMP MonitorHMP;
> typedef struct MonitorOptions MonitorOptions;
> diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
> index 985a259e05b..db7ef88ee56 100644
> --- a/hw/gpio/aspeed_gpio.c
> +++ b/hw/gpio/aspeed_gpio.c
> @@ -10,7 +10,7 @@
> #include "qemu/host-utils.h"
> #include "qemu/log.h"
> #include "hw/gpio/aspeed_gpio.h"
> -#include "include/hw/misc/aspeed_scu.h"
> +#include "hw/misc/aspeed_scu.h"
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "hw/irq.h"
> diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
> index 7171de7b355..60013f2dde3 100644
> --- a/hw/intc/ppc-uic.c
> +++ b/hw/intc/ppc-uic.c
> @@ -23,7 +23,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "include/hw/intc/ppc-uic.h"
> +#include "hw/intc/ppc-uic.h"
> #include "hw/irq.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] misc: Correct relative include path
2021-05-16 20:50 [PATCH] misc: Correct relative include path Philippe Mathieu-Daudé
2021-05-17 1:43 ` Bin Meng
2021-05-25 7:49 ` Philippe Mathieu-Daudé
@ 2021-06-05 19:12 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2021-06-05 19:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: qemu-trivial, qemu-arm, qemu-ppc
Le 16/05/2021 à 22:50, Philippe Mathieu-Daudé a écrit :
> Headers should be included from the 'include/' directory,
> not from the root directory.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/i386/acpi-common.h | 6 +++---
> include/monitor/monitor.h | 2 +-
> hw/gpio/aspeed_gpio.c | 2 +-
> hw/intc/ppc-uic.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
> index b12cd73ea5d..a68825acf50 100644
> --- a/hw/i386/acpi-common.h
> +++ b/hw/i386/acpi-common.h
> @@ -1,9 +1,9 @@
> #ifndef HW_I386_ACPI_COMMON_H
> #define HW_I386_ACPI_COMMON_H
> -#include "include/hw/acpi/acpi_dev_interface.h"
>
> -#include "include/hw/acpi/bios-linker-loader.h"
> -#include "include/hw/i386/x86.h"
> +#include "hw/acpi/acpi_dev_interface.h"
> +#include "hw/acpi/bios-linker-loader.h"
> +#include "hw/i386/x86.h"
>
> /* Default IOAPIC ID */
> #define ACPI_BUILD_IOAPIC_ID 0x0
> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
> index af3887bb71d..1211d6e6d69 100644
> --- a/include/monitor/monitor.h
> +++ b/include/monitor/monitor.h
> @@ -4,7 +4,7 @@
> #include "block/block.h"
> #include "qapi/qapi-types-misc.h"
> #include "qemu/readline.h"
> -#include "include/exec/hwaddr.h"
> +#include "exec/hwaddr.h"
>
> typedef struct MonitorHMP MonitorHMP;
> typedef struct MonitorOptions MonitorOptions;
> diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
> index 985a259e05b..db7ef88ee56 100644
> --- a/hw/gpio/aspeed_gpio.c
> +++ b/hw/gpio/aspeed_gpio.c
> @@ -10,7 +10,7 @@
> #include "qemu/host-utils.h"
> #include "qemu/log.h"
> #include "hw/gpio/aspeed_gpio.h"
> -#include "include/hw/misc/aspeed_scu.h"
> +#include "hw/misc/aspeed_scu.h"
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "hw/irq.h"
> diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
> index 7171de7b355..60013f2dde3 100644
> --- a/hw/intc/ppc-uic.c
> +++ b/hw/intc/ppc-uic.c
> @@ -23,7 +23,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "include/hw/intc/ppc-uic.h"
> +#include "hw/intc/ppc-uic.h"
> #include "hw/irq.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-05 19:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 20:50 [PATCH] misc: Correct relative include path Philippe Mathieu-Daudé
2021-05-17 1:43 ` Bin Meng
2021-05-25 7:49 ` Philippe Mathieu-Daudé
2021-06-05 19:12 ` Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.