From patchwork Mon Dec 27 17:21:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 76796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C8FEB6F2B for ; Tue, 28 Dec 2010 04:22:41 +1100 (EST) Received: from localhost ([127.0.0.1]:53895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PXGmK-0003PI-9W for incoming@patchwork.ozlabs.org; Mon, 27 Dec 2010 12:22:36 -0500 Received: from [140.186.70.92] (port=60264 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PXGlq-0003P2-1v for qemu-devel@nongnu.org; Mon, 27 Dec 2010 12:22:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PXGlp-00070a-4a for qemu-devel@nongnu.org; Mon, 27 Dec 2010 12:22:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PXGlo-00070L-SZ for qemu-devel@nongnu.org; Mon, 27 Dec 2010 12:22:05 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRHM00n008445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 12:22:00 -0500 Received: from redhat.com (vpn-11-249.rdu.redhat.com [10.11.11.249]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id oBRHLvt0017032; Mon, 27 Dec 2010 12:21:58 -0500 Date: Mon, 27 Dec 2010 19:21:40 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, Anthony Liguori Message-ID: <20101227172140.GA18898@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PULL] piix, pci, qdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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