From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvU0I-0007Mm-Hq for qemu-devel@nongnu.org; Sun, 29 Jul 2012 09:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SvU0H-00064I-CA for qemu-devel@nongnu.org; Sun, 29 Jul 2012 09:57:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvU0H-00064A-49 for qemu-devel@nongnu.org; Sun, 29 Jul 2012 09:57:53 -0400 Date: Sun, 29 Jul 2012 16:58:33 +0300 From: "Michael S. Tsirkin" Message-ID: <20120729135833.GG10041@redhat.com> References: <20120719151533.GA15648@redhat.com> <500D7755.90407@suse.de> <87txwyh1oq.fsf@codemonkey.ws> <1343063125.2229.269.camel@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1343063125.2229.269.camel@bling.home> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL] pci,msi,virtio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: aik@ozlabs.ru, jan.kiszka@siemens.com, Andreas =?iso-8859-1?Q?F=E4rber?= , Anthony Liguori , qemu-devel@nongnu.org On Mon, Jul 23, 2012 at 11:05:25AM -0600, Alex Williamson wrote: > On Mon, 2012-07-23 at 11:39 -0500, Anthony Liguori wrote: > > Andreas F=E4rber writes: > >=20 > > > Am 19.07.2012 17:15, schrieb Michael S. Tsirkin: > > >> The following changes since commit 80aa796bf38b7ef21daa42673b47115= 10c450d8a: > > >>=20 > > >> pci_bridge_dev: fix error path in pci_bridge_dev_initfn() (2012-= 06-11 22:55:13 +0300) > > >>=20 > > >> are available in the git repository at: > > >>=20 > > >> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anth= ony > > >>=20 > > >> for you to fetch changes up to 932d4a42afa28829fadf3cbfbb0507cc09a= afd8b: > > >>=20 > > >> msi/msix: added API to set MSI message address and data (2012-07= -19 17:56:42 +0300) > > >>=20 > > >> ---------------------------------------------------------------- > > >> pci,msi,virtio > > >>=20 > > >> 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. > > >>=20 > > >> So no new functionality and some unused APIs but it looks like > > >> merging will help people make progress. > > >>=20 > > >> Signed-off-by: Michael S. Tsirkin > > > > > > Usually, PULLs are expected to carry the individual patches as repl= ies. > > > > > > But more important, did something go wrong with rebasing before sen= ding > > > out the PULL? June 11 is more than a month ago. And if I try to reb= ase > > > 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" br= anch > > > seem to match in date at least. > >=20 > >=20 > > It's a tag, not a branch. > >=20 > > 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. >=20 > 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. I didn't rebase my tree, this one is newer. > Anthony, it'd be great if we could merge and fix this in your tree sinc= e > MST is out of the office. Thanks, >=20 > Alex > commit 34e37573f1a983dab43673d664eb500bc87a46d4 > Author: Alex Williamson > Date: Mon Jul 23 10:59:43 2012 -0600 >=20 > esp: Update PCIUnregisterFunc function > =20 > Function prototype changed in f90c2bcd > =20 > Signed-off-by: Alex Williamson >=20 > 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; > } > =20 > -static int esp_pci_scsi_uninit(PCIDevice *d) > +static void esp_pci_scsi_uninit(PCIDevice *d) > { > PCIESPState *pci =3D DO_UPCAST(PCIESPState, dev, d); > =20 > memory_region_destroy(&pci->io); > - > - return 0; > } > =20 > static void esp_pci_class_init(ObjectClass *klass, void *data) >=20