On 12/02/2010 02:12 PM, Michael S. Tsirkin wrote:
Note: pull request from 11/16/2010 was supposed to be merged
but seems to have got lost somehow. So this request includes
those bits as well.
The following changes since commit 393f398b69f9baadc3f29d822a0b5b74ca63b919:
tcg-ia64: Fix warning in qemu_ld. (2010-12-01 19:48:31 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony
Pulled, thanks.
Regards,
Anthony Liguori
Note: in an attempt to avoid conflict in a merge I cherry-picked a patch
by Stefan from master to my branch. Didn't seem to help :) But this is
why it's there, and I don't want to rewrite the history.
Alex Williamson (2):
e1000: Fix TCP checksum overflow with TSO
PCI: Bus number from the bridge, not the device
Anthony Liguori (2):
qbus: add functions to walk both devices and busses
qdev: reset qdev along with qdev tree
Isaku Yamahata (11):
pci: add W1C bits to pci status register
pcie_regs.h: more constants
pcie/aer: helper functions for pcie aer capability
ioh3420: support aer
x3130/upstream: support aer
x3130/downstream: support aer.
pcie/port: fix bridge control register wmask
qdev: introduce reset call back for qbus level
qdev: trigger reset from a given device
pci: use qdev reset framework for pci bus reset
pci bridge: implement secondary bus reset
Jason Wang (1):
vhost: Fix address calculation in vhost_dev_sync_region()
Michael S. Tsirkin (11):
tap: clear vhost_net backend on cleanup
tap: make set_offload a nop after netdev cleanup
pci: allow hotplug removal of cold-plugged devices
pcie_aer: get rid of recursion
pcie_aer: complete unwinding recursion
pci: fix bridge control bit wmask
pci: fix bus walk under secondary bus reset
virtio: fix up VQ checks
Merge remote branch 'origin/master' into pci
migration: stable ram block ordering
migration: allow rate> 4g
Stefan Hajnoczi (1):
virtio: Convert fprintf() to error_report()
Stefan Weil (3):
pci: Replace unneeded type casts in calls of pci_register_bar
pci: Automatically patch PCI vendor id and device id in PCI ROM
eepro100: Use a single rom file for all i825xx devices
Makefile | 1 -
Makefile.objs | 3 +-
arch_init.c | 35 ++
buffered_file.c | 9 +-
cpu-common.h | 3 +
exec.c | 24 +-
hw/cirrus_vga.c | 4 +-
hw/e1000.c | 4 +-
hw/eepro100.c | 14 +-
hw/hw.h | 8 +-
hw/ide/via.c | 2 +-
hw/ioh3420.c | 80 +++-
hw/lsi53c895a.c | 7 +-
hw/openpic.c | 2 +-
hw/pci.c | 174 +++++++-
hw/pci.h | 1 +
hw/pci_bridge.c | 11 +-
hw/pcie.h | 14 +
hw/pcie_aer.c | 815 ++++++++++++++++++++++++++++++++++++
hw/pcie_aer.h | 106 +++++
hw/pcie_port.c | 8 +
hw/pcie_regs.h | 2 +
hw/qdev.c | 87 ++++-
hw/qdev.h | 18 +
hw/usb-ohci.c | 2 +-
hw/vhost.c | 1 +
hw/virtio.c | 27 +-
hw/xio3130_downstream.c | 43 ++-
hw/xio3130_upstream.c | 33 +-
kvm-all.c | 2 +-
migration.c | 6 +-
pc-bios/README | 2 +-
pc-bios/gpxe-eepro100-80861229.rom | Bin 56832 -> 0 bytes
qemu-common.h | 3 +
savevm.c | 4 +-
vl.c | 1 +
36 files changed, 1446 insertions(+), 110 deletions(-)
create mode 100644 hw/pcie_aer.c
create mode 100644 hw/pcie_aer.h
delete mode 100644 pc-bios/gpxe-eepro100-80861229.rom
