diff options
| author | Peter Maydell | 2015-08-13 16:07:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-08-13 16:07:34 +0200 |
| commit | 5c314a2eb713f560d753cb194d194fd462cff719 (patch) | |
| tree | 814f4bda41335b882225b5b3d2077b139c9bfb54 /tests | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150813'... (diff) | |
| parent | MAINTAINERS: list smbios maintainers (diff) | |
| download | qemu-5c314a2eb713f560d753cb194d194fd462cff719.tar.gz qemu-5c314a2eb713f560d753cb194d194fd462cff719.tar.xz qemu-5c314a2eb713f560d753cb194d194fd462cff719.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,pc,acpi fixes, cleanups
Mostly cleanups, notably Eduardo's compat code rework,
and smbios rearrangement for use by ARM.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 13 Aug 2015 12:59:16 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream: (24 commits)
MAINTAINERS: list smbios maintainers
smbios: move smbios code into a common folder
smbios: remove dependency on x86 e820 tables
smbios: extract x86 smbios building code into a function
acpi: avoid potential uninitialized access to cpu_hp_io_base
virtio-net: remove useless codes
pci: allow 0 address for PCI IO/MEM regions
pc: Remove redundant arguments from pc_memory_init()
pc: Remove redundant arguments from pc_cmos_init()
pc: Remove redundant arguments from *load_linux()
pc: Use PCMachineState as pc_guest_info_init() argument
pc: Move {above,below}_4g_mem_size variables to PCMachineState
pc: Use PCMachineState for pc_memory_init() argument
pc: Use PCMachineState for pc_cmos_init() argument
pc: Eliminate pc_default_machine_options()
pc: Eliminate pc_common_machine_options()
pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h
pc: Rename pc_machine variables to pcms
pc: Use error_abort when registering properties
target-i386: Remove x86_cpu_compat_set_features()
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bios-tables-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 0de1742d7d..613867ab99 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -18,7 +18,7 @@ #include "libqtest.h" #include "qemu/compiler.h" #include "hw/acpi/acpi-defs.h" -#include "hw/i386/smbios.h" +#include "hw/smbios/smbios.h" #include "qemu/bitmap.h" #define MACHINE_PC "pc" |