mbox

[PULL,0/2] QOMify AXI stream for Xilinx AXI ethernet/DMA

Message ID 1344568571-11755-1-git-send-email-peter.crosthwaite@petalogix.com
State New
Headers show

Pull-request

git://developer.petalogix.com/public/qemu.git for-upstream/axi-stream.next

Message

Peter A. G. Crosthwaite Aug. 10, 2012, 3:16 a.m. UTC
The following changes since commit 3d1d9652978ac5a32a0beb4bdf6065ca39440d89:
  Bruce Rogers (1):
        handle device help before accelerator set up

are available in the git repository at:

  git://developer.petalogix.com/public/qemu.git for-upstream/axi-stream.next

Anthony Liguori (1):
      qom: Reimplement Interfaces

Peter A. G. Crosthwaite (1):
      xilinx_axi*: Re-implemented interconnect

 hw/Makefile.objs         |    1 +
 hw/petalogix_ml605_mmu.c |   24 +++--
 hw/stream.c              |   23 +++++
 hw/stream.h              |   31 +++++++
 hw/xilinx.h              |   22 ++---
 hw/xilinx_axidma.c       |   74 +++++++++-------
 hw/xilinx_axidma.h       |   39 --------
 hw/xilinx_axienet.c      |   32 ++++---
 include/qemu/object.h    |   46 ++++++----
 qom/object.c             |  220 ++++++++++++++++++----------------------------
 10 files changed, 255 insertions(+), 257 deletions(-)
 create mode 100644 hw/stream.c
 create mode 100644 hw/stream.h
 delete mode 100644 hw/xilinx_axidma.h

Comments

Edgar E. Iglesias Aug. 13, 2012, 9:41 a.m. UTC | #1
On Fri, Aug 10, 2012 at 01:16:09PM +1000, Peter A. G. Crosthwaite wrote:
> The following changes since commit 3d1d9652978ac5a32a0beb4bdf6065ca39440d89:
>   Bruce Rogers (1):
>         handle device help before accelerator set up
> 
> are available in the git repository at:
> 
>   git://developer.petalogix.com/public/qemu.git for-upstream/axi-stream.next
> 
> Anthony Liguori (1):
>       qom: Reimplement Interfaces
> 
> Peter A. G. Crosthwaite (1):
>       xilinx_axi*: Re-implemented interconnect

Applied, thanks Peter.

Cheers,
Edgar


> 
>  hw/Makefile.objs         |    1 +
>  hw/petalogix_ml605_mmu.c |   24 +++--
>  hw/stream.c              |   23 +++++
>  hw/stream.h              |   31 +++++++
>  hw/xilinx.h              |   22 ++---
>  hw/xilinx_axidma.c       |   74 +++++++++-------
>  hw/xilinx_axidma.h       |   39 --------
>  hw/xilinx_axienet.c      |   32 ++++---
>  include/qemu/object.h    |   46 ++++++----
>  qom/object.c             |  220 ++++++++++++++++++----------------------------
>  10 files changed, 255 insertions(+), 257 deletions(-)
>  create mode 100644 hw/stream.c
>  create mode 100644 hw/stream.h
>  delete mode 100644 hw/xilinx_axidma.h
Andreas Färber Aug. 13, 2012, 4:50 p.m. UTC | #2
Hej Edgar,

Am 13.08.2012 11:41, schrieb Edgar E. Iglesias:
> On Fri, Aug 10, 2012 at 01:16:09PM +1000, Peter A. G. Crosthwaite wrote:
>> The following changes since commit 3d1d9652978ac5a32a0beb4bdf6065ca39440d89:
>>   Bruce Rogers (1):
>>         handle device help before accelerator set up
>>
>> are available in the git repository at:
>>
>>   git://developer.petalogix.com/public/qemu.git for-upstream/axi-stream.next
>>
>> Anthony Liguori (1):
>>       qom: Reimplement Interfaces
>>
>> Peter A. G. Crosthwaite (1):
>>       xilinx_axi*: Re-implemented interconnect
> 
> Applied, thanks Peter.

Sorry to bug you again, but I notice that in qemu.git HEAD these patches
have changed order. I have no clue if the introduction of a first
interface user before the infrastructure changes causes any
bisectability problems in practice, but since the above branch matches
this pull request it suggests that you are not using git-merge and may
want to check the script you are using in its place (git-rev-list?).

Regards,
Andreas
Edgar E. Iglesias Aug. 13, 2012, 5:58 p.m. UTC | #3
On Mon, Aug 13, 2012 at 06:50:43PM +0200, Andreas Färber wrote:
> Hej Edgar,
> 
> Am 13.08.2012 11:41, schrieb Edgar E. Iglesias:
> > On Fri, Aug 10, 2012 at 01:16:09PM +1000, Peter A. G. Crosthwaite wrote:
> >> The following changes since commit 3d1d9652978ac5a32a0beb4bdf6065ca39440d89:
> >>   Bruce Rogers (1):
> >>         handle device help before accelerator set up
> >>
> >> are available in the git repository at:
> >>
> >>   git://developer.petalogix.com/public/qemu.git for-upstream/axi-stream.next
> >>
> >> Anthony Liguori (1):
> >>       qom: Reimplement Interfaces
> >>
> >> Peter A. G. Crosthwaite (1):
> >>       xilinx_axi*: Re-implemented interconnect
> > 
> > Applied, thanks Peter.
> 
> Sorry to bug you again, but I notice that in qemu.git HEAD these patches
> have changed order. I have no clue if the introduction of a first
> interface user before the infrastructure changes causes any
> bisectability problems in practice, but since the above branch matches
> this pull request it suggests that you are not using git-merge and may
> want to check the script you are using in its place (git-rev-list?).

Hi,

Yeah, I had problems reaching the host so applied manually with git am.
I must have reversed the order between these, sorry. I guess the
bisectability harm is already done...

Cheers,
Edgar