[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] misc: Correct relative include path
From: |
Laurent Vivier |
Subject: |
[PULL 03/11] misc: Correct relative include path |
Date: |
Mon, 7 Jun 2021 20:57:22 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Headers should be included from the 'include/' directory,
not from the root directory.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20210516205034.694788-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/gpio/aspeed_gpio.c | 2 +-
hw/i386/acpi-common.h | 6 +++---
hw/intc/ppc-uic.c | 2 +-
include/monitor/monitor.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
index 34d8acb0e37a..6ae0116be70b 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/i386/acpi-common.h b/hw/i386/acpi-common.h
index b12cd73ea5de..a68825acf50b 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/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
index 7171de7b3558..60013f2dde34 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"
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index af3887bb71d5..1211d6e6d69f 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;
--
2.31.1
- [PULL 00/11] Trivial branch for 6.1 patches, Laurent Vivier, 2021/06/07
- [PULL 02/11] i386/kvm: The value passed to strerror should be positive, Laurent Vivier, 2021/06/07
- [PULL 05/11] docs: fix broken reference, Laurent Vivier, 2021/06/07
- [PULL 06/11] target/nios2: fix page-fit instruction count, Laurent Vivier, 2021/06/07
- [PULL 11/11] vhost-vdpa: Remove redundant declaration of address_space_memory, Laurent Vivier, 2021/06/07
- [PULL 04/11] linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[], Laurent Vivier, 2021/06/07
- [PULL 07/11] hw/display/macfb: Classify the "nubus-macfb" as display device, Laurent Vivier, 2021/06/07
- [PULL 03/11] misc: Correct relative include path,
Laurent Vivier <=
- [PULL 09/11] target/mips: Fix 'Uncoditional' typo, Laurent Vivier, 2021/06/07
- [PULL 01/11] target/riscv: Do not include 'pmp.h' in user emulation, Laurent Vivier, 2021/06/07
- [PULL 10/11] scripts/oss-fuzz: Fix typo in documentation, Laurent Vivier, 2021/06/07
- [PULL 08/11] target/hppa: Remove unused 'memory.h' header, Laurent Vivier, 2021/06/07
- Re: [PULL 00/11] Trivial branch for 6.1 patches, Peter Maydell, 2021/06/08