From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54413 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcLDr-0000sq-Jb for qemu-devel@nongnu.org; Mon, 10 Jan 2011 12:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PcLDg-0001ac-5g for qemu-devel@nongnu.org; Mon, 10 Jan 2011 12:07:49 -0500 Received: from mail-vw0-f45.google.com ([209.85.212.45]:33800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PcLDg-0001aR-3J for qemu-devel@nongnu.org; Mon, 10 Jan 2011 12:07:48 -0500 Received: by vws12 with SMTP id 12so7754207vws.4 for ; Mon, 10 Jan 2011 09:07:47 -0800 (PST) Message-ID: <4D2B3CB6.1060802@codemonkey.ws> Date: Mon, 10 Jan 2011 11:07:02 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PULL] piix, pci, qdev References: <20101227172140.GA18898@redhat.com> In-Reply-To: <20101227172140.GA18898@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: qemu-devel@nongnu.org On 12/27/2010 11:21 AM, Michael S. Tsirkin wrote: > The sysbus change is already in master, but I didn't want to rebase the > tree. I verified there's no conflict when merging. > > The only thing that might be controversial here is the > bridge migration path, but the patch was out for pretty > long without comments (besides a style comment by Stefan Weil, fixed that), > and it's not changing anything that isn't already broken. > Maybe it's fine, or maybe merging it will make people notice ;). > > The following changes since commit 4cdc1cd137e0b98766916a7cdf2d5a9b3c6632fa: > > target-mips: fix host CPU consumption when guest is idle (2010-12-27 00:58:06 +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 > Isaku Yamahata (7): > qbus: register reset handler for qbus whose parent is NULL > pc/piix: fix mismerge of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 > pcie: add flr support > build, pci: remove QMP dependency on core PCI code > qdev: export qdev_find_recursive() for later use > pci: introduce a helper function to convert qdev id to PCIDevice > pcie/aer: glue aer error injection into qemu monitor > > Michael S. Tsirkin (3): > pci: don't use bus number in migration, stub out > qdev: remove an unused function > pci: fix migration path for devices behind bridges > > Stefan Weil (1): > qdev: sysbus_get_default must not return a NULL pointer (fix regression) > > Makefile.objs | 4 +- > Makefile.target | 2 + > hmp-commands.hx | 25 +++++ > hw/pc_piix.c | 12 +-- > hw/pci-stub.c | 50 +++++++++++ > hw/pci.c | 82 ++++++++++++++++-- > hw/pci.h | 2 + > hw/pcie.c | 11 +-- > hw/pcie.h | 2 - > hw/pcie_aer.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ > hw/qdev.c | 22 +++-- > hw/qdev.h | 5 +- > hw/xio3130_downstream.c | 2 +- > hw/xio3130_upstream.c | 3 - > sysemu.h | 5 + > vl.c | 4 +- > 16 files changed, 415 insertions(+), 39 deletions(-) > create mode 100644 hw/pci-stub.c > > >