From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48869 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNdas-0000lR-GH for qemu-devel@nongnu.org; Tue, 30 Nov 2010 22:43:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNXf5-0008OO-Qs for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:22:56 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:40722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNXf5-0008GX-Ny for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:22:55 -0500 Received: by gye5 with SMTP id 5so3247718gye.4 for ; Tue, 30 Nov 2010 13:22:50 -0800 (PST) Message-ID: <4CF56B23.3050609@codemonkey.ws> Date: Tue, 30 Nov 2010 15:22:43 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PULL] virtio, e1000, pci aer, pci reset References: <20101124155707.GA29235@redhat.com> In-Reply-To: <20101124155707.GA29235@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: yamahata@valinux.co.jp, qemu-devel@nongnu.org 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 > > >