| Message ID | 1424295164-4774-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Feb 18, 2015 at 10:43:58PM +0100, Michael S. Tsirkin wrote: > A huge patchset, but the scariest part is Igor's patches, > and these have been used by multiple people by now. > virtio header change is a bit rushed, but getting them upstream > seems like the best way to give them the cross-platform > testing that they need, and this takes us a step closer to > virtio-1.0 support. Ugh. Missed aarch64 failures this triggers :( Pls ignore for now, sorry about the noise. > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > ---------------------------------------------------------------- > pci, pc, virtio fixes and cleanups > > Last large pull for soft freeze. > > A bunch of fixes all over the place. > Most of ACPI refactoring has been merged. > > virtio header cleanup has been merged, > now that windows has been build-tested with it. > > initial patches from virtio-1.0 branch have been merged. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- > Cornelia Huck (3): > virtio: cull virtio_bus_set_vdev_features > virtio: feature bit manipulation helpers > virtio: add feature checking helpers > > Igor Mammedov (43): > acpi: move generic aml building helpers into dedictated file > acpi: add build_append_namestring() helper > acpi: drop min-bytes in build_package() > pc: acpi-build: update linker on guest access > pc: acpi-build: migrate RSDP table > pc: acpi: use local var for accessing ACPI tables blob in acpi_build() > acpi: introduce AML composer aml_append() > acpi: add aml_scope() term > pc: acpi-build: use aml_scope() for \_SB scope > acpi: add aml_device() term > acpi: add aml_method() term > acpi: add aml_if() term > acpi: add aml_name() & aml_name_decl() term > acpi: add aml_int() term > acpi: add aml_return() term > acpi: add aml_arg() term > acpi: add aml_store() term > acpi: add aml_and() term > acpi: add aml_notify() term > acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers > acpi: add aml_package() term > pc: acpi-build: generate _S[345] packages dynamically > acpi: add aml_buffer() term > acpi: add aml_resource_template() helper > acpi: add aml_io() helper > acpi: include PkgLength size only when requested > acpi: add aml_operation_region() term > acpi: add aml_field() & aml_named_field() terms > acpi: add aml_local() term > acpi: add aml_string() term > pc: acpi-build: generate pvpanic device description dynamically > acpi: add aml_varpackage() term > acpi: add aml_equal() term > acpi: add aml_processor() term > acpi: add aml_eisaid() term > pc: acpi-build: drop template patching and CPU hotplug objects dynamically > pc: acpi-build: create CPU hotplug IO region dynamically > acpi: add aml_reserved_field() term > pc: acpi-build: drop template patching and memory hotplug objects dynamically > pc: acpi-build: create memory hotplug IO region dynamically > acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms > pc: pcihp: expose MMIO base and len as properties > pc: acpi-build: reserve PCIHP MMIO resources > > Markus Armbruster (11): > pci: Convert core to realize > pci: Permit incremental conversion of device models to realize > pci: Trivial device model conversions to realize > pcnet: pcnet_common_init() always returns 0, change to void > pcnet: Convert to realize > serial-pci: Convert to realize > ide/ich: Convert to realize > cirrus-vga: Convert to realize > qxl: Convert to realize > pci-assign: Convert to realize > qdev: Don't exit when running into bad -global > > Michael S. Tsirkin (32): > acpi-build: fix memory leak with bridge hp off > bios linker: validate pointer within table > acpi: update RSDP on guest access > exec: round up size on MR resize > acpi-build: fix ACPI RAM management > acpi: has_immutable_rsdp->!rsdp_in_ram > acpi-build: simplify rsdp management for legacy > scripts/update-linux-headers.sh: pull virtio hdrs > include: import virtio headers from linux 4.0 > virtio: use standard virtio_ring.h > virtio: use standard-headers > virtio-balloon: use standard headers > virtio-9p: use standard headers > virtio-blk: switch to standard-headers > virtio-net,tap: use standard-headers > virtio-rng: use standard-headers > virtio-scsi: use standard-headers > virtio-serial: switch to standard-headers > update-linux-headers: use standard-headers > linux-headers: use standard-headers > virtio-pci: use standard headers > scripts: add arch specific standard-headers > standard-headers: add s390 virtio headers > s390: use standard headers > acpi-build: skip hotplugged bridges > update-linux-headers.sh: s/__inline__/inline/ > virtio-serial-bus.c: drop virtio_ids.h > standard-headers: include stdint.h > virtio_ring.h: s/__inline__/inline/ > acpi: update generated hex files > acpi: drop unused generated files > acpi-test: update expected files > > Peter Krempa (2): > vl.c: Fix error messages when parsing maxmem parameters > pc: memory: Validate alignment of maxram_size to page size > > Tang Chen (5): > acpi, pc: Add hotunplug request cb for pc machine. > acpi, ich9: Add hotunplug request cb for ich9. > acpi, pc: Add unplug cb for pc machine. > acpi, ich9: Add unplug cb for ich9. > acpi, piix4: Add unplug cb for piix4. > > hw/9pfs/virtio-9p.h | 18 +- > hw/net/pcnet.h | 2 +- > hw/s390x/s390-virtio-bus.h | 36 +- > hw/s390x/s390-virtio.h | 7 +- > include/hw/acpi/aml-build.h | 206 +++++ > include/hw/acpi/ich9.h | 4 + > include/hw/acpi/pc-hotplug.h | 1 + > include/hw/acpi/pcihp.h | 7 +- > include/hw/i386/pc.h | 1 + > include/hw/pci/pci.h | 3 +- > include/hw/qdev-properties.h | 4 +- > include/hw/virtio/dataplane/vring.h | 2 +- > include/hw/virtio/virtio-balloon.h | 35 +- > include/hw/virtio/virtio-blk.h | 77 +- > include/hw/virtio/virtio-bus.h | 3 - > include/hw/virtio/virtio-net.h | 151 +--- > include/hw/virtio/virtio-rng.h | 4 +- > include/hw/virtio/virtio-scsi.h | 120 +-- > include/hw/virtio/virtio-serial.h | 40 +- > include/hw/virtio/virtio.h | 71 +- > include/net/tap.h | 24 +- > include/standard-headers/asm-s390/kvm_virtio.h | 64 ++ > include/standard-headers/asm-s390/virtio-ccw.h | 21 + > include/standard-headers/linux/if_ether.h | 1 + > include/standard-headers/linux/types.h | 2 + > include/standard-headers/linux/virtio_9p.h | 44 ++ > include/standard-headers/linux/virtio_balloon.h | 59 ++ > include/standard-headers/linux/virtio_blk.h | 143 ++++ > include/standard-headers/linux/virtio_config.h | 64 ++ > include/standard-headers/linux/virtio_console.h | 78 ++ > include/standard-headers/linux/virtio_ids.h | 43 + > include/standard-headers/linux/virtio_net.h | 233 ++++++ > include/standard-headers/linux/virtio_pci.h | 193 +++++ > .../linux}/virtio_ring.h | 132 ++-- > include/standard-headers/linux/virtio_rng.h | 8 + > include/standard-headers/linux/virtio_scsi.h | 164 ++++ > include/standard-headers/linux/virtio_types.h | 46 ++ > linux-headers/linux/virtio_config.h | 58 +- > linux-headers/linux/virtio_ring.h | 164 +--- > exec.c | 2 + > hw/9pfs/virtio-9p-device.c | 2 +- > hw/acpi/aml-build.c | 867 +++++++++++++++++++++ > hw/acpi/bios-linker-loader.c | 4 +- > hw/acpi/ich9.c | 14 + > hw/acpi/pcihp.c | 18 +- > hw/acpi/piix4.c | 15 +- > hw/audio/ac97.c | 5 +- > hw/audio/es1370.c | 5 +- > hw/audio/intel-hda.c | 6 +- > hw/block/virtio-blk.c | 31 +- > hw/char/serial-pci.c | 22 +- > hw/char/virtio-serial-bus.c | 4 +- > hw/core/qdev-properties.c | 21 +- > hw/core/qdev.c | 8 +- > hw/display/cirrus_vga.c | 11 +- > hw/display/qxl.c | 36 +- > hw/display/vga-pci.c | 11 +- > hw/display/vmware_vga.c | 6 +- > hw/i2c/smbus_ich9.c | 5 +- > hw/i386/acpi-build.c | 750 +++++++++--------- > hw/i386/kvm/pci-assign.c | 10 +- > hw/i386/pc.c | 23 + > hw/i386/pc_piix.c | 3 + > hw/i386/pc_q35.c | 3 + > hw/ide/cmd646.c | 5 +- > hw/ide/ich.c | 13 +- > hw/ide/piix.c | 10 +- > hw/ide/via.c | 6 +- > hw/ipack/tpci200.c | 6 +- > hw/isa/i82378.c | 6 +- > hw/isa/lpc_ich9.c | 14 +- > hw/isa/piix4.c | 5 +- > hw/isa/vt82c686.c | 24 +- > hw/misc/pci-testdev.c | 6 +- > hw/net/e1000.c | 6 +- > hw/net/eepro100.c | 6 +- > hw/net/lance.c | 3 +- > hw/net/ne2000.c | 6 +- > hw/net/pcnet-pci.c | 6 +- > hw/net/pcnet.c | 4 +- > hw/net/rtl8139.c | 6 +- > hw/net/vhost_net.c | 2 +- > hw/net/virtio-net.c | 57 +- > hw/net/vmxnet3.c | 6 +- > hw/pci-bridge/dec.c | 5 +- > hw/pci-host/apb.c | 5 +- > hw/pci-host/bonito.c | 6 +- > hw/pci-host/grackle.c | 5 +- > hw/pci-host/piix.c | 12 +- > hw/pci-host/ppce500.c | 6 +- > hw/pci-host/prep.c | 6 +- > hw/pci-host/q35.c | 5 +- > hw/pci-host/uninorth.c | 20 +- > hw/pci-host/versatile.c | 5 +- > hw/pci/pci.c | 113 +-- > hw/s390x/virtio-ccw.c | 7 +- > hw/scsi/virtio-scsi.c | 9 +- > hw/sd/sdhci.c | 5 +- > hw/usb/hcd-ehci-pci.c | 6 +- > hw/usb/hcd-xhci.c | 6 +- > hw/virtio/dataplane/vring.c | 10 +- > hw/virtio/virtio-balloon.c | 2 +- > hw/virtio/virtio-bus.c | 14 - > hw/virtio/virtio-mmio.c | 2 +- > hw/virtio/virtio-pci.c | 58 +- > hw/virtio/virtio.c | 33 +- > hw/watchdog/wdt_i6300esb.c | 6 +- > vl.c | 34 +- > hw/acpi/Makefile.objs | 1 + > hw/i386/Makefile.objs | 6 +- > hw/i386/acpi-dsdt-cpu-hotplug.dsl | 17 +- > hw/i386/acpi-dsdt-mem-hotplug.dsl | 36 +- > hw/i386/acpi-dsdt.hex.generated | 224 +----- > hw/i386/q35-acpi-dsdt.hex.generated | 224 +----- > hw/i386/ssdt-mem.dsl | 77 -- > hw/i386/ssdt-mem.hex.generated | 213 ----- > hw/i386/ssdt-misc.dsl | 82 -- > hw/i386/ssdt-misc.hex.generated | 274 +------ > hw/i386/ssdt-proc.dsl | 63 -- > hw/i386/ssdt-proc.hex.generated | 134 ---- > scripts/update-linux-headers.sh | 52 +- > tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3415 bytes > tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2374 bytes > tests/acpi-test-data/q35/DSDT | Bin 8211 -> 8005 bytes > tests/acpi-test-data/q35/SSDT | Bin 560 -> 578 bytes > 125 files changed, 3236 insertions(+), 2959 deletions(-) > create mode 100644 include/hw/acpi/aml-build.h > create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h > create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h > create mode 100644 include/standard-headers/linux/if_ether.h > create mode 100644 include/standard-headers/linux/types.h > create mode 100644 include/standard-headers/linux/virtio_9p.h > create mode 100644 include/standard-headers/linux/virtio_balloon.h > create mode 100644 include/standard-headers/linux/virtio_blk.h > create mode 100644 include/standard-headers/linux/virtio_config.h > create mode 100644 include/standard-headers/linux/virtio_console.h > create mode 100644 include/standard-headers/linux/virtio_ids.h > create mode 100644 include/standard-headers/linux/virtio_net.h > create mode 100644 include/standard-headers/linux/virtio_pci.h > rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%) > create mode 100644 include/standard-headers/linux/virtio_rng.h > create mode 100644 include/standard-headers/linux/virtio_scsi.h > create mode 100644 include/standard-headers/linux/virtio_types.h > create mode 100644 hw/acpi/aml-build.c > delete mode 100644 hw/i386/ssdt-mem.dsl > delete mode 100644 hw/i386/ssdt-mem.hex.generated > delete mode 100644 hw/i386/ssdt-proc.dsl > delete mode 100644 hw/i386/ssdt-proc.hex.generated >
A bunch of code moved from dsdt to ssdt,
plus we got trivial changes like 0->Zero which our test
dosn't recognize as identity yet.
Update expected files to suppress test warning.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3415 bytes
tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2374 bytes
tests/acpi-test-data/q35/DSDT | Bin 8211 -> 8005 bytes
tests/acpi-test-data/q35/SSDT | Bin 560 -> 578 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 010d74603f09430d65fae1ce2a0d867c1964a1a8..ad12cb35d9dafc4d50002873f5c4ca04552b36df 100644
GIT binary patch
delta 84
zcmZ1~b6twdCD<h-oR@)tv1}t3D<_jL&tyT)gvs5U*#ZJCT6*!pPVoWGo(9oP?wXVR
oxD2I5gyVxl92pjHPWE;23u0Kpu!M^{n$g$C*_&ZA8@D_&0EjXa$^ZZW
delta 292
zcmcaEwN!@7CD<iIm5+geanD9BR!$~=p~-@r2~yDw0YSkbjNA<CxfG%sdB7YX5$_-{
zxsWqEBD%?qB_PN(m?Pf9(}l<J0v8)ce5j`juX8}CLPmZ`K~8D9LQ!gQerZv1YB2*x
zymL^nATJk}J0rt-AXKOX3I&Haa&Zed80y6bJH-b$dm2PHIU7uV!)aI_-QW@68w9kQ
zi%SAoD;EP7gG42Rh%iVm!vfC9zAk=23`-c6aB)XB%7gSU`vy7rC;$l$AmIaI`2bk~
z5%EAj2!jn}aNzQF4UT8@_4Es7jAr!parS12ZWM)R4t51<@#k<21Cqhc3Y#ss<e354
C3Q0@=
diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index 558e4c85b031ec081045aec6cc382a680e9c6009..d0103368a0b9e3d5410372f1f589df4eeeebaf03 100644
GIT binary patch
delta 452
zcma)&&r1S96vyAF*)}SuZ6I`LPo2URf=(S=XV-SsS*M*fj1}e(l0jf-9z6M@=q~*O
z9Xjiw|DkjLMD%Yovl3mK!{dFJHy^%lz6&2k%()%bb^y@X67Qqx^6;XQcelD_!K;E1
z&x{uJ6mwai3D>i8%x9)$o`NRYiil^pgNOUO@r^O;jRxc4b#El^cxd5_CP=^wIgHN{
ztYC%o$#QlyZ9FM)v}mNt%FY6Z$L6f{iPIY^VeS7}*RV#$1fm%Wc!)Bv#zr*H#vqHR
z<fF$E!b}t5qh|%RrXjo$MlFyeQ!3yg=sDrkO(emoLtiiYVeKmMntAC1JS)MiMp(-)
zCK1XLt$UpO{Tu2sTcfrg$esU|#ekutV!4b4G8V?AXnvp|NgF}6Y0#kR%F<L_Q+BK)
oWboa194eSPTp;TC97XfJ%`@)E*_LxD3nzx2rYhk37fNjZ0GfqxXaE2J
delta 357
zcmXX>yH3L}6uk}wjMFx>%7DbqgoK$GSV-*vu1Inlo0o#*jAiSFm|8$$fT`*a6e)ke
zKd|x{{SD%V?L4l|J?E#t>M^aQSy2GeowI#%H9r{b&_t$r8vy3Nhtsq6!_kJ-1B*g&
zr6XIsCJf^nL+z!Kol%@zbIy-}Vyul1P|PsSa^e^%Ui^Q8hK74qn+PV(DVJM|5-Rv=
zRV)a*xkTd(G-XwW?b{p;nT#E$Q!8@a>o9gf>Ow%sGkiLUc`8fN2DWN=SI4VVHSx|`
z|8d6d#}l~z#oJ(0Am=UyfGTM%gJwh|P}L(&APj608K?v%kvj;3({<@u(54Y=Jmf@R
hJalv%_EU3y?=Ahsn8CY?f20Dlv@h$b-_rB8{{RBhShxTH
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index 8ac32efc0316daeed23e9002aa8bb05fb0fe483f..de430e2a68e203518384b1db75baaefc02f2aa33 100644
GIT binary patch
delta 67
zcmbR2aMX^=CD<jzRi1%?an(jHHEAYap2<ei36s}IXA20pXz9fVJH-b$dm2PHxob|&
Xmoc2YUq+OT(bvb>n_;uM>>DNkc;^zx
delta 292
zcmX?VH`#&9CD<iISb>3oF>oW7nlzKY&}1X&1gYqTfS}+IM(!ItTnf>RJYWuxh<6Z}
zJV`n`BD%?qB_PN(m?Pf9(}l<J0v8)ce5j`juX8}CLPmZ`K~8D9LQ!gQerZv1YB2*x
zymL^nATJk}JL3(W8$1jOl|Z535JxU<0S809_+Y2_0B28w=q6`_$-FX#_0bI;0lq<u
z+zeb?5=dGZxPVZil0ifmq?cg<=VV_OzaWMs3`@AUqZ{QxdYFBKoO~33ga?rD0kM35
ztbmAkpdW<6hB7#C`ML(jGx~b^1v5r7`uaF~GekFvLNo`v0=4*axP}4AU}uHRkuq<X
E05`u%Z~y=R
diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index 2cb3e08bd4dcd2998ce5f87641ade4b6ce64c695..f86643da45ad89a97a652233cb090516afde7b31 100644
GIT binary patch
delta 375
zcmX|+!Aiq07{|YCV}vw=IV(&&*pnAw7JPxVX|>&!E;gMg9poUx3BqJ^2T!vK-p5|R
zgLw8Cd;*Vq0pG)9q6z%@e&PE*e)*_;R)~~A=9d7_`;zP-e|d05>(;QPq^|^v-DPpO
z2zCwSPu)t(Jc%@vSVeI_y)RP5Y7hrCCI(J4xxc%eUpv#$Y%-r-jb?zA%sgUY#ZtLd
zBjgmV>6#+v0rE$Y$_!a+N}Rl)8_=QJ_5Asm3D<?qv8m$TB7-+3xCff_J_9lXyQad9
zi!_8C7~72`JGm^qTB|X@i&=1kndm2tGD3BRhezeV5AjF@m<LI!?f$iZ=-V_}k>Dw^
zfRJWh>>DWaZtC|Op8AoFo~e4e5*JE~Z*SV6O?W63;&CETUhMpi$x!$9!*d;yId+vB
J!PPhF{s5KbTzCKg
delta 357
zcmXX>J5Iwu5S<MMt=0~K$ORHT4FyX@L4&h4umRf>@A8w8)@A6@QU$O?Llxx$LGl4O
z13l-V#S=5t`;6Ya`S!j%VN7gg4}kqF#6G)T983gH<E#jvoke{(KMNj@Hk=tbR9b2i
zx$-R)nA}?KE_K|WB<YQm@)$TK#`*x|3nqENh_Uk3|0ig9xaW+GU`9^0+FDl7z^B)U
zLAYJSXvsiZHB}hg6=>OPN}SJ~D$H(QhzmxI7<+~fl0;AEY1Tonh4*c|&U6<~*7^<^
zJ9PlmzpO`_3Z<kN0Ip-_1awbC3U&L$34{ZeMiv@{X+#U*;B;NO6^!i!my9J-n2d=|
d!(nF6A9^c)ITi3u@lRY~o(<!+>hhOe{Q;yqSb6{e
On Wed, Feb 18, 2015 at 10:48:22PM +0100, Michael S. Tsirkin wrote: > On Wed, Feb 18, 2015 at 10:43:58PM +0100, Michael S. Tsirkin wrote: > > A huge patchset, but the scariest part is Igor's patches, > > and these have been used by multiple people by now. > > virtio header change is a bit rushed, but getting them upstream > > seems like the best way to give them the cross-platform > > testing that they need, and this takes us a step closer to > > virtio-1.0 support. > > Ugh. > Missed aarch64 failures this triggers :( > Pls ignore for now, sorry about the noise. OK, I think it's a false alarm - passes fine on all other machines, and on this one, current master gives the same error: GTESTER check-qtest-aarch64 qemu-system-aarch64: Unknown device 'gpex-pcihost' for default sysbus Broken pipe GTester: last random seed: R02Sf2b7ee633e245f2aa40572f893be1567 Peter, you'll run make check anyway - can you pls try merging, and running make check - if it passes for you too, then I think this pull is fine, and I'll figure out what's wrong with this box some other day. Pls let me know. Thanks! > > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > > > ---------------------------------------------------------------- > > pci, pc, virtio fixes and cleanups > > > > Last large pull for soft freeze. > > > > A bunch of fixes all over the place. > > Most of ACPI refactoring has been merged. > > > > virtio header cleanup has been merged, > > now that windows has been build-tested with it. > > > > initial patches from virtio-1.0 branch have been merged. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > ---------------------------------------------------------------- > > Cornelia Huck (3): > > virtio: cull virtio_bus_set_vdev_features > > virtio: feature bit manipulation helpers > > virtio: add feature checking helpers > > > > Igor Mammedov (43): > > acpi: move generic aml building helpers into dedictated file > > acpi: add build_append_namestring() helper > > acpi: drop min-bytes in build_package() > > pc: acpi-build: update linker on guest access > > pc: acpi-build: migrate RSDP table > > pc: acpi: use local var for accessing ACPI tables blob in acpi_build() > > acpi: introduce AML composer aml_append() > > acpi: add aml_scope() term > > pc: acpi-build: use aml_scope() for \_SB scope > > acpi: add aml_device() term > > acpi: add aml_method() term > > acpi: add aml_if() term > > acpi: add aml_name() & aml_name_decl() term > > acpi: add aml_int() term > > acpi: add aml_return() term > > acpi: add aml_arg() term > > acpi: add aml_store() term > > acpi: add aml_and() term > > acpi: add aml_notify() term > > acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers > > acpi: add aml_package() term > > pc: acpi-build: generate _S[345] packages dynamically > > acpi: add aml_buffer() term > > acpi: add aml_resource_template() helper > > acpi: add aml_io() helper > > acpi: include PkgLength size only when requested > > acpi: add aml_operation_region() term > > acpi: add aml_field() & aml_named_field() terms > > acpi: add aml_local() term > > acpi: add aml_string() term > > pc: acpi-build: generate pvpanic device description dynamically > > acpi: add aml_varpackage() term > > acpi: add aml_equal() term > > acpi: add aml_processor() term > > acpi: add aml_eisaid() term > > pc: acpi-build: drop template patching and CPU hotplug objects dynamically > > pc: acpi-build: create CPU hotplug IO region dynamically > > acpi: add aml_reserved_field() term > > pc: acpi-build: drop template patching and memory hotplug objects dynamically > > pc: acpi-build: create memory hotplug IO region dynamically > > acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms > > pc: pcihp: expose MMIO base and len as properties > > pc: acpi-build: reserve PCIHP MMIO resources > > > > Markus Armbruster (11): > > pci: Convert core to realize > > pci: Permit incremental conversion of device models to realize > > pci: Trivial device model conversions to realize > > pcnet: pcnet_common_init() always returns 0, change to void > > pcnet: Convert to realize > > serial-pci: Convert to realize > > ide/ich: Convert to realize > > cirrus-vga: Convert to realize > > qxl: Convert to realize > > pci-assign: Convert to realize > > qdev: Don't exit when running into bad -global > > > > Michael S. Tsirkin (32): > > acpi-build: fix memory leak with bridge hp off > > bios linker: validate pointer within table > > acpi: update RSDP on guest access > > exec: round up size on MR resize > > acpi-build: fix ACPI RAM management > > acpi: has_immutable_rsdp->!rsdp_in_ram > > acpi-build: simplify rsdp management for legacy > > scripts/update-linux-headers.sh: pull virtio hdrs > > include: import virtio headers from linux 4.0 > > virtio: use standard virtio_ring.h > > virtio: use standard-headers > > virtio-balloon: use standard headers > > virtio-9p: use standard headers > > virtio-blk: switch to standard-headers > > virtio-net,tap: use standard-headers > > virtio-rng: use standard-headers > > virtio-scsi: use standard-headers > > virtio-serial: switch to standard-headers > > update-linux-headers: use standard-headers > > linux-headers: use standard-headers > > virtio-pci: use standard headers > > scripts: add arch specific standard-headers > > standard-headers: add s390 virtio headers > > s390: use standard headers > > acpi-build: skip hotplugged bridges > > update-linux-headers.sh: s/__inline__/inline/ > > virtio-serial-bus.c: drop virtio_ids.h > > standard-headers: include stdint.h > > virtio_ring.h: s/__inline__/inline/ > > acpi: update generated hex files > > acpi: drop unused generated files > > acpi-test: update expected files > > > > Peter Krempa (2): > > vl.c: Fix error messages when parsing maxmem parameters > > pc: memory: Validate alignment of maxram_size to page size > > > > Tang Chen (5): > > acpi, pc: Add hotunplug request cb for pc machine. > > acpi, ich9: Add hotunplug request cb for ich9. > > acpi, pc: Add unplug cb for pc machine. > > acpi, ich9: Add unplug cb for ich9. > > acpi, piix4: Add unplug cb for piix4. > > > > hw/9pfs/virtio-9p.h | 18 +- > > hw/net/pcnet.h | 2 +- > > hw/s390x/s390-virtio-bus.h | 36 +- > > hw/s390x/s390-virtio.h | 7 +- > > include/hw/acpi/aml-build.h | 206 +++++ > > include/hw/acpi/ich9.h | 4 + > > include/hw/acpi/pc-hotplug.h | 1 + > > include/hw/acpi/pcihp.h | 7 +- > > include/hw/i386/pc.h | 1 + > > include/hw/pci/pci.h | 3 +- > > include/hw/qdev-properties.h | 4 +- > > include/hw/virtio/dataplane/vring.h | 2 +- > > include/hw/virtio/virtio-balloon.h | 35 +- > > include/hw/virtio/virtio-blk.h | 77 +- > > include/hw/virtio/virtio-bus.h | 3 - > > include/hw/virtio/virtio-net.h | 151 +--- > > include/hw/virtio/virtio-rng.h | 4 +- > > include/hw/virtio/virtio-scsi.h | 120 +-- > > include/hw/virtio/virtio-serial.h | 40 +- > > include/hw/virtio/virtio.h | 71 +- > > include/net/tap.h | 24 +- > > include/standard-headers/asm-s390/kvm_virtio.h | 64 ++ > > include/standard-headers/asm-s390/virtio-ccw.h | 21 + > > include/standard-headers/linux/if_ether.h | 1 + > > include/standard-headers/linux/types.h | 2 + > > include/standard-headers/linux/virtio_9p.h | 44 ++ > > include/standard-headers/linux/virtio_balloon.h | 59 ++ > > include/standard-headers/linux/virtio_blk.h | 143 ++++ > > include/standard-headers/linux/virtio_config.h | 64 ++ > > include/standard-headers/linux/virtio_console.h | 78 ++ > > include/standard-headers/linux/virtio_ids.h | 43 + > > include/standard-headers/linux/virtio_net.h | 233 ++++++ > > include/standard-headers/linux/virtio_pci.h | 193 +++++ > > .../linux}/virtio_ring.h | 132 ++-- > > include/standard-headers/linux/virtio_rng.h | 8 + > > include/standard-headers/linux/virtio_scsi.h | 164 ++++ > > include/standard-headers/linux/virtio_types.h | 46 ++ > > linux-headers/linux/virtio_config.h | 58 +- > > linux-headers/linux/virtio_ring.h | 164 +--- > > exec.c | 2 + > > hw/9pfs/virtio-9p-device.c | 2 +- > > hw/acpi/aml-build.c | 867 +++++++++++++++++++++ > > hw/acpi/bios-linker-loader.c | 4 +- > > hw/acpi/ich9.c | 14 + > > hw/acpi/pcihp.c | 18 +- > > hw/acpi/piix4.c | 15 +- > > hw/audio/ac97.c | 5 +- > > hw/audio/es1370.c | 5 +- > > hw/audio/intel-hda.c | 6 +- > > hw/block/virtio-blk.c | 31 +- > > hw/char/serial-pci.c | 22 +- > > hw/char/virtio-serial-bus.c | 4 +- > > hw/core/qdev-properties.c | 21 +- > > hw/core/qdev.c | 8 +- > > hw/display/cirrus_vga.c | 11 +- > > hw/display/qxl.c | 36 +- > > hw/display/vga-pci.c | 11 +- > > hw/display/vmware_vga.c | 6 +- > > hw/i2c/smbus_ich9.c | 5 +- > > hw/i386/acpi-build.c | 750 +++++++++--------- > > hw/i386/kvm/pci-assign.c | 10 +- > > hw/i386/pc.c | 23 + > > hw/i386/pc_piix.c | 3 + > > hw/i386/pc_q35.c | 3 + > > hw/ide/cmd646.c | 5 +- > > hw/ide/ich.c | 13 +- > > hw/ide/piix.c | 10 +- > > hw/ide/via.c | 6 +- > > hw/ipack/tpci200.c | 6 +- > > hw/isa/i82378.c | 6 +- > > hw/isa/lpc_ich9.c | 14 +- > > hw/isa/piix4.c | 5 +- > > hw/isa/vt82c686.c | 24 +- > > hw/misc/pci-testdev.c | 6 +- > > hw/net/e1000.c | 6 +- > > hw/net/eepro100.c | 6 +- > > hw/net/lance.c | 3 +- > > hw/net/ne2000.c | 6 +- > > hw/net/pcnet-pci.c | 6 +- > > hw/net/pcnet.c | 4 +- > > hw/net/rtl8139.c | 6 +- > > hw/net/vhost_net.c | 2 +- > > hw/net/virtio-net.c | 57 +- > > hw/net/vmxnet3.c | 6 +- > > hw/pci-bridge/dec.c | 5 +- > > hw/pci-host/apb.c | 5 +- > > hw/pci-host/bonito.c | 6 +- > > hw/pci-host/grackle.c | 5 +- > > hw/pci-host/piix.c | 12 +- > > hw/pci-host/ppce500.c | 6 +- > > hw/pci-host/prep.c | 6 +- > > hw/pci-host/q35.c | 5 +- > > hw/pci-host/uninorth.c | 20 +- > > hw/pci-host/versatile.c | 5 +- > > hw/pci/pci.c | 113 +-- > > hw/s390x/virtio-ccw.c | 7 +- > > hw/scsi/virtio-scsi.c | 9 +- > > hw/sd/sdhci.c | 5 +- > > hw/usb/hcd-ehci-pci.c | 6 +- > > hw/usb/hcd-xhci.c | 6 +- > > hw/virtio/dataplane/vring.c | 10 +- > > hw/virtio/virtio-balloon.c | 2 +- > > hw/virtio/virtio-bus.c | 14 - > > hw/virtio/virtio-mmio.c | 2 +- > > hw/virtio/virtio-pci.c | 58 +- > > hw/virtio/virtio.c | 33 +- > > hw/watchdog/wdt_i6300esb.c | 6 +- > > vl.c | 34 +- > > hw/acpi/Makefile.objs | 1 + > > hw/i386/Makefile.objs | 6 +- > > hw/i386/acpi-dsdt-cpu-hotplug.dsl | 17 +- > > hw/i386/acpi-dsdt-mem-hotplug.dsl | 36 +- > > hw/i386/acpi-dsdt.hex.generated | 224 +----- > > hw/i386/q35-acpi-dsdt.hex.generated | 224 +----- > > hw/i386/ssdt-mem.dsl | 77 -- > > hw/i386/ssdt-mem.hex.generated | 213 ----- > > hw/i386/ssdt-misc.dsl | 82 -- > > hw/i386/ssdt-misc.hex.generated | 274 +------ > > hw/i386/ssdt-proc.dsl | 63 -- > > hw/i386/ssdt-proc.hex.generated | 134 ---- > > scripts/update-linux-headers.sh | 52 +- > > tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3415 bytes > > tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2374 bytes > > tests/acpi-test-data/q35/DSDT | Bin 8211 -> 8005 bytes > > tests/acpi-test-data/q35/SSDT | Bin 560 -> 578 bytes > > 125 files changed, 3236 insertions(+), 2959 deletions(-) > > create mode 100644 include/hw/acpi/aml-build.h > > create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h > > create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h > > create mode 100644 include/standard-headers/linux/if_ether.h > > create mode 100644 include/standard-headers/linux/types.h > > create mode 100644 include/standard-headers/linux/virtio_9p.h > > create mode 100644 include/standard-headers/linux/virtio_balloon.h > > create mode 100644 include/standard-headers/linux/virtio_blk.h > > create mode 100644 include/standard-headers/linux/virtio_config.h > > create mode 100644 include/standard-headers/linux/virtio_console.h > > create mode 100644 include/standard-headers/linux/virtio_ids.h > > create mode 100644 include/standard-headers/linux/virtio_net.h > > create mode 100644 include/standard-headers/linux/virtio_pci.h > > rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%) > > create mode 100644 include/standard-headers/linux/virtio_rng.h > > create mode 100644 include/standard-headers/linux/virtio_scsi.h > > create mode 100644 include/standard-headers/linux/virtio_types.h > > create mode 100644 hw/acpi/aml-build.c > > delete mode 100644 hw/i386/ssdt-mem.dsl > > delete mode 100644 hw/i386/ssdt-mem.hex.generated > > delete mode 100644 hw/i386/ssdt-proc.dsl > > delete mode 100644 hw/i386/ssdt-proc.hex.generated > >
On Wed, Feb 18, 2015 at 11:03:53PM +0100, Michael S. Tsirkin wrote: > On Wed, Feb 18, 2015 at 10:48:22PM +0100, Michael S. Tsirkin wrote: > > On Wed, Feb 18, 2015 at 10:43:58PM +0100, Michael S. Tsirkin wrote: > > > A huge patchset, but the scariest part is Igor's patches, > > > and these have been used by multiple people by now. > > > virtio header change is a bit rushed, but getting them upstream > > > seems like the best way to give them the cross-platform > > > testing that they need, and this takes us a step closer to > > > virtio-1.0 support. > > > > Ugh. > > Missed aarch64 failures this triggers :( > > Pls ignore for now, sorry about the noise. > > OK, I think it's a false alarm - passes fine on all other machines, > and on this one, current master gives the same error: > > GTESTER check-qtest-aarch64 > qemu-system-aarch64: Unknown device 'gpex-pcihost' for default sysbus > Broken pipe > GTester: last random seed: R02Sf2b7ee633e245f2aa40572f893be1567 > > Peter, you'll run make check anyway - can you pls try merging, > and running make check - if it passes for you too, > then I think this pull is fine, and I'll figure out > what's wrong with this box some other day. > > Pls let me know. > Thanks! OK, this was because of some stale files apparently. Regenerating config-devices made it go away. Pls pull. > > > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > > > > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > > > > > ---------------------------------------------------------------- > > > pci, pc, virtio fixes and cleanups > > > > > > Last large pull for soft freeze. > > > > > > A bunch of fixes all over the place. > > > Most of ACPI refactoring has been merged. > > > > > > virtio header cleanup has been merged, > > > now that windows has been build-tested with it. > > > > > > initial patches from virtio-1.0 branch have been merged. > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > > > ---------------------------------------------------------------- > > > Cornelia Huck (3): > > > virtio: cull virtio_bus_set_vdev_features > > > virtio: feature bit manipulation helpers > > > virtio: add feature checking helpers > > > > > > Igor Mammedov (43): > > > acpi: move generic aml building helpers into dedictated file > > > acpi: add build_append_namestring() helper > > > acpi: drop min-bytes in build_package() > > > pc: acpi-build: update linker on guest access > > > pc: acpi-build: migrate RSDP table > > > pc: acpi: use local var for accessing ACPI tables blob in acpi_build() > > > acpi: introduce AML composer aml_append() > > > acpi: add aml_scope() term > > > pc: acpi-build: use aml_scope() for \_SB scope > > > acpi: add aml_device() term > > > acpi: add aml_method() term > > > acpi: add aml_if() term > > > acpi: add aml_name() & aml_name_decl() term > > > acpi: add aml_int() term > > > acpi: add aml_return() term > > > acpi: add aml_arg() term > > > acpi: add aml_store() term > > > acpi: add aml_and() term > > > acpi: add aml_notify() term > > > acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers > > > acpi: add aml_package() term > > > pc: acpi-build: generate _S[345] packages dynamically > > > acpi: add aml_buffer() term > > > acpi: add aml_resource_template() helper > > > acpi: add aml_io() helper > > > acpi: include PkgLength size only when requested > > > acpi: add aml_operation_region() term > > > acpi: add aml_field() & aml_named_field() terms > > > acpi: add aml_local() term > > > acpi: add aml_string() term > > > pc: acpi-build: generate pvpanic device description dynamically > > > acpi: add aml_varpackage() term > > > acpi: add aml_equal() term > > > acpi: add aml_processor() term > > > acpi: add aml_eisaid() term > > > pc: acpi-build: drop template patching and CPU hotplug objects dynamically > > > pc: acpi-build: create CPU hotplug IO region dynamically > > > acpi: add aml_reserved_field() term > > > pc: acpi-build: drop template patching and memory hotplug objects dynamically > > > pc: acpi-build: create memory hotplug IO region dynamically > > > acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms > > > pc: pcihp: expose MMIO base and len as properties > > > pc: acpi-build: reserve PCIHP MMIO resources > > > > > > Markus Armbruster (11): > > > pci: Convert core to realize > > > pci: Permit incremental conversion of device models to realize > > > pci: Trivial device model conversions to realize > > > pcnet: pcnet_common_init() always returns 0, change to void > > > pcnet: Convert to realize > > > serial-pci: Convert to realize > > > ide/ich: Convert to realize > > > cirrus-vga: Convert to realize > > > qxl: Convert to realize > > > pci-assign: Convert to realize > > > qdev: Don't exit when running into bad -global > > > > > > Michael S. Tsirkin (32): > > > acpi-build: fix memory leak with bridge hp off > > > bios linker: validate pointer within table > > > acpi: update RSDP on guest access > > > exec: round up size on MR resize > > > acpi-build: fix ACPI RAM management > > > acpi: has_immutable_rsdp->!rsdp_in_ram > > > acpi-build: simplify rsdp management for legacy > > > scripts/update-linux-headers.sh: pull virtio hdrs > > > include: import virtio headers from linux 4.0 > > > virtio: use standard virtio_ring.h > > > virtio: use standard-headers > > > virtio-balloon: use standard headers > > > virtio-9p: use standard headers > > > virtio-blk: switch to standard-headers > > > virtio-net,tap: use standard-headers > > > virtio-rng: use standard-headers > > > virtio-scsi: use standard-headers > > > virtio-serial: switch to standard-headers > > > update-linux-headers: use standard-headers > > > linux-headers: use standard-headers > > > virtio-pci: use standard headers > > > scripts: add arch specific standard-headers > > > standard-headers: add s390 virtio headers > > > s390: use standard headers > > > acpi-build: skip hotplugged bridges > > > update-linux-headers.sh: s/__inline__/inline/ > > > virtio-serial-bus.c: drop virtio_ids.h > > > standard-headers: include stdint.h > > > virtio_ring.h: s/__inline__/inline/ > > > acpi: update generated hex files > > > acpi: drop unused generated files > > > acpi-test: update expected files > > > > > > Peter Krempa (2): > > > vl.c: Fix error messages when parsing maxmem parameters > > > pc: memory: Validate alignment of maxram_size to page size > > > > > > Tang Chen (5): > > > acpi, pc: Add hotunplug request cb for pc machine. > > > acpi, ich9: Add hotunplug request cb for ich9. > > > acpi, pc: Add unplug cb for pc machine. > > > acpi, ich9: Add unplug cb for ich9. > > > acpi, piix4: Add unplug cb for piix4. > > > > > > hw/9pfs/virtio-9p.h | 18 +- > > > hw/net/pcnet.h | 2 +- > > > hw/s390x/s390-virtio-bus.h | 36 +- > > > hw/s390x/s390-virtio.h | 7 +- > > > include/hw/acpi/aml-build.h | 206 +++++ > > > include/hw/acpi/ich9.h | 4 + > > > include/hw/acpi/pc-hotplug.h | 1 + > > > include/hw/acpi/pcihp.h | 7 +- > > > include/hw/i386/pc.h | 1 + > > > include/hw/pci/pci.h | 3 +- > > > include/hw/qdev-properties.h | 4 +- > > > include/hw/virtio/dataplane/vring.h | 2 +- > > > include/hw/virtio/virtio-balloon.h | 35 +- > > > include/hw/virtio/virtio-blk.h | 77 +- > > > include/hw/virtio/virtio-bus.h | 3 - > > > include/hw/virtio/virtio-net.h | 151 +--- > > > include/hw/virtio/virtio-rng.h | 4 +- > > > include/hw/virtio/virtio-scsi.h | 120 +-- > > > include/hw/virtio/virtio-serial.h | 40 +- > > > include/hw/virtio/virtio.h | 71 +- > > > include/net/tap.h | 24 +- > > > include/standard-headers/asm-s390/kvm_virtio.h | 64 ++ > > > include/standard-headers/asm-s390/virtio-ccw.h | 21 + > > > include/standard-headers/linux/if_ether.h | 1 + > > > include/standard-headers/linux/types.h | 2 + > > > include/standard-headers/linux/virtio_9p.h | 44 ++ > > > include/standard-headers/linux/virtio_balloon.h | 59 ++ > > > include/standard-headers/linux/virtio_blk.h | 143 ++++ > > > include/standard-headers/linux/virtio_config.h | 64 ++ > > > include/standard-headers/linux/virtio_console.h | 78 ++ > > > include/standard-headers/linux/virtio_ids.h | 43 + > > > include/standard-headers/linux/virtio_net.h | 233 ++++++ > > > include/standard-headers/linux/virtio_pci.h | 193 +++++ > > > .../linux}/virtio_ring.h | 132 ++-- > > > include/standard-headers/linux/virtio_rng.h | 8 + > > > include/standard-headers/linux/virtio_scsi.h | 164 ++++ > > > include/standard-headers/linux/virtio_types.h | 46 ++ > > > linux-headers/linux/virtio_config.h | 58 +- > > > linux-headers/linux/virtio_ring.h | 164 +--- > > > exec.c | 2 + > > > hw/9pfs/virtio-9p-device.c | 2 +- > > > hw/acpi/aml-build.c | 867 +++++++++++++++++++++ > > > hw/acpi/bios-linker-loader.c | 4 +- > > > hw/acpi/ich9.c | 14 + > > > hw/acpi/pcihp.c | 18 +- > > > hw/acpi/piix4.c | 15 +- > > > hw/audio/ac97.c | 5 +- > > > hw/audio/es1370.c | 5 +- > > > hw/audio/intel-hda.c | 6 +- > > > hw/block/virtio-blk.c | 31 +- > > > hw/char/serial-pci.c | 22 +- > > > hw/char/virtio-serial-bus.c | 4 +- > > > hw/core/qdev-properties.c | 21 +- > > > hw/core/qdev.c | 8 +- > > > hw/display/cirrus_vga.c | 11 +- > > > hw/display/qxl.c | 36 +- > > > hw/display/vga-pci.c | 11 +- > > > hw/display/vmware_vga.c | 6 +- > > > hw/i2c/smbus_ich9.c | 5 +- > > > hw/i386/acpi-build.c | 750 +++++++++--------- > > > hw/i386/kvm/pci-assign.c | 10 +- > > > hw/i386/pc.c | 23 + > > > hw/i386/pc_piix.c | 3 + > > > hw/i386/pc_q35.c | 3 + > > > hw/ide/cmd646.c | 5 +- > > > hw/ide/ich.c | 13 +- > > > hw/ide/piix.c | 10 +- > > > hw/ide/via.c | 6 +- > > > hw/ipack/tpci200.c | 6 +- > > > hw/isa/i82378.c | 6 +- > > > hw/isa/lpc_ich9.c | 14 +- > > > hw/isa/piix4.c | 5 +- > > > hw/isa/vt82c686.c | 24 +- > > > hw/misc/pci-testdev.c | 6 +- > > > hw/net/e1000.c | 6 +- > > > hw/net/eepro100.c | 6 +- > > > hw/net/lance.c | 3 +- > > > hw/net/ne2000.c | 6 +- > > > hw/net/pcnet-pci.c | 6 +- > > > hw/net/pcnet.c | 4 +- > > > hw/net/rtl8139.c | 6 +- > > > hw/net/vhost_net.c | 2 +- > > > hw/net/virtio-net.c | 57 +- > > > hw/net/vmxnet3.c | 6 +- > > > hw/pci-bridge/dec.c | 5 +- > > > hw/pci-host/apb.c | 5 +- > > > hw/pci-host/bonito.c | 6 +- > > > hw/pci-host/grackle.c | 5 +- > > > hw/pci-host/piix.c | 12 +- > > > hw/pci-host/ppce500.c | 6 +- > > > hw/pci-host/prep.c | 6 +- > > > hw/pci-host/q35.c | 5 +- > > > hw/pci-host/uninorth.c | 20 +- > > > hw/pci-host/versatile.c | 5 +- > > > hw/pci/pci.c | 113 +-- > > > hw/s390x/virtio-ccw.c | 7 +- > > > hw/scsi/virtio-scsi.c | 9 +- > > > hw/sd/sdhci.c | 5 +- > > > hw/usb/hcd-ehci-pci.c | 6 +- > > > hw/usb/hcd-xhci.c | 6 +- > > > hw/virtio/dataplane/vring.c | 10 +- > > > hw/virtio/virtio-balloon.c | 2 +- > > > hw/virtio/virtio-bus.c | 14 - > > > hw/virtio/virtio-mmio.c | 2 +- > > > hw/virtio/virtio-pci.c | 58 +- > > > hw/virtio/virtio.c | 33 +- > > > hw/watchdog/wdt_i6300esb.c | 6 +- > > > vl.c | 34 +- > > > hw/acpi/Makefile.objs | 1 + > > > hw/i386/Makefile.objs | 6 +- > > > hw/i386/acpi-dsdt-cpu-hotplug.dsl | 17 +- > > > hw/i386/acpi-dsdt-mem-hotplug.dsl | 36 +- > > > hw/i386/acpi-dsdt.hex.generated | 224 +----- > > > hw/i386/q35-acpi-dsdt.hex.generated | 224 +----- > > > hw/i386/ssdt-mem.dsl | 77 -- > > > hw/i386/ssdt-mem.hex.generated | 213 ----- > > > hw/i386/ssdt-misc.dsl | 82 -- > > > hw/i386/ssdt-misc.hex.generated | 274 +------ > > > hw/i386/ssdt-proc.dsl | 63 -- > > > hw/i386/ssdt-proc.hex.generated | 134 ---- > > > scripts/update-linux-headers.sh | 52 +- > > > tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3415 bytes > > > tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2374 bytes > > > tests/acpi-test-data/q35/DSDT | Bin 8211 -> 8005 bytes > > > tests/acpi-test-data/q35/SSDT | Bin 560 -> 578 bytes > > > 125 files changed, 3236 insertions(+), 2959 deletions(-) > > > create mode 100644 include/hw/acpi/aml-build.h > > > create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h > > > create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h > > > create mode 100644 include/standard-headers/linux/if_ether.h > > > create mode 100644 include/standard-headers/linux/types.h > > > create mode 100644 include/standard-headers/linux/virtio_9p.h > > > create mode 100644 include/standard-headers/linux/virtio_balloon.h > > > create mode 100644 include/standard-headers/linux/virtio_blk.h > > > create mode 100644 include/standard-headers/linux/virtio_config.h > > > create mode 100644 include/standard-headers/linux/virtio_console.h > > > create mode 100644 include/standard-headers/linux/virtio_ids.h > > > create mode 100644 include/standard-headers/linux/virtio_net.h > > > create mode 100644 include/standard-headers/linux/virtio_pci.h > > > rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%) > > > create mode 100644 include/standard-headers/linux/virtio_rng.h > > > create mode 100644 include/standard-headers/linux/virtio_scsi.h > > > create mode 100644 include/standard-headers/linux/virtio_types.h > > > create mode 100644 hw/acpi/aml-build.c > > > delete mode 100644 hw/i386/ssdt-mem.dsl > > > delete mode 100644 hw/i386/ssdt-mem.hex.generated > > > delete mode 100644 hw/i386/ssdt-proc.dsl > > > delete mode 100644 hw/i386/ssdt-proc.hex.generated > > >
On 19 February 2015 at 07:03, Michael S. Tsirkin <mst@redhat.com> wrote: > OK, I think it's a false alarm - passes fine on all other machines, > and on this one, current master gives the same error: > > GTESTER check-qtest-aarch64 > qemu-system-aarch64: Unknown device 'gpex-pcihost' for default sysbus > Broken pipe > GTester: last random seed: R02Sf2b7ee633e245f2aa40572f893be1567 As you seem to have discovered, this is just because your build tree has stale files in it: http://lists.gnu.org/archive/html/qemu-devel/2015-02/msg02607.html It's one of those things where we made a change to our makefiles (in fact a change from over a year ago, I think), and the new dependency rules are self-consistent but don't provide an "upgrade" path for ensuring correct files are generated starting from a pre-change build tree state. As far as I can tell, once you've caused the make_device_config.sh script to get run once, the .d files will all be present so that future changes like this aarch64 one to pci.mak or other included files will correctly trigger rebuilds. thanks -- PMM
On Wed, Feb 18, 2015 at 10:43:35PM +0100, Michael S. Tsirkin wrote: > A huge patchset, but the scariest part is Igor's patches, > and these have been used by multiple people by now. > virtio header change is a bit rushed, but getting them upstream > seems like the best way to give them the cross-platform > testing that they need, and this takes us a step closer to > virtio-1.0 support. Hi Peter, I'm going to assume this pull request is okay and queue more stuff on top, but if there's a problem with it, I'd appreciate if you let me know.
On 19 February 2015 at 06:43, Michael S. Tsirkin <mst@redhat.com> wrote: > A huge patchset, but the scariest part is Igor's patches, > and these have been used by multiple people by now. > virtio header change is a bit rushed, but getting them upstream > seems like the best way to give them the cross-platform > testing that they need, and this takes us a step closer to > virtio-1.0 support. > > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > ---------------------------------------------------------------- > pci, pc, virtio fixes and cleanups > > Last large pull for soft freeze. > > A bunch of fixes all over the place. > Most of ACPI refactoring has been merged. > > virtio header cleanup has been merged, > now that windows has been build-tested with it. > > initial patches from virtio-1.0 branch have been merged. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- Hi. I'm afraid this fails to build: CP i386-softmmu/hw/i386/acpi-dsdt.hex CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex make[1]: *** No rule to make target `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed by `hw/i386/ssdt-proc.hex'. Stop. make[1]: *** Waiting for unfinished jobs.... (There were also a bunch of conflicts in the virtio stuff which you'll need to fix up when you rebase.) thanks -- PMM
On Thu, Feb 26, 2015 at 08:17:43PM +0900, Peter Maydell wrote: > On 19 February 2015 at 06:43, Michael S. Tsirkin <mst@redhat.com> wrote: > > A huge patchset, but the scariest part is Igor's patches, > > and these have been used by multiple people by now. > > virtio header change is a bit rushed, but getting them upstream > > seems like the best way to give them the cross-platform > > testing that they need, and this takes us a step closer to > > virtio-1.0 support. > > > > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > > > ---------------------------------------------------------------- > > pci, pc, virtio fixes and cleanups > > > > Last large pull for soft freeze. > > > > A bunch of fixes all over the place. > > Most of ACPI refactoring has been merged. > > > > virtio header cleanup has been merged, > > now that windows has been build-tested with it. > > > > initial patches from virtio-1.0 branch have been merged. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > ---------------------------------------------------------------- > > Hi. I'm afraid this fails to build: > > CP i386-softmmu/hw/i386/acpi-dsdt.hex > CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex > make[1]: *** No rule to make target > `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed > by `hw/i386/ssdt-proc.hex'. Stop. > make[1]: *** Waiting for unfinished jobs.... Are you sure it's a clean build? This often results from a stale .d file. > (There were also a bunch of conflicts in the virtio > stuff which you'll need to fix up when you rebase.) > > thanks > -- PMM
On Thu, Feb 26, 2015 at 08:17:43PM +0900, Peter Maydell wrote: > On 19 February 2015 at 06:43, Michael S. Tsirkin <mst@redhat.com> wrote: > > A huge patchset, but the scariest part is Igor's patches, > > and these have been used by multiple people by now. > > virtio header change is a bit rushed, but getting them upstream > > seems like the best way to give them the cross-platform > > testing that they need, and this takes us a step closer to > > virtio-1.0 support. > > > > The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: > > > > acpi-test: update expected files (2015-02-18 22:29:26 +0100) > > > > ---------------------------------------------------------------- > > pci, pc, virtio fixes and cleanups > > > > Last large pull for soft freeze. > > > > A bunch of fixes all over the place. > > Most of ACPI refactoring has been merged. > > > > virtio header cleanup has been merged, > > now that windows has been build-tested with it. > > > > initial patches from virtio-1.0 branch have been merged. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > ---------------------------------------------------------------- > > Hi. I'm afraid this fails to build: > > CP i386-softmmu/hw/i386/acpi-dsdt.hex > CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex > make[1]: *** No rule to make target > `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed > by `hw/i386/ssdt-proc.hex'. Stop. > make[1]: *** Waiting for unfinished jobs.... > > (There were also a bunch of conflicts in the virtio > stuff which you'll need to fix up when you rebase.) > > thanks > -- PMM I did the rebase to make it easy for you: pushed to git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git rebase_upstream_rebased pls take a look. But I couldn't reproduce your build issues.
On 26 February 2015 at 20:41, Michael S. Tsirkin <mst@redhat.com> wrote: > On Thu, Feb 26, 2015 at 08:17:43PM +0900, Peter Maydell wrote: >> Hi. I'm afraid this fails to build: >> >> CP i386-softmmu/hw/i386/acpi-dsdt.hex >> CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex >> make[1]: *** No rule to make target >> `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed >> by `hw/i386/ssdt-proc.hex'. Stop. >> make[1]: *** Waiting for unfinished jobs.... > > Are you sure it's a clean build? > This often results from a stale .d file. No, it's not a clean build, because I like to test both clean and incremental rebuilds. Most of my other builds seemed OK, but this one bombed out. -- PMM
On Thu, Feb 26, 2015 at 08:59:47PM +0900, Peter Maydell wrote: > On 26 February 2015 at 20:41, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Thu, Feb 26, 2015 at 08:17:43PM +0900, Peter Maydell wrote: > >> Hi. I'm afraid this fails to build: > >> > >> CP i386-softmmu/hw/i386/acpi-dsdt.hex > >> CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex > >> make[1]: *** No rule to make target > >> `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed > >> by `hw/i386/ssdt-proc.hex'. Stop. > >> make[1]: *** Waiting for unfinished jobs.... > > > > Are you sure it's a clean build? > > This often results from a stale .d file. > > No, it's not a clean build, because I like to test both > clean and incremental rebuilds. Most of my other builds > seemed OK, but this one bombed out. > > -- PMM Well, it's known that incremental builds are best effort, isn't it? Wrt rebase, it's now on kernel.org, tag for_upstream_rebased: 1d40f18 rebased with only a trivial conflict.
A huge patchset, but the scariest part is Igor's patches, and these have been used by multiple people by now. virtio header change is a bit rushed, but getting them upstream seems like the best way to give them the cross-platform testing that they need, and this takes us a step closer to virtio-1.0 support. The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7: Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6: acpi-test: update expected files (2015-02-18 22:29:26 +0100) ---------------------------------------------------------------- pci, pc, virtio fixes and cleanups Last large pull for soft freeze. A bunch of fixes all over the place. Most of ACPI refactoring has been merged. virtio header cleanup has been merged, now that windows has been build-tested with it. initial patches from virtio-1.0 branch have been merged. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Cornelia Huck (3): virtio: cull virtio_bus_set_vdev_features virtio: feature bit manipulation helpers virtio: add feature checking helpers Igor Mammedov (43): acpi: move generic aml building helpers into dedictated file acpi: add build_append_namestring() helper acpi: drop min-bytes in build_package() pc: acpi-build: update linker on guest access pc: acpi-build: migrate RSDP table pc: acpi: use local var for accessing ACPI tables blob in acpi_build() acpi: introduce AML composer aml_append() acpi: add aml_scope() term pc: acpi-build: use aml_scope() for \_SB scope acpi: add aml_device() term acpi: add aml_method() term acpi: add aml_if() term acpi: add aml_name() & aml_name_decl() term acpi: add aml_int() term acpi: add aml_return() term acpi: add aml_arg() term acpi: add aml_store() term acpi: add aml_and() term acpi: add aml_notify() term acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers acpi: add aml_package() term pc: acpi-build: generate _S[345] packages dynamically acpi: add aml_buffer() term acpi: add aml_resource_template() helper acpi: add aml_io() helper acpi: include PkgLength size only when requested acpi: add aml_operation_region() term acpi: add aml_field() & aml_named_field() terms acpi: add aml_local() term acpi: add aml_string() term pc: acpi-build: generate pvpanic device description dynamically acpi: add aml_varpackage() term acpi: add aml_equal() term acpi: add aml_processor() term acpi: add aml_eisaid() term pc: acpi-build: drop template patching and CPU hotplug objects dynamically pc: acpi-build: create CPU hotplug IO region dynamically acpi: add aml_reserved_field() term pc: acpi-build: drop template patching and memory hotplug objects dynamically pc: acpi-build: create memory hotplug IO region dynamically acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms pc: pcihp: expose MMIO base and len as properties pc: acpi-build: reserve PCIHP MMIO resources Markus Armbruster (11): pci: Convert core to realize pci: Permit incremental conversion of device models to realize pci: Trivial device model conversions to realize pcnet: pcnet_common_init() always returns 0, change to void pcnet: Convert to realize serial-pci: Convert to realize ide/ich: Convert to realize cirrus-vga: Convert to realize qxl: Convert to realize pci-assign: Convert to realize qdev: Don't exit when running into bad -global Michael S. Tsirkin (32): acpi-build: fix memory leak with bridge hp off bios linker: validate pointer within table acpi: update RSDP on guest access exec: round up size on MR resize acpi-build: fix ACPI RAM management acpi: has_immutable_rsdp->!rsdp_in_ram acpi-build: simplify rsdp management for legacy scripts/update-linux-headers.sh: pull virtio hdrs include: import virtio headers from linux 4.0 virtio: use standard virtio_ring.h virtio: use standard-headers virtio-balloon: use standard headers virtio-9p: use standard headers virtio-blk: switch to standard-headers virtio-net,tap: use standard-headers virtio-rng: use standard-headers virtio-scsi: use standard-headers virtio-serial: switch to standard-headers update-linux-headers: use standard-headers linux-headers: use standard-headers virtio-pci: use standard headers scripts: add arch specific standard-headers standard-headers: add s390 virtio headers s390: use standard headers acpi-build: skip hotplugged bridges update-linux-headers.sh: s/__inline__/inline/ virtio-serial-bus.c: drop virtio_ids.h standard-headers: include stdint.h virtio_ring.h: s/__inline__/inline/ acpi: update generated hex files acpi: drop unused generated files acpi-test: update expected files Peter Krempa (2): vl.c: Fix error messages when parsing maxmem parameters pc: memory: Validate alignment of maxram_size to page size Tang Chen (5): acpi, pc: Add hotunplug request cb for pc machine. acpi, ich9: Add hotunplug request cb for ich9. acpi, pc: Add unplug cb for pc machine. acpi, ich9: Add unplug cb for ich9. acpi, piix4: Add unplug cb for piix4. hw/9pfs/virtio-9p.h | 18 +- hw/net/pcnet.h | 2 +- hw/s390x/s390-virtio-bus.h | 36 +- hw/s390x/s390-virtio.h | 7 +- include/hw/acpi/aml-build.h | 206 +++++ include/hw/acpi/ich9.h | 4 + include/hw/acpi/pc-hotplug.h | 1 + include/hw/acpi/pcihp.h | 7 +- include/hw/i386/pc.h | 1 + include/hw/pci/pci.h | 3 +- include/hw/qdev-properties.h | 4 +- include/hw/virtio/dataplane/vring.h | 2 +- include/hw/virtio/virtio-balloon.h | 35 +- include/hw/virtio/virtio-blk.h | 77 +- include/hw/virtio/virtio-bus.h | 3 - include/hw/virtio/virtio-net.h | 151 +--- include/hw/virtio/virtio-rng.h | 4 +- include/hw/virtio/virtio-scsi.h | 120 +-- include/hw/virtio/virtio-serial.h | 40 +- include/hw/virtio/virtio.h | 71 +- include/net/tap.h | 24 +- include/standard-headers/asm-s390/kvm_virtio.h | 64 ++ include/standard-headers/asm-s390/virtio-ccw.h | 21 + include/standard-headers/linux/if_ether.h | 1 + include/standard-headers/linux/types.h | 2 + include/standard-headers/linux/virtio_9p.h | 44 ++ include/standard-headers/linux/virtio_balloon.h | 59 ++ include/standard-headers/linux/virtio_blk.h | 143 ++++ include/standard-headers/linux/virtio_config.h | 64 ++ include/standard-headers/linux/virtio_console.h | 78 ++ include/standard-headers/linux/virtio_ids.h | 43 + include/standard-headers/linux/virtio_net.h | 233 ++++++ include/standard-headers/linux/virtio_pci.h | 193 +++++ .../linux}/virtio_ring.h | 132 ++-- include/standard-headers/linux/virtio_rng.h | 8 + include/standard-headers/linux/virtio_scsi.h | 164 ++++ include/standard-headers/linux/virtio_types.h | 46 ++ linux-headers/linux/virtio_config.h | 58 +- linux-headers/linux/virtio_ring.h | 164 +--- exec.c | 2 + hw/9pfs/virtio-9p-device.c | 2 +- hw/acpi/aml-build.c | 867 +++++++++++++++++++++ hw/acpi/bios-linker-loader.c | 4 +- hw/acpi/ich9.c | 14 + hw/acpi/pcihp.c | 18 +- hw/acpi/piix4.c | 15 +- hw/audio/ac97.c | 5 +- hw/audio/es1370.c | 5 +- hw/audio/intel-hda.c | 6 +- hw/block/virtio-blk.c | 31 +- hw/char/serial-pci.c | 22 +- hw/char/virtio-serial-bus.c | 4 +- hw/core/qdev-properties.c | 21 +- hw/core/qdev.c | 8 +- hw/display/cirrus_vga.c | 11 +- hw/display/qxl.c | 36 +- hw/display/vga-pci.c | 11 +- hw/display/vmware_vga.c | 6 +- hw/i2c/smbus_ich9.c | 5 +- hw/i386/acpi-build.c | 750 +++++++++--------- hw/i386/kvm/pci-assign.c | 10 +- hw/i386/pc.c | 23 + hw/i386/pc_piix.c | 3 + hw/i386/pc_q35.c | 3 + hw/ide/cmd646.c | 5 +- hw/ide/ich.c | 13 +- hw/ide/piix.c | 10 +- hw/ide/via.c | 6 +- hw/ipack/tpci200.c | 6 +- hw/isa/i82378.c | 6 +- hw/isa/lpc_ich9.c | 14 +- hw/isa/piix4.c | 5 +- hw/isa/vt82c686.c | 24 +- hw/misc/pci-testdev.c | 6 +- hw/net/e1000.c | 6 +- hw/net/eepro100.c | 6 +- hw/net/lance.c | 3 +- hw/net/ne2000.c | 6 +- hw/net/pcnet-pci.c | 6 +- hw/net/pcnet.c | 4 +- hw/net/rtl8139.c | 6 +- hw/net/vhost_net.c | 2 +- hw/net/virtio-net.c | 57 +- hw/net/vmxnet3.c | 6 +- hw/pci-bridge/dec.c | 5 +- hw/pci-host/apb.c | 5 +- hw/pci-host/bonito.c | 6 +- hw/pci-host/grackle.c | 5 +- hw/pci-host/piix.c | 12 +- hw/pci-host/ppce500.c | 6 +- hw/pci-host/prep.c | 6 +- hw/pci-host/q35.c | 5 +- hw/pci-host/uninorth.c | 20 +- hw/pci-host/versatile.c | 5 +- hw/pci/pci.c | 113 +-- hw/s390x/virtio-ccw.c | 7 +- hw/scsi/virtio-scsi.c | 9 +- hw/sd/sdhci.c | 5 +- hw/usb/hcd-ehci-pci.c | 6 +- hw/usb/hcd-xhci.c | 6 +- hw/virtio/dataplane/vring.c | 10 +- hw/virtio/virtio-balloon.c | 2 +- hw/virtio/virtio-bus.c | 14 - hw/virtio/virtio-mmio.c | 2 +- hw/virtio/virtio-pci.c | 58 +- hw/virtio/virtio.c | 33 +- hw/watchdog/wdt_i6300esb.c | 6 +- vl.c | 34 +- hw/acpi/Makefile.objs | 1 + hw/i386/Makefile.objs | 6 +- hw/i386/acpi-dsdt-cpu-hotplug.dsl | 17 +- hw/i386/acpi-dsdt-mem-hotplug.dsl | 36 +- hw/i386/acpi-dsdt.hex.generated | 224 +----- hw/i386/q35-acpi-dsdt.hex.generated | 224 +----- hw/i386/ssdt-mem.dsl | 77 -- hw/i386/ssdt-mem.hex.generated | 213 ----- hw/i386/ssdt-misc.dsl | 82 -- hw/i386/ssdt-misc.hex.generated | 274 +------ hw/i386/ssdt-proc.dsl | 63 -- hw/i386/ssdt-proc.hex.generated | 134 ---- scripts/update-linux-headers.sh | 52 +- tests/acpi-test-data/pc/DSDT | Bin 3621 -> 3415 bytes tests/acpi-test-data/pc/SSDT | Bin 2279 -> 2374 bytes tests/acpi-test-data/q35/DSDT | Bin 8211 -> 8005 bytes tests/acpi-test-data/q35/SSDT | Bin 560 -> 578 bytes 125 files changed, 3236 insertions(+), 2959 deletions(-) create mode 100644 include/hw/acpi/aml-build.h create mode 100644 include/standard-headers/asm-s390/kvm_virtio.h create mode 100644 include/standard-headers/asm-s390/virtio-ccw.h create mode 100644 include/standard-headers/linux/if_ether.h create mode 100644 include/standard-headers/linux/types.h create mode 100644 include/standard-headers/linux/virtio_9p.h create mode 100644 include/standard-headers/linux/virtio_balloon.h create mode 100644 include/standard-headers/linux/virtio_blk.h create mode 100644 include/standard-headers/linux/virtio_config.h create mode 100644 include/standard-headers/linux/virtio_console.h create mode 100644 include/standard-headers/linux/virtio_ids.h create mode 100644 include/standard-headers/linux/virtio_net.h create mode 100644 include/standard-headers/linux/virtio_pci.h rename include/{hw/virtio => standard-headers/linux}/virtio_ring.h (61%) create mode 100644 include/standard-headers/linux/virtio_rng.h create mode 100644 include/standard-headers/linux/virtio_scsi.h create mode 100644 include/standard-headers/linux/virtio_types.h create mode 100644 hw/acpi/aml-build.c delete mode 100644 hw/i386/ssdt-mem.dsl delete mode 100644 hw/i386/ssdt-mem.hex.generated delete mode 100644 hw/i386/ssdt-proc.dsl delete mode 100644 hw/i386/ssdt-proc.hex.generated