From patchwork Mon Jul 23 17:05:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 172714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E01EF2C036E for ; Tue, 24 Jul 2012 03:05:48 +1000 (EST) Received: from localhost ([::1]:57932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StM4o-0004pu-Qd for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2012 13:05:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StM4Y-0004Wi-8T for qemu-devel@nongnu.org; Mon, 23 Jul 2012 13:05:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StM4X-0006bp-3a for qemu-devel@nongnu.org; Mon, 23 Jul 2012 13:05:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StM4W-0006bW-Rn for qemu-devel@nongnu.org; Mon, 23 Jul 2012 13:05:29 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6NH5QL2015082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 Jul 2012 13:05:26 -0400 Received: from [10.3.113.63] (ovpn-113-63.phx2.redhat.com [10.3.113.63]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6NH5PX2014815; Mon, 23 Jul 2012 13:05:25 -0400 Message-ID: <1343063125.2229.269.camel@bling.home> From: Alex Williamson To: Anthony Liguori Date: Mon, 23 Jul 2012 11:05:25 -0600 In-Reply-To: <87txwyh1oq.fsf@codemonkey.ws> References: <20120719151533.GA15648@redhat.com> <500D7755.90407@suse.de> <87txwyh1oq.fsf@codemonkey.ws> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id q6NH5QL2015082 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, aik@ozlabs.ru, jan.kiszka@siemens.com, Andreas =?ISO-8859-1?Q?F=E4rber?= , "Michael S. Tsirkin" Subject: Re: [Qemu-devel] [PULL] pci,msi,virtio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Mon, 2012-07-23 at 11:39 -0500, Anthony Liguori wrote: > Andreas Färber writes: > > > Am 19.07.2012 17:15, schrieb Michael S. Tsirkin: > >> The following changes since commit 80aa796bf38b7ef21daa42673b4711510c450d8a: > >> > >> pci_bridge_dev: fix error path in pci_bridge_dev_initfn() (2012-06-11 22:55:13 +0300) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony > >> > >> for you to fetch changes up to 932d4a42afa28829fadf3cbfbb0507cc09aafd8b: > >> > >> msi/msix: added API to set MSI message address and data (2012-07-19 17:56:42 +0300) > >> > >> ---------------------------------------------------------------- > >> pci,msi,virtio > >> > >> This pull includes preparation patches mostly by Jan and Alex > >> that should help merge device assignment down the road. > >> And there's a new API needed for emulating POWER firmware. > >> > >> So no new functionality and some unused APIs but it looks like > >> merging will help people make progress. > >> > >> Signed-off-by: Michael S. Tsirkin > > > > Usually, PULLs are expected to carry the individual patches as replies. > > > > But more important, did something go wrong with rebasing before sending > > out the PULL? June 11 is more than a month ago. And if I try to rebase > > my pci_host branch on your "pci" branch it tries to replay loads of > > really old post-1.1 commits (e.g., my "Pass PowerPCCPU to...") and > > fails... am I doing something wrong? "for_anthony" tag and "pci" branch > > seem to match in date at least. > > > It's a tag, not a branch. > > I had to add an explicit remote to pull tags in. I'm not sure if > there's a better way to do it in git. Looks like it merged ok for me, but you'll need this to complete the PCIUnregisterFunc conversion. Not sure how this built in MST's tree. Anthony, it'd be great if we could merge and fix this in your tree since MST is out of the office. Thanks, Alex commit 34e37573f1a983dab43673d664eb500bc87a46d4 Author: Alex Williamson Date: Mon Jul 23 10:59:43 2012 -0600 esp: Update PCIUnregisterFunc function Function prototype changed in f90c2bcd Signed-off-by: Alex Williamson diff --git a/hw/esp.c b/hw/esp.c index c6422ad..a011347 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -1153,13 +1153,11 @@ static int esp_pci_scsi_init(PCIDevice *dev) return 0; } -static int esp_pci_scsi_uninit(PCIDevice *d) +static void esp_pci_scsi_uninit(PCIDevice *d) { PCIESPState *pci = DO_UPCAST(PCIESPState, dev, d); memory_region_destroy(&pci->io); - - return 0; } static void esp_pci_class_init(ObjectClass *klass, void *data)