Patchwork [PULL] pci,msi,virtio

login
register
mail settings
Submitter Michael S. Tsirkin
Date July 19, 2012, 3:15 p.m.
Message ID <20120719151533.GA15648@redhat.com>
Download mbox
Permalink /patch/171961/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony

Comments

Michael S. Tsirkin - July 19, 2012, 3:15 p.m.
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(-)
Andreas Färber - July 23, 2012, 4:09 p.m.
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
Anthony Liguori - July 23, 2012, 4:39 p.m.
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
Andreas Färber - July 23, 2012, 4:47 p.m.
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
Michael S. Tsirkin - July 29, 2012, 2:17 p.m.
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
Michael S. Tsirkin - July 29, 2012, 2:21 p.m.
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
>