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 <m...@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
> > >
