| Message ID | 20210516205034.694788-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | misc: Correct relative include path | expand |
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>
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" >
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
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"
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(-)