| Message ID | 1457708548-14093-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
DSDT was changed by:
commit 27b9fc54d23acd8f6829e850a027b3b3878cba37 ("i386: populate floppy
drive information in DSDT").
Update expected files accordingly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/acpi-test-data/pc/DSDT | Bin 5538 -> 5587 bytes
tests/acpi-test-data/pc/DSDT.bridge | Bin 7397 -> 7446 bytes
tests/acpi-test-data/q35/DSDT | Bin 8381 -> 8293 bytes
tests/acpi-test-data/q35/DSDT.bridge | Bin 8398 -> 8310 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index 44374e3f576628abe8ad9be8ae8335a24cbc4455..9d1274d3c2e2b7a316d5133d013b0550024ee413 100644
GIT binary patch
delta 150
zcmZ3aeOa5!CD<k8vM2)sqxnWI8%90{R=xOOr}zM8PlM<t=gA?APRs(%@{{K?E);O&
zaC31s;E4C|bm4Klz|Jr^lS$dv(9I{nkt5#GC5V9|-p$2RNI`&si<Qft%Ycz<Jr@&~
nDi8~CNpt<@%HjIP#m~h7QspWr&LzUgfC`ux7&dn@NeTl1Oj{i}
delta 103
zcmcbty-1tOCD<iokthQLqv}R38%91iR=xOOr}zM8PlM<t&&eT-PMjQWF0Ouz0zT4{
zXEH9-^kQ*yaW>$H_waP#alF9JAR-YT9OB4O08*5&fNgRD!xDytEK9ifCwnm|Z{Eu!
GCJX>$02=fF
diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge
index c9a623098308a81b336ebb172f7161db777f9415..cf48c62aa71a7dd7d816fd4ef8ad626e39d4965c 100644
GIT binary patch
delta 150
zcmaEAIn9d8CD<iIOqPLxv3?_$4I`fet6qGtQ+$B4r$Ka+^W+dlCuRX>`N{Jc7YaCX
zxVbnRaKw9fy6`w&U}u<|$)xOS=;jmP$Pw@862!m}@8;quq#(e+#meQ+Wx&X_o{Nb~
m6^Mnnq`Cfc<#2uD;^*Q3sd5z*=MrILKm|+;44XTdVx#~hFdaDn
delta 103
zcmbPc_0*EfCD<k8sSE=HW8OwC8%91iR=xOOr}zM8PlM<t&&eT-PMjQWF0Ouz0zT4{
zXEH9-^kQ*yaW>$H_waP#alF9JAR-YT9OB4O08*5&fNgRD!xDytEK9ifCwnm|Z{Euk
GDFpzfX&dwa
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index a90c52a4c32f8f5a445d47541f885857716ecbe0..a4a3ed09b211bd91fc16cfbc534ed0e1e5ab7261 100644
GIT binary patch
delta 91
zcmdn%_|$>RCD<h-Re^zlF=HdwTSh(ycD?vur}zM8PlM<t=gF*0>Wq?;b(thoqZ@nz
qoL!l?nz)#v8%05E24_cCKSpOKAmI}LBm^A9CzmlT+?>oDB?|ytn-_ur
delta 176
zcmaFru-B2xCD<iouL1)DBj-l0w~Tx~?0WIRPVoWGo(9oP{*zgm)EN~f>oQ3gGBCNh
zIJ+=KH~0iNyE1V#aWO?VN`cr6&W^5rjLuF#!Y2SoxVZoc0UznfSxgH(yjXy`3^?LF
zJY9GkFR(L+NW=$+I5HG~6eTQRo1DO~gkd4e5-xs@c;}#CL1``tcg9c5pO_g~+!?<!
Ue`jW3RB~X@Vqw_K&KxHT09PL?8~^|S
diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
index 6fd2ef308b4f34b70cc00045f81c4b0dfdab538e..4979f1edce45f88b63f91f1c9f07fd78a80cc0fb 100644
GIT binary patch
delta 91
zcmX@-_|1XKCD<jTOo4%ckz*s*TSh(ycD?vur}zM8PlM<t=gF*0>Wq?;b(thoqZ@nz
qoL!l?nz)#v8%05E24_cCKSpOKAmI}LBm^A9CzmlT+?>puEeilqLl<TM
delta 176
zcmez7aL$p-CD<k8oB{&_<I0U(ZyEV~*!ALro#F$WJq@Cp{3o+AsWU1})@70~WMFc0
zadu&fZtw|kc4gvf;$n(!lmf9CoE=^L7@eJfgiipFaB~3?0zT4{vzQioc(DL=8F0jV
zc)IX7USMYsk%$itabzd}DN0ztHaUS|3By8`C0zU*@y<cPg3??P?u?(9KQS|~xHEod
U{?5$6sN}$)#lo<eojG3?0N&Ot00000
commit c82f503dd5c3f0a01a9e63741f1f875652669867
("hw/acpi: fix Q35 support for legacy Windows OS")
added _DIS for all link devices.
Update expected test files accordingly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/acpi-test-data/q35/DSDT | Bin 8293 -> 8349 bytes
tests/acpi-test-data/q35/DSDT.bridge | Bin 8310 -> 8366 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index a4a3ed09b211bd91fc16cfbc534ed0e1e5ab7261..cb720f4fb6bdd02a14b089a0fa4da342ec918fee 100644
GIT binary patch
delta 220
zcmaFrFxQdGCD<iot^xxCqsd0DN6buZk(=K!s|mCDu($_%I!;a$mz!)MF3acQ8O$KU
z79SiG%oyF|GdV`wK^RpCq}&;-{Ft~b7C9HN9Iph1QHB!OjB*1jpN*+}KUU=)VC9;U
OvdlnNZFZ7WW(NQ?Kshx4
delta 158
zcmbR1_|$>RCD<h-Re^zlF=HdwBW9+)(9Q3d)r8qxS=@s?9Vai4keh5FF3S@f6wDai
z1Qv7x3$}^NvO@(YZxnZcv;QNpeI*d$vn3pm4RHq>!Xt@dvIkf&N>X-nouoWF0D>1T
A9RL6T
diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
index 4979f1edce45f88b63f91f1c9f07fd78a80cc0fb..dd4c28525e7d04bc3025eb62a1fd791bb4a6af64 100644
GIT binary patch
delta 220
zcmez7u+EXoCD<ioodN>`<CTqEkC>U-A~(NdRug9PVQ~-kbex<hE;rdiT$azpGnhey
zEj~CXm@&G^XL5|VgD|QPNVzju`7v=>EOIVjIbI12qYNdm8RZ66J{wc{eyqwpz{)ix
OWtoAl+Uz80!VUo7J31Kv
delta 158
zcmZ4I_|1XKCD<jTOo4%ckz*s*BW9+)(9Q3d)r8qxS=@s?9Vai4keh5FF3S@f6wDai
z1Qv7x3$}^NvO@(YZxnZcv;QNpeI*d$vn3pm4RHq>!Xt@dvIkf&N>X-noumOf0BZOy
A0RR91
On 11 March 2016 at 15:07, Michael S. Tsirkin <mst@redhat.com> wrote: > AFAIK the two large patchsets still outstanding (posted before soft > freeze) that I have a hand in are AMD IOMMU support and VFIO AER. > That might still make it in the next pull request. > > The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e: > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to 088548f44f4f811606f3b99f418dab019a2e4e3e: > > fw-cfg: support writeable blobs (2016-03-11 16:59:13 +0200) > > ---------------------------------------------------------------- > vhost, virtio, pci, pc, acpi > > nvdimm work > sparse cpu id rework > ipmi enhancements > fixes all over the place > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> w32 build failure :-( /home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:1357:0: error: "min" redefined [-Werror] #define min(x, y) ((x) < (y) ? (x) : (y)) ^ In file included from /usr/share/mingw-w64/include/windef.h:8:0, from /usr/share/mingw-w64/include/windows.h:69, from /usr/share/mingw-w64/include/winsock2.h:23, from /home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29, from /home/petmay01/linaro/qemu-for-merges/include/qemu/osdep.h:93, from /home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:25: /usr/share/mingw-w64/include/minwindef.h:160:0: note: this is the location of the previous definition #define min(a, b) (((a) < (b)) ? (a) : (b)) ^ /home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:1358:0: error: "max" redefined [-Werror] #define max(x, y) ((x) > (y) ? (x) : (y)) ^ In file included from /usr/share/mingw-w64/include/windef.h:8:0, from /usr/share/mingw-w64/include/windows.h:69, from /usr/share/mingw-w64/include/winsock2.h:23, from /home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29, from /home/petmay01/linaro/qemu-for-merges/include/qemu/osdep.h:93, from /home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:25: /usr/share/mingw-w64/include/minwindef.h:156:0: note: this is the location of the previous definition #define max(a, b) (((a) > (b)) ? (a) : (b)) ^ cc1: all warnings being treated as errors Better to dump the local definitions and just use osdep.h's MIN and MAX macros. thanks -- PMM
AFAIK the two large patchsets still outstanding (posted before soft freeze) that I have a hand in are AMD IOMMU support and VFIO AER. That might still make it in the next pull request. The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into staging (2016-03-10 02:51:14 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to 088548f44f4f811606f3b99f418dab019a2e4e3e: fw-cfg: support writeable blobs (2016-03-11 16:59:13 +0200) ---------------------------------------------------------------- vhost, virtio, pci, pc, acpi nvdimm work sparse cpu id rework ipmi enhancements fixes all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Cao jin (2): ich9lpc: fix typo pxb: cleanup Cédric Le Goater (10): ipmi: remove IPMI_CHECK_CMD_LEN() macro ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers ipmi: remove IPMI_CHECK_RESERVATION() macro ipmi: add rsp_buffer_set_error() helper ipmi: add a realize function to the device class ipmi: use a function to initialize the SDR table ipmi: remove the need of an ending record in the SDR table ipmi: add some local variables in ipmi_sdr_init ipmi: use a file to load SDRs ipmi: provide support for FRUs Denis V. Lunev (1): virtio-balloon: add 'available' counter Gerd Hoffmann (2): virtio-pci: call pci reset variant when guest requests reset. pci-ids: add virtio 1.0 ids to spec Igor Mammedov (10): pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() pc: acpi: remove NOP assignment pc: init pcms->apic_id_limit once and use it throughout pc.c machine: introduce MachineClass.possible_cpu_arch_ids() hook pc: acpi: cleanup qdev_get_machine() calls pc: acpi: SRAT: create only valid processor lapic entries pc: acpi: create MADT.lapic entries only for valid lapics pc: acpi: create Processor and Notify objects only for valid lapics pc: acpi: drop cpu->found_cpus bitmap pc: acpi: clarify why possible LAPIC entries must be present in MADT Ilya Maximets (1): vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Ladi Prosek (1): balloon: fix segfault and harden the stats queue Marc-André Lureau (5): vhost-user: fix use after free vhost-user: remove useless is_server field qemu-char: avoid potential double-free qemu-char: remove all msgfds on disconnect qemu-char: make tcp_chr_disconnect() reentrant-safe Marcel Apfelbaum (3): hw/virtio: fix double use of a virtio flag hw/virtio: group virtio flags into an enum hw/acpi: fix Q35 support for legacy Windows OS Michael S. Tsirkin (6): acpi: add build_append_named_dword, returning an offset in buffer i386: update expected DSDT msi_supported -> msi_nonbroken acpi-test-data: add _DIS methods MAINTAINERS: machine core fw-cfg: support writeable blobs Roman Kagan (4): i386/acpi: make floppy controller object dynamic i386: expose floppy drive CMOS type fdc: add function to determine drive chs limits i386: populate floppy drive information in DSDT Thomas Huth (1): MAINTAINERS: Add an entry for virtio header files Xiao Guangrong (7): acpi: add aml_create_field() acpi: add aml_concatenate() acpi: allow using object as offset for OperationRegion nvdimm acpi: initialize the resource used by NVDIMM ACPI nvdimm acpi: introduce patched dsm memory nvdimm acpi: let qemu handle _DSM method nvdimm acpi: emulate dsm method hw/lm32/lm32_hwsetup.h | 2 +- hw/virtio/virtio-pci.h | 17 +- include/hw/acpi/aml-build.h | 8 +- include/hw/block/fdc.h | 2 + include/hw/boards.h | 26 + include/hw/i386/ich9.h | 4 +- include/hw/i386/pc.h | 6 +- include/hw/loader.h | 4 +- include/hw/mem/nvdimm.h | 32 +- include/hw/nvram/fw_cfg.h | 3 +- include/hw/pci/msi.h | 2 +- include/standard-headers/linux/virtio_balloon.h | 3 +- hw/acpi/aml-build.c | 53 +- hw/acpi/nvdimm.c | 231 ++++++- hw/arm/virt-acpi-build.c | 2 +- hw/block/fdc.c | 23 + hw/core/loader.c | 19 +- hw/i386/acpi-build.c | 285 ++++---- hw/i386/kvm/apic.c | 2 +- hw/i386/pc.c | 97 ++- hw/i386/pc_piix.c | 5 + hw/i386/pc_q35.c | 8 +- hw/i386/xen/xen_apic.c | 2 +- hw/intc/apic.c | 2 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/openpic.c | 2 +- hw/intc/openpic_kvm.c | 2 +- hw/ipmi/ipmi_bmc_sim.c | 879 ++++++++++++++---------- hw/isa/lpc_ich9.c | 35 +- hw/mem/pc-dimm.c | 13 +- hw/nvram/fw_cfg.c | 36 +- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/pci/msi.c | 19 +- hw/pci/msix.c | 2 +- hw/ppc/spapr.c | 4 +- hw/ppc/spapr_pci.c | 2 +- hw/s390x/s390-pci-bus.c | 2 +- hw/virtio/virtio-balloon.c | 25 +- hw/virtio/virtio-pci.c | 11 +- net/vhost-user.c | 14 +- qemu-char.c | 6 + MAINTAINERS | 7 + docs/pci_expander_bridge.txt | 6 +- docs/specs/pci-ids.txt | 24 +- hw/acpi/Makefile.objs | 2 +- qemu-options.hx | 15 +- tests/acpi-test-data/pc/DSDT | Bin 5538 -> 5587 bytes tests/acpi-test-data/pc/DSDT.bridge | Bin 7397 -> 7446 bytes tests/acpi-test-data/q35/DSDT | Bin 8381 -> 8349 bytes tests/acpi-test-data/q35/DSDT.bridge | Bin 8398 -> 8366 bytes 51 files changed, 1319 insertions(+), 631 deletions(-)