OK this is try 2, with bad vhost patch dropped, but I also tacked on
pcie support and some other fixes.
The following changes since commit 758c309f0a5cb52441a1ee015566cf9cd96fa933:
seabios: Update to 0.6.1 (2010-10-25 16:43:41 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony
Blue Swirl (1):
Introduce range.h
This one is identical to what we already have on master, it got cherry
picked to pci branch to avoid bisect issues.
Isaku Yamahata (28):
pci: move out pci internal structures, PCIBus, PCIBridge, and
pci_bus_info.
pci/bridge: split out pci bridge code into pci_bridge.c from pci.c
pci_bridge: rename PCIBridge::bus -> PCIBridge::sec_bus.
pci_bridge: clean up: remove pci_{register, unregister}_secondary_bus()
pci_bridge: introduce pci bridge library.
pci: consolidate pci_add_capability_at_offset() into pci_add_capability().
pci bridge: add helper function for ssvid capability.
pci: call hotplug callback even when not hotplug case for later use.
pci: make pci_parse_devfn() aware of func.
pci_ids.h: add vendor id of Texas Intesruments
pci: sorting out type confusion in pci_register_bar().
pci: don't ignore invalid parameter for pci_register_bar().
pci: improve signature of pci_register_bar().
pci: implement RW1C register framework.
msix: clear not only INTA, but all INTx when MSI-X is enabled.
pci: make pci_del_capability() update for w1cmask
pci: introduce helper functions to test-and-{clear, set} mask in
configuration space
pci: introduce helper function to handle msi-x and msi.
pci: use pci_word_test_and_clear_mask() in pci_device_reset()
msi: implements msi
pcie: add pcie constants to pcie_regs.h
pcie: helper functions for pcie capability and extended capability
pcie: comment on hpev_intx
pci/bridge: fix pci_bridge_reset()
pcie port: define struct PCIEPort/PCIESlot and helper functions
ioh3420: pcie root port in X58 ioh
x3130: pcie upstream port
x3130: pcie downstream port
Jason Wang (1):
net: properly handle illegal fd/vhostfd from command line
Michael S. Tsirkin (10):
migration: don't segfault on invalid input
virtio: sanity-check available index
qemu-options.def: add to generated header list
pcie: simplify range check
pcie: clean up hot plug notification
pci: improve w1c mask handling
msi: simplify range checks
msi: minor cleanups
pcie: update satus on reset
Merge branch 'pci' into for_anthony
Makefile | 7 +-
Makefile.objs | 13 +-
arch_init.c | 3 +
hw/acpi_piix4.c | 3 +
hw/apb_pci.c | 56 ++++--
hw/dec_pci.c | 46 ++++-
hw/eepro100.c | 4 +-
hw/ioh3420.c | 186 ++++++++++++++++
hw/ioh3420.h | 10 +
hw/msi.c | 347 ++++++++++++++++++++++++++++++
hw/msi.h | 41 ++++
hw/msix.c | 8 +-
hw/pci.c | 322 ++++++++---------------------
hw/pci.h | 105 ++++++++-
hw/pci_bridge.c | 266 +++++++++++++++++++++++
hw/pci_bridge.h | 66 ++++++
hw/pci_ids.h | 2 +
hw/pci_internals.h | 47 ++++
hw/pcie.c | 541 +++++++++++++++++++++++++++++++++++++++++++++++
hw/pcie.h | 120 +++++++++++
hw/pcie_port.c | 116 ++++++++++
hw/pcie_port.h | 51 +++++
hw/pcie_regs.h | 154 ++++++++++++++
hw/virtio.c | 11 +
hw/xio3130_downstream.c | 188 ++++++++++++++++
hw/xio3130_downstream.h | 11 +
hw/xio3130_upstream.c | 174 +++++++++++++++
hw/xio3130_upstream.h | 10 +
net.c | 16 +-
qemu-common.h | 4 +
30 files changed, 2637 insertions(+), 291 deletions(-)
create mode 100644 hw/ioh3420.c
create mode 100644 hw/ioh3420.h
create mode 100644 hw/msi.c
create mode 100644 hw/msi.h
create mode 100644 hw/pci_bridge.c
create mode 100644 hw/pci_bridge.h
create mode 100644 hw/pci_internals.h
create mode 100644 hw/pcie.c
create mode 100644 hw/pcie.h
create mode 100644 hw/pcie_port.c
create mode 100644 hw/pcie_port.h
create mode 100644 hw/pcie_regs.h
create mode 100644 hw/xio3130_downstream.c
create mode 100644 hw/xio3130_downstream.h
create mode 100644 hw/xio3130_upstream.c
create mode 100644 hw/xio3130_upstream.h
