[Qemu-devel] [PULL] pci,msi,virtio

[Qemu-devel] [PULL] pci,msi,virtio

[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 <mst@redhat.com>

----------------------------------------------------------------
Alex Williamson (11):
      msix: fix PCIDevice naming inconsistency
      msix: Add simple BAR allocation MSIX setup functions
      ivshmem: Convert to msix_init_exclusive_bar() interface
      virtio: Convert to msix_init_exclusive_bar() interface
      msix: Move msix_mmio_read
      msix: Note endian TODO item
      msix: Split PBA into it's own MemoryRegion
      msix: Allow full specification of MSIX layout
      msix: Switch msix_uninit to return void
      pci: convert PCIUnregisterFunc to void
      pci: Unregister BARs before device exit

Alexey Kardashevskiy (1):
      msi/msix: added API to set MSI message address and data

Jan Kiszka (2):
      msix: drop unused msix_bar_size, require valid bar_size
      pci: Add INTx routing notifier

Michael S. Tsirkin (1):
      pci: Add pci_device_route_intx_to_irq

 hw/ac97.c               |   3 +-
 hw/e1000.c              |   3 +-
 hw/eepro100.c           |   3 +-
 hw/es1370.c             |   3 +-
 hw/ide/cmd646.c         |   4 +-
 hw/ide/ich.c            |   4 +-
 hw/ide/piix.c           |   4 +-
 hw/ide/via.c            |   4 +-
 hw/intel-hda.c          |   3 +-
 hw/ioh3420.c            |   8 +-
 hw/ivshmem.c            |  14 +--
 hw/lsi53c895a.c         |   4 +-
 hw/msi.c                |  17 +++
 hw/msi.h                |   1 +
 hw/msix.c               | 290 ++++++++++++++++++++++++++----------------------
 hw/msix.h               |  19 ++--
 hw/ne2000.c             |   3 +-
 hw/pci.c                |  54 ++++++++-
 hw/pci.h                |  35 ++++--
 hw/pci_bridge.c         |   3 +-
 hw/pci_bridge.h         |   2 +-
 hw/pci_bridge_dev.c     |  13 +--
 hw/pci_internals.h      |   1 +
 hw/pcnet-pci.c          |   3 +-
 hw/piix_pci.c           |  20 ++++
 hw/rtl8139.c            |   3 +-
 hw/usb/hcd-uhci.c       |   3 +-
 hw/virtio-pci.c         |  36 +++---
 hw/virtio-pci.h         |   1 -
 hw/wdt_i6300esb.c       |   4 +-
 hw/xio3130_downstream.c |   8 +-
 hw/xio3130_upstream.c   |   8 +-
 32 files changed, 336 insertions(+), 245 deletions(-)

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Andreas Färber]

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 <mst@redhat.com>

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.

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Anthony Liguori]

Andreas Färber <afaerber@suse.de> 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 <mst@redhat.com>
>
> 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.

Regards,

Anthony Liguori

>
> Regards,
> Andreas
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Andreas Färber]

Am 23.07.2012 18:39, schrieb Anthony Liguori:
> Andreas Färber <afaerber@suse.de> 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 <mst@redhat.com>
>>
>> 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.

The current tag is a "subset" of the pci branch though, it seems:

http://git.kernel.org/?p=virt/kvm/mst/qemu.git;a=shortlog;h=refs/heads/pci

I could of course try to cherry-pick my patches individually rather than
using git-rebase, but backporting them so far seemed strange enough to
ask first. :)

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Alex Williamson]

On Mon, 2012-07-23 at 11:39 -0500, Anthony Liguori wrote:
> Andreas Färber <afaerber@suse.de> 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 <mst@redhat.com>
> >
> > 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 <alex.williamson@redhat.com>
Date:   Mon Jul 23 10:59:43 2012 -0600

    esp: Update PCIUnregisterFunc function
    
    Function prototype changed in f90c2bcd
    
    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

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)

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Anthony Liguori]

On 07/23/2012 12:05 PM, Alex Williamson wrote:
> On Mon, 2012-07-23 at 11:39 -0500, Anthony Liguori wrote:
>> Andreas Färber<afaerber@suse.de>  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<mst@redhat.com>
>>>
>>> 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

I can't fix it without rewriting git history or breaking bisection which isn't 
something I'm really willing to do.

When does MST get back?  If it's not for a while, I can merge it all manually 
with a fixup.

Regards,

Anthony Liguori

>
> commit 34e37573f1a983dab43673d664eb500bc87a46d4
> Author: Alex Williamson<alex.williamson@redhat.com>
> Date:   Mon Jul 23 10:59:43 2012 -0600
>
>      esp: Update PCIUnregisterFunc function
>
>      Function prototype changed in f90c2bcd
>
>      Signed-off-by: Alex Williamson<alex.williamson@redhat.com>
>
> 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)
>
>
>
>

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Alex Williamson]

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ärber<afaerber@suse.de>  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<mst@redhat.com>
> >>>
> >>> 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
> 
> I can't fix it without rewriting git history or breaking bisection which isn't 
> something I'm really willing to do.
> 
> When does MST get back?  If it's not for a while, I can merge it all manually 
> with a fixup.

Next week, so (unfortunately for me) probably not worth you messing with
it.  Thanks,

Alex


> > commit 34e37573f1a983dab43673d664eb500bc87a46d4
> > Author: Alex Williamson<alex.williamson@redhat.com>
> > Date:   Mon Jul 23 10:59:43 2012 -0600
> >
> >      esp: Update PCIUnregisterFunc function
> >
> >      Function prototype changed in f90c2bcd
> >
> >      Signed-off-by: Alex Williamson<alex.williamson@redhat.com>
> >
> > 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)
> >
> >
> >
> >
> 
> 

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Andreas Färber]

Am 23.07.2012 20:29, schrieb Alex Williamson:
> On Mon, 2012-07-23 at 13:16 -0500, Anthony Liguori wrote:
>> On 07/23/2012 12:05 PM, Alex Williamson wrote:
>>> 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.
>>
>> I can't fix it without rewriting git history or breaking bisection which isn't 
>> something I'm really willing to do.
>>
>> When does MST get back?  If it's not for a while, I can merge it all manually 
>> with a fixup.
> 
> Next week, so (unfortunately for me) probably not worth you messing with
> it.

So Anthony, how urgent is your/Wanpeng's i440fx rework and through whose
queue is that supposed to go? Can you wait for mst's return? Or do you
want to handle it yourself and have mst rebase on it while at it?

My pci-host branch [1] is updated with mst's requested spapr_pci.c code
movement, so I just need to know whether to rebase on some other branch
and when to re-post. Soft Freeze is in three weeks iirc.

Regards,
Andreas

[1] http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/pci-host

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Alexey Kardashevskiy]

On 24/07/12 21:32, Andreas Färber wrote:
> Am 23.07.2012 20:29, schrieb Alex Williamson:
>> On Mon, 2012-07-23 at 13:16 -0500, Anthony Liguori wrote:
>>> On 07/23/2012 12:05 PM, Alex Williamson wrote:
>>>> 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.
>>>
>>> I can't fix it without rewriting git history or breaking bisection which isn't
>>> something I'm really willing to do.
>>>
>>> When does MST get back?  If it's not for a while, I can merge it all manually
>>> with a fixup.
>>
>> Next week, so (unfortunately for me) probably not worth you messing with
>> it.
>
> So Anthony, how urgent is your/Wanpeng's i440fx rework and through whose
> queue is that supposed to go? Can you wait for mst's return? Or do you
> want to handle it yourself and have mst rebase on it while at it?
>
> My pci-host branch [1] is updated with mst's requested spapr_pci.c code
> movement, so I just need to know whether to rebase on some other branch
> and when to re-post. Soft Freeze is in three weeks iirc.


A bit curious - where is spapr_pci.c going to be moved to?


>
> Regards,
> Andreas
>
> [1] http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/pci-host
>


-- 
Alexey

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Andreas Färber]

Am 25.07.2012 03:56, schrieb Alexey Kardashevskiy:
> On 24/07/12 21:32, Andreas Färber wrote:
>> My pci-host branch [1] is updated with mst's requested spapr_pci.c code
>> movement, so I just need to know whether to rebase on some other branch
>> and when to re-post. Soft Freeze is in three weeks iirc.
> 
> 
> A bit curious - where is spapr_pci.c going to be moved to?

Code movement, not file movement. You can see the patches in the link
below. The above referred to code moved from patch 1 to the spapr_pci
patch - Ben was previously cc'ed on the cover letter but despite my
complaining no one added the sPAPR machine to MAINTAINERS, so the
individual patches don't show up on qemu-ppc.

Andreas

>> [1] http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/pci-host

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Michael S. Tsirkin]

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ärber <afaerber@suse.de> 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 <mst@redhat.com>
> > >
> > > 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.

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 since
> MST is out of the office.  Thanks,
> 
> Alex
> commit 34e37573f1a983dab43673d664eb500bc87a46d4
> Author: Alex Williamson <alex.williamson@redhat.com>
> Date:   Mon Jul 23 10:59:43 2012 -0600
> 
>     esp: Update PCIUnregisterFunc function
>     
>     Function prototype changed in f90c2bcd
>     
>     Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> 
> 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)
> 

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Michael S. Tsirkin]

On Mon, Jul 23, 2012 at 11:39:17AM -0500, Anthony Liguori wrote:
> Andreas Färber <afaerber@suse.de> 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 <mst@redhat.com>
> >
> > 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.
> 
> Regards,
> 
> Anthony Liguori

Which git version do you have?  For me
git fetch git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
fetches the tag.

> >
> > Regards,
> > Andreas
> >
> > -- 
> > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL] pci,msi,virtio

[Michael S. Tsirkin]

On Mon, Jul 23, 2012 at 06:09:57PM +0200, Andreas Färber wrote:
> 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 <mst@redhat.com>
> 
> 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.
> 
> Regards,
> Andreas

I am guessing you mixed up upstream and onto options for git rebase,
happens to me a lot.

Should be something like

git rebase --onto pci origin/master


> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
>