diff options
| author | Peter Maydell | 2021-06-07 21:05:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-06-07 21:05:29 +0200 |
| commit | 33ba8b0adc91482dd4247a0773cfe7def011933f (patch) | |
| tree | 7ad27f3a761a1c999aa111e74584b1be2b50c09a /hw/i386/acpi-common.h | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-updates-07062... (diff) | |
| parent | vhost-vdpa: Remove redundant declaration of address_space_memory (diff) | |
| download | qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.tar.gz qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.tar.xz qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging
Trivial branch pull request 20210607
# gpg: Signature made Mon 07 Jun 2021 19:56:43 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-6.1-pull-request:
vhost-vdpa: Remove redundant declaration of address_space_memory
scripts/oss-fuzz: Fix typo in documentation
target/mips: Fix 'Uncoditional' typo
target/hppa: Remove unused 'memory.h' header
hw/display/macfb: Classify the "nubus-macfb" as display device
target/nios2: fix page-fit instruction count
docs: fix broken reference
linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[]
misc: Correct relative include path
i386/kvm: The value passed to strerror should be positive
target/riscv: Do not include 'pmp.h' in user emulation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/acpi-common.h')
| -rw-r--r-- | hw/i386/acpi-common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index b12cd73ea5..a68825acf5 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 |