[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/48] Block patches
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PULL 00/48] Block patches |
Date: |
Fri, 29 Jan 2016 17:59:27 +0000 |
On 29 January 2016 at 17:37, Kevin Wolf <address@hidden> wrote:
> The following changes since commit 047e363b05679724d6b784c6ec6310697fe48ba0:
>
> Merge remote-tracking branch
> 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging (2016-01-22
> 15:19:21 +0000)
>
> are available in the git repository at:
>
>
> git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to ae873754e7b51f66f2b944f49b7baff2730ec511:
>
> Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-01-29'
> into queue-block (2016-01-29 18:11:39 +0100)
>
> ----------------------------------------------------------------
>
> Block layer patches
Hi. I'm afraid this has some conflicts in hw/block/fdc.c which aren't
immediately obvious how to resolve. (Looks like clash between the
'add pick_drive' patch in John's recent IDE pull and Max's tray
status stuff here.)
Can you fix up and resend, please?
thanks
-- PMM
- [Qemu-devel] [PULL 38/48] parallels: Assign bs->file->bs to file in parallels_co_get_block_status, (continued)
- [Qemu-devel] [PULL 38/48] parallels: Assign bs->file->bs to file in parallels_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 42/48] vpc: Assign bs->file->bs to file in vpc_co_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 44/48] vmdk: Return extent's file in bdrv_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 33/48] block: Add "file" output parameter to block status query functions, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 31/48] iotests: Add test for block jobs and BDS ejection, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 47/48] qemu-img: Make MapEntry a QAPI struct, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 43/48] vmdk: Fix calculation of block status's offset, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 46/48] qemu-img: In "map", use the returned "file" from bdrv_get_block_status, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 48/48] iotests: Add "qemu-img map" test for VMDK extents, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 45/48] block: Use returned *file in bdrv_co_get_block_status, Kevin Wolf, 2016/01/29
- Re: [Qemu-devel] [PULL 00/48] Block patches,
Peter Maydell <=