Re: [PATCH v9 00/10] acpi: i386 tweaks

2020-06-18 Thread Michael S. Tsirkin
On Wed, Jun 17, 2020 at 09:11:28AM +0200, Gerd Hoffmann wrote:
> First batch of microvm patches, some generic acpi stuff.
> Split the acpi-build.c monster, specifically split the
> pc and q35 and pci bits into a separate file which we
> can skip building at some point in the future.

Thanks for the patches!
Pls take a look at tests/qtest/bios-tables-test.c, the comment
at top of this file outlines the process to use for
changing expected test files.
As it is, the patches won't be easily rebaseable or backportable.


> v2 changes: leave acpi-build.c largely as-is, move useful
> bits to other places to allow them being reused, specifically:
> 
>  * move isa device generator functions to individual isa devices.
>  * move fw_cfg generator function to fw_cfg.c
> 
> v3 changes: fix rtc, support multiple lpt devices.
> 
> v4 changes:
>  * drop merged patches.
>  * split rtc crs change to separata patch.
>  * added two cleanup patches.
>  * picked up ack & review tags.
> 
> v5 changes:
>  * add comment for rtc crs update.
>  * add even more cleanup patches.
>  * picked up ack & review tags.
> 
> v6 changes:
>  * floppy: move cmos_get_fd_drive_type.
>  * picked up ack & review tags.
> 
> v7 changes:
>  * rebased to mst/pci branch, resolved stubs conflict.
>  * dropped patches already queued up in mst/pci.
>  * added missing sign-off.
>  * picked up ack & review tags.
> 
> v8 changes:
>  * (re-)add patch to allow acpi table changes
> 
> v9 changes:
>  * add asl changes to commit messages.
>  * update acpi test data.
> 
> take care,
>   Gerd
> 
> Gerd Hoffmann (10):
>   acpi: bios-tables-test: show more context on asl diffs
>   acpi: move aml builder code for floppy device
>   floppy: make isa_fdc_get_drive_max_chs static
>   floppy: move cmos_get_fd_drive_type() from pc
>   acpi: move aml builder code for i8042 (kbd+mouse) device
>   acpi: factor out fw_cfg_add_acpi_dsdt()
>   acpi: simplify build_isa_devices_aml()
>   acpi: drop serial/parallel enable bits from dsdt
>   acpi: drop build_piix4_pm()
>   acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
> 
>  hw/i386/fw_cfg.h  |   1 +
>  include/hw/block/fdc.h|   3 +-
>  include/hw/i386/pc.h  |   1 -
>  hw/block/fdc.c| 111 +++-
>  hw/i386/acpi-build.c  | 210 +-
>  hw/i386/fw_cfg.c  |  28 
>  hw/i386/pc.c  |  25 
>  hw/input/pckbd.c  |  31 +
>  stubs/cmos.c  |   7 +
>  tests/qtest/bios-tables-test.c|   2 +-
>  stubs/Makefile.objs   |   1 +
>  tests/data/acpi/pc/DSDT   | Bin 5014 -> 4934 bytes
>  tests/data/acpi/pc/DSDT.acpihmat  | Bin 6338 -> 6258 bytes
>  tests/data/acpi/pc/DSDT.bridge| Bin 6873 -> 6793 bytes
>  tests/data/acpi/pc/DSDT.cphp  | Bin 5477 -> 5397 bytes
>  tests/data/acpi/pc/DSDT.dimmpxm   | Bin 6667 -> 6587 bytes
>  tests/data/acpi/pc/DSDT.ipmikcs   | Bin 5086 -> 5006 bytes
>  tests/data/acpi/pc/DSDT.memhp | Bin 6373 -> 6293 bytes
>  tests/data/acpi/pc/DSDT.numamem   | Bin 5020 -> 4940 bytes
>  tests/data/acpi/q35/DSDT  | Bin 7752 -> 7678 bytes
>  tests/data/acpi/q35/DSDT.acpihmat | Bin 9076 -> 9002 bytes
>  tests/data/acpi/q35/DSDT.bridge   | Bin 7769 -> 7695 bytes
>  tests/data/acpi/q35/DSDT.cphp | Bin 8215 -> 8141 bytes
>  tests/data/acpi/q35/DSDT.dimmpxm  | Bin 9405 -> 9331 bytes
>  tests/data/acpi/q35/DSDT.ipmibt   | Bin 7827 -> 7753 bytes
>  tests/data/acpi/q35/DSDT.memhp| Bin 9111 -> 9037 bytes
>  tests/data/acpi/q35/DSDT.mmio64   | Bin 8882 -> 8808 bytes
>  tests/data/acpi/q35/DSDT.numamem  | Bin 7758 -> 7684 bytes
>  tests/data/acpi/q35/DSDT.tis  | Bin 8357 -> 8283 bytes
>  29 files changed, 185 insertions(+), 235 deletions(-)
>  create mode 100644 stubs/cmos.c
> 
> -- 
> 2.18.4




Re: [PATCH v9 00/10] acpi: i386 tweaks

2020-06-17 Thread no-reply
Patchew URL: https://patchew.org/QEMU/20200617071138.11159-1-kra...@redhat.com/



Hi,

This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===

  CC  qga/commands-posix.o
  CC  qga/channel-posix.o
  CC  qga/qapi-generated/qga-qapi-types.o
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  CC  qga/qapi-generated/qga-qapi-visit.o
  CC  qga/qapi-generated/qga-qapi-commands.o
  CC  qga/qapi-generated/qga-qapi-init-commands.o
  CC  qemu-img.o
  LINKelf2dmp
  AR  libqemuutil.a
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  AR  libvhost-user.a
  GEN docs/interop/qemu-ga-ref.html
  GEN docs/interop/qemu-ga-ref.txt
  GEN docs/interop/qemu-ga-ref.7
  LINKqemu-ga
  LINKqemu-keymap
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKivshmem-client
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKivshmem-server
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKqemu-nbd
  AS  pc-bios/optionrom/multiboot.o
  AS  pc-bios/optionrom/linuxboot.o
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKqemu-storage-daemon
  CC  pc-bios/optionrom/linuxboot_dma.o
  AS  pc-bios/optionrom/kvmvapic.o
  AS  pc-bios/optionrom/pvh.o
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  CC  pc-bios/optionrom/pvh_main.o
  LINKqemu-img
  BUILD   pc-bios/optionrom/multiboot.img
---
  SIGNpc-bios/optionrom/kvmvapic.bin
  SIGNpc-bios/optionrom/pvh.bin
  SIGNpc-bios/optionrom/linuxboot.bin
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKqemu-edid
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKfsdev/virtfs-proxy-helper
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors.cpp.o)
  LINKscsi/qemu-pr-helper
/usr/bin/ld: 
/usr/lib64/clang/10.0.0/lib/linux/libclang_rt.asan-x86_64.a(asan_interceptors_vfork.S.o):
 warning: common of `__interception::real_vfork' overridden by definition from 

Re: [PATCH v9 00/10] acpi: i386 tweaks

2020-06-17 Thread no-reply
Patchew URL: https://patchew.org/QEMU/20200617071138.11159-1-kra...@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PATCH v9 00/10] acpi: i386 tweaks
Type: series
Message-id: 20200617071138.11159-1-kra...@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]  patchew/20200617071138.11159-1-kra...@redhat.com -> 
patchew/20200617071138.11159-1-kra...@redhat.com
Switched to a new branch 'test'
ecc6ddb acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
32c806e acpi: drop build_piix4_pm()
df8a357 acpi: drop serial/parallel enable bits from dsdt
3f214a1 acpi: simplify build_isa_devices_aml()
c9c4581 acpi: factor out fw_cfg_add_acpi_dsdt()
a387b2c acpi: move aml builder code for i8042 (kbd+mouse) device
2e9418c floppy: move cmos_get_fd_drive_type() from pc
d6c3640 floppy: make isa_fdc_get_drive_max_chs static
a179ece acpi: move aml builder code for floppy device
5255f1d acpi: bios-tables-test: show more context on asl diffs

=== OUTPUT BEGIN ===
1/10 Checking commit 5255f1df2516 (acpi: bios-tables-test: show more context on 
asl diffs)
2/10 Checking commit a179ece64189 (acpi: move aml builder code for floppy 
device)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#245: 
new file mode 100644

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
stubs/cmos.c found

total: 1 errors, 1 warnings, 219 lines checked

Patch 2/10 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

3/10 Checking commit d6c3640cd45c (floppy: make isa_fdc_get_drive_max_chs 
static)
4/10 Checking commit 2e9418c3a0e1 (floppy: move cmos_get_fd_drive_type() from 
pc)
5/10 Checking commit a387b2c65765 (acpi: move aml builder code for i8042 
(kbd+mouse) device)
ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
hw/input/pckbd.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.ipmibt and 
hw/input/pckbd.c found

total: 2 errors, 0 warnings, 100 lines checked

Patch 5/10 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

6/10 Checking commit c9c458106c8b (acpi: factor out fw_cfg_add_acpi_dsdt())
7/10 Checking commit 3f214a1787aa (acpi: simplify build_isa_devices_aml())
8/10 Checking commit df8a357a5fb2 (acpi: drop serial/parallel enable bits from 
dsdt)
ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.acpihmat and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.bridge and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.cphp and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dimmpxm and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.memhp and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.numamem and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.acpihmat and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.bridge a

Re: [PATCH v9 00/10] acpi: i386 tweaks

2020-06-17 Thread no-reply
Patchew URL: https://patchew.org/QEMU/20200617071138.11159-1-kra...@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PATCH v9 00/10] acpi: i386 tweaks
Type: series
Message-id: 20200617071138.11159-1-kra...@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]  
patchew/20200617043757.1623337-1-richard.hender...@linaro.org -> 
patchew/20200617043757.1623337-1-richard.hender...@linaro.org
 * [new tag] patchew/20200617071138.11159-1-kra...@redhat.com -> 
patchew/20200617071138.11159-1-kra...@redhat.com
Switched to a new branch 'test'
95563cf acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
f9a1499 acpi: drop build_piix4_pm()
2f9982f acpi: drop serial/parallel enable bits from dsdt
76f8de5 acpi: simplify build_isa_devices_aml()
9f96ea9 acpi: factor out fw_cfg_add_acpi_dsdt()
5dfc8bd acpi: move aml builder code for i8042 (kbd+mouse) device
23a13c5 floppy: move cmos_get_fd_drive_type() from pc
3b35189 floppy: make isa_fdc_get_drive_max_chs static
cd046a4 acpi: move aml builder code for floppy device
fc9cc42 acpi: bios-tables-test: show more context on asl diffs

=== OUTPUT BEGIN ===
1/10 Checking commit fc9cc42f4d41 (acpi: bios-tables-test: show more context on 
asl diffs)
2/10 Checking commit cd046a45c7eb (acpi: move aml builder code for floppy 
device)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#245: 
new file mode 100644

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
stubs/cmos.c found

total: 1 errors, 1 warnings, 219 lines checked

Patch 2/10 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

3/10 Checking commit 3b3518992288 (floppy: make isa_fdc_get_drive_max_chs 
static)
4/10 Checking commit 23a13c5df0d0 (floppy: move cmos_get_fd_drive_type() from 
pc)
5/10 Checking commit 5dfc8bd9ac77 (acpi: move aml builder code for i8042 
(kbd+mouse) device)
ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
hw/input/pckbd.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.ipmibt and 
hw/input/pckbd.c found

total: 2 errors, 0 warnings, 100 lines checked

Patch 5/10 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

6/10 Checking commit 9f96ea9f1582 (acpi: factor out fw_cfg_add_acpi_dsdt())
7/10 Checking commit 76f8de5f47c1 (acpi: simplify build_isa_devices_aml())
8/10 Checking commit 2f9982f86b2a (acpi: drop serial/parallel enable bits from 
dsdt)
ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.acpihmat and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.bridge and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.cphp and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dimmpxm and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.memhp and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.numamem and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT and 
hw/i386/acpi-build.c found

ERROR: Do not add expected files together with tests, follow instructions in 
tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.acpihmat and 
hw/i386/acpi-build.c fou

[PATCH v9 00/10] acpi: i386 tweaks

2020-06-17 Thread Gerd Hoffmann
First batch of microvm patches, some generic acpi stuff.
Split the acpi-build.c monster, specifically split the
pc and q35 and pci bits into a separate file which we
can skip building at some point in the future.

v2 changes: leave acpi-build.c largely as-is, move useful
bits to other places to allow them being reused, specifically:

 * move isa device generator functions to individual isa devices.
 * move fw_cfg generator function to fw_cfg.c

v3 changes: fix rtc, support multiple lpt devices.

v4 changes:
 * drop merged patches.
 * split rtc crs change to separata patch.
 * added two cleanup patches.
 * picked up ack & review tags.

v5 changes:
 * add comment for rtc crs update.
 * add even more cleanup patches.
 * picked up ack & review tags.

v6 changes:
 * floppy: move cmos_get_fd_drive_type.
 * picked up ack & review tags.

v7 changes:
 * rebased to mst/pci branch, resolved stubs conflict.
 * dropped patches already queued up in mst/pci.
 * added missing sign-off.
 * picked up ack & review tags.

v8 changes:
 * (re-)add patch to allow acpi table changes

v9 changes:
 * add asl changes to commit messages.
 * update acpi test data.

take care,
  Gerd

Gerd Hoffmann (10):
  acpi: bios-tables-test: show more context on asl diffs
  acpi: move aml builder code for floppy device
  floppy: make isa_fdc_get_drive_max_chs static
  floppy: move cmos_get_fd_drive_type() from pc
  acpi: move aml builder code for i8042 (kbd+mouse) device
  acpi: factor out fw_cfg_add_acpi_dsdt()
  acpi: simplify build_isa_devices_aml()
  acpi: drop serial/parallel enable bits from dsdt
  acpi: drop build_piix4_pm()
  acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.

 hw/i386/fw_cfg.h  |   1 +
 include/hw/block/fdc.h|   3 +-
 include/hw/i386/pc.h  |   1 -
 hw/block/fdc.c| 111 +++-
 hw/i386/acpi-build.c  | 210 +-
 hw/i386/fw_cfg.c  |  28 
 hw/i386/pc.c  |  25 
 hw/input/pckbd.c  |  31 +
 stubs/cmos.c  |   7 +
 tests/qtest/bios-tables-test.c|   2 +-
 stubs/Makefile.objs   |   1 +
 tests/data/acpi/pc/DSDT   | Bin 5014 -> 4934 bytes
 tests/data/acpi/pc/DSDT.acpihmat  | Bin 6338 -> 6258 bytes
 tests/data/acpi/pc/DSDT.bridge| Bin 6873 -> 6793 bytes
 tests/data/acpi/pc/DSDT.cphp  | Bin 5477 -> 5397 bytes
 tests/data/acpi/pc/DSDT.dimmpxm   | Bin 6667 -> 6587 bytes
 tests/data/acpi/pc/DSDT.ipmikcs   | Bin 5086 -> 5006 bytes
 tests/data/acpi/pc/DSDT.memhp | Bin 6373 -> 6293 bytes
 tests/data/acpi/pc/DSDT.numamem   | Bin 5020 -> 4940 bytes
 tests/data/acpi/q35/DSDT  | Bin 7752 -> 7678 bytes
 tests/data/acpi/q35/DSDT.acpihmat | Bin 9076 -> 9002 bytes
 tests/data/acpi/q35/DSDT.bridge   | Bin 7769 -> 7695 bytes
 tests/data/acpi/q35/DSDT.cphp | Bin 8215 -> 8141 bytes
 tests/data/acpi/q35/DSDT.dimmpxm  | Bin 9405 -> 9331 bytes
 tests/data/acpi/q35/DSDT.ipmibt   | Bin 7827 -> 7753 bytes
 tests/data/acpi/q35/DSDT.memhp| Bin 9111 -> 9037 bytes
 tests/data/acpi/q35/DSDT.mmio64   | Bin 8882 -> 8808 bytes
 tests/data/acpi/q35/DSDT.numamem  | Bin 7758 -> 7684 bytes
 tests/data/acpi/q35/DSDT.tis  | Bin 8357 -> 8283 bytes
 29 files changed, 185 insertions(+), 235 deletions(-)
 create mode 100644 stubs/cmos.c

-- 
2.18.4