| Message ID | 20101124155707.GA29235@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 11/24/2010 09:57 AM, Michael S. Tsirkin wrote: > Note: to avoid conflict in a merge I cherry-picked a patch by Stefan > from master to my branch. git seems to resolve this without effort. > > The following changes since commit e927d48722fdcba50f82d653c5a1927752483054: > > pci: allow hotplug removal of cold-plugged devices (2010-11-16 14:55:23 +0200) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony > Could you merge against git://git.qemu.org/qemu.git? We're now live but there's a virtio series that Paul committed that conflicts with your tree. Regards, Anthony Liguori > 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 > > Michael S. Tsirkin (5): > 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 > > 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 | 2 +- > hw/cirrus_vga.c | 4 +- > hw/e1000.c | 4 +- > hw/eepro100.c | 14 +- > 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/virtio.c | 52 ++- > hw/xio3130_downstream.c | 43 ++- > hw/xio3130_upstream.c | 33 +- > pc-bios/README | 2 +- > pc-bios/gpxe-eepro100-80861229.rom | Bin 56832 -> 0 bytes > qemu-common.h | 3 + > vl.c | 1 + > 27 files changed, 1380 insertions(+), 108 deletions(-) > create mode 100644 hw/pcie_aer.c > create mode 100644 hw/pcie_aer.h > delete mode 100644 pc-bios/gpxe-eepro100-80861229.rom > > >
On Tue, Nov 30, 2010 at 03:22:43PM -0600, Anthony Liguori wrote: > On 11/24/2010 09:57 AM, Michael S. Tsirkin wrote: > >Note: to avoid conflict in a merge I cherry-picked a patch by Stefan > >from master to my branch. git seems to resolve this without effort. > > > >The following changes since commit e927d48722fdcba50f82d653c5a1927752483054: > > > > pci: allow hotplug removal of cold-plugged devices (2010-11-16 14:55:23 +0200) > > > >are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony > > Could you merge against git://git.qemu.org/qemu.git? Done. Same git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony head should be c924f36a300cbc54d3cb511116e8e2bae17f5ae6 > We're now live but there's a virtio series that Paul committed that > conflicts with your tree. > > Regards, > > Anthony Liguori > > >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 > > > >Michael S. Tsirkin (5): > > 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 > > > >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 | 2 +- > > hw/cirrus_vga.c | 4 +- > > hw/e1000.c | 4 +- > > hw/eepro100.c | 14 +- > > 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/virtio.c | 52 ++- > > hw/xio3130_downstream.c | 43 ++- > > hw/xio3130_upstream.c | 33 +- > > pc-bios/README | 2 +- > > pc-bios/gpxe-eepro100-80861229.rom | Bin 56832 -> 0 bytes > > qemu-common.h | 3 + > > vl.c | 1 + > > 27 files changed, 1380 insertions(+), 108 deletions(-) > > create mode 100644 hw/pcie_aer.c > > create mode 100644 hw/pcie_aer.h > > delete mode 100644 pc-bios/gpxe-eepro100-80861229.rom > > > >
Note: to avoid conflict in a merge I cherry-picked a patch by Stefan from master to my branch. git seems to resolve this without effort. The following changes since commit e927d48722fdcba50f82d653c5a1927752483054: pci: allow hotplug removal of cold-plugged devices (2010-11-16 14:55:23 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony 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 Michael S. Tsirkin (5): 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 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 | 2 +- hw/cirrus_vga.c | 4 +- hw/e1000.c | 4 +- hw/eepro100.c | 14 +- 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/virtio.c | 52 ++- hw/xio3130_downstream.c | 43 ++- hw/xio3130_upstream.c | 33 +- pc-bios/README | 2 +- pc-bios/gpxe-eepro100-80861229.rom | Bin 56832 -> 0 bytes qemu-common.h | 3 + vl.c | 1 + 27 files changed, 1380 insertions(+), 108 deletions(-) create mode 100644 hw/pcie_aer.c create mode 100644 hw/pcie_aer.h delete mode 100644 pc-bios/gpxe-eepro100-80861229.rom