From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StNOI-0001ui-I9 for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:29:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StNOH-0001CC-8f for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:29:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44768) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StNOH-0001Bw-0N for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:29:57 -0400 Message-ID: <1343068192.2229.284.camel@bling.home> From: Alex Williamson Date: Mon, 23 Jul 2012 12:29:52 -0600 In-Reply-To: <500D94EC.5000907@codemonkey.ws> References: <20120719151533.GA15648@redhat.com> <500D7755.90407@suse.de> <87txwyh1oq.fsf@codemonkey.ws> <1343063125.2229.269.camel@bling.home> <500D94EC.5000907@codemonkey.ws> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 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: Anthony Liguori Cc: aik@ozlabs.ru, jan.kiszka@siemens.com, qemu-devel@nongnu.org, Andreas =?ISO-8859-1?Q?F=E4rber?= , "Michael S. Tsirkin" On Mon, 2012-07-23 at 13:16 -0500, Anthony Liguori wrote: > On 07/23/2012 12:05 PM, Alex Williamson wrote: > > On Mon, 2012-07-23 at 11:39 -0500, Anthony Liguori wrote: > >> Andreas F=C3=A4rber writes: > >> > >>> Am 19.07.2012 17:15, schrieb Michael S. Tsirkin: > >>>> The following changes since commit 80aa796bf38b7ef21daa42673b47115= 10c450d8a: > >>>> > >>>> 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_ant= hony > >>>> > >>>> for you to fetch changes up to 932d4a42afa28829fadf3cbfbb0507cc09a= afd8b: > >>>> > >>>> msi/msix: added API to set MSI message address and data (2012-0= 7-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 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. > >> > >> > >> 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 si= nce > > MST is out of the office. Thanks, > > > > Alex >=20 > I can't fix it without rewriting git history or breaking bisection whic= h isn't=20 > something I'm really willing to do. >=20 > When does MST get back? If it's not for a while, I can merge it all ma= nually=20 > with a fixup. Next week, so (unfortunately for me) probably not worth you messing with it. 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 =3D DO_UPCAST(PCIESPState, dev, d); > > > > memory_region_destroy(&pci->io); > > - > > - return 0; > > } > > > > static void esp_pci_class_init(ObjectClass *klass, void *data) > > > > > > > > >=20 >=20