Skip to content
  • Peter Maydell's avatar
    0048fa6c
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 0048fa6c
    Peter Maydell authored
    
    
    pci, pc, virtio fixes and cleanups
    
    A bunch of fixes all over the place.
    All of ACPI refactoring has been merged.
    Legacy pci commands have been dropped.
    virtio header cleanup
    initial patches from virtio-1.0 branch
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    * remotes/mst/tags/for_upstream: (130 commits)
      acpi: drop unused code
      aml-build: comment fix
      acpi-build: fix typo in comment
      acpi: update generated files
      vhost user:support vhost user nic for non msi guests
      aml-build: fix build for glib < 2.22
      acpi: update generated files
      Makefile.target: binary depends on config-devices
      acpi-test-data: update after pci rewrite
      acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb().
      pci-hotplug-old: Has been dead for five major releases, bury
      pci: Give a few helpers internal linkage
      acpi: make build_*() routines static to aml-build.c
      pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs
      pc: acpi-build: drop template patching and create PCI bus tree dynamically
      tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation
      pc: acpi-build: simplify PCI bus tree generation
      tests: add ACPI blobs for qemu with bridge cases
      tests: bios-tables-test: add support for testing bridges
      tests: ACPI test blobs update due to PCI0._CRS changes
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    Conflicts:
    	hw/pci/pci-hotplug-old.c
    0048fa6c
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    Peter Maydell authored
    
    
    pci, pc, virtio fixes and cleanups
    
    A bunch of fixes all over the place.
    All of ACPI refactoring has been merged.
    Legacy pci commands have been dropped.
    virtio header cleanup
    initial patches from virtio-1.0 branch
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    * remotes/mst/tags/for_upstream: (130 commits)
      acpi: drop unused code
      aml-build: comment fix
      acpi-build: fix typo in comment
      acpi: update generated files
      vhost user:support vhost user nic for non msi guests
      aml-build: fix build for glib < 2.22
      acpi: update generated files
      Makefile.target: binary depends on config-devices
      acpi-test-data: update after pci rewrite
      acpi, mem-hotplug: use PC_DIMM_SLOT_PROP in acpi_memory_plug_cb().
      pci-hotplug-old: Has been dead for five major releases, bury
      pci: Give a few helpers internal linkage
      acpi: make build_*() routines static to aml-build.c
      pc: acpi: remove not used anymore ssdt-[misc|pcihp].hex.generated blobs
      pc: acpi-build: drop template patching and create PCI bus tree dynamically
      tests: ACPI: update pc/SSDT.bridge due to new alg of PCI tree creation
      pc: acpi-build: simplify PCI bus tree generation
      tests: add ACPI blobs for qemu with bridge cases
      tests: bios-tables-test: add support for testing bridges
      tests: ACPI test blobs update due to PCI0._CRS changes
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    Conflicts:
    	hw/pci/pci-hotplug-old.c
Loading