* [Qemu-devel] [PULL v2 for-2.5] Block pull request
@ 2015-11-10 15:06 Stefan Hajnoczi
2015-11-11 11:25 ` Peter Maydell
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Hajnoczi @ 2015-11-10 15:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
v2:
* Rebase onto Kevin's block pull request
The following changes since commit c400bddb916268394e352f82809eb4728424a5b1:
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-10' into queue-block (2015-11-10 14:59:26 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/block-pull-request
for you to fetch changes up to 7651e1c68acdaf60954668540c9df778397631d6:
block: Update copyright of the accounting code (2015-11-10 14:48:26 +0000)
----------------------------------------------------------------
----------------------------------------------------------------
Alberto Garcia (21):
xen_disk: Account for flush operations
ide: Account for write operations correctly
block: define 'clock_type' for the accounting code
util: Infrastructure for computing recent averages
block: Add idle_time_ns to BlockDeviceStats
block: Add statistics for failed and invalid I/O operations
block: Allow configuring whether to account failed and invalid ops
block: Compute minimum, maximum and average I/O latencies
block: Add average I/O queue depth to BlockDeviceTimedStats
block: New option to define the intervals for collecting I/O statistics
qemu-io: Account for failed, invalid and flush operations
block: Use QEMU_CLOCK_VIRTUAL for the accounting code in qtest mode
iotests: Add test for the block device statistics
nvme: Account for failed and invalid operations
virtio-blk: Account for failed and invalid operations
xen_disk: Account for failed and invalid operations
atapi: Account for failed and invalid operations
ide: Account for failed and invalid operations
macio: Account for failed operations
scsi-disk: Account for failed operations
block: Update copyright of the accounting code
Fam Zheng (15):
block: Add more types for tracked request
block: Track flush requests
block: Track discard requests
iscsi: Emulate commands in iscsi_aio_ioctl as iscsi_ioctl
block: Add ioctl parameter fields to BlockRequest
block: Emulate bdrv_ioctl with bdrv_aio_ioctl and track both
block: Drop BlockDriver.bdrv_ioctl
block: Introduce BlockDriver.bdrv_drain callback
qed: Implement .bdrv_drain
backup: Extract dirty bitmap handling as a separate function
blockjob: Introduce reference count and fix reference to job->bs
blockjob: Add .commit and .abort block job actions
blockjob: Add "completed" and "ret" in BlockJob
blockjob: Simplify block_job_finish_sync
block: Add block job transactions
John Snow (6):
iotests: add transactional incremental backup test
block: rename BlkTransactionState and BdrvActionOps
block/backup: Rely on commit/abort for cleanup
block: Add BlockJobTxn support to backup_run
block: add transactional properties
iotests: 124 - transactional failure test
Stefan Hajnoczi (1):
tests: add BlockJobTxn unit test
block.c | 19 ++++++-
block/accounting.c | 123 ++++++++++++++++++++++++++++++++++++++++++--
block/backup.c | 50 +++++++++++++-----
block/block-backend.c | 1 +
block/io.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++--------
block/iscsi.c | 73 ++++++++++++++-------------
block/mirror.c | 2 +-
block/qapi.c | 51 +++++++++++++++++++
block/qed.c | 13 +++++
block/raw-posix.c | 8 ---
block/raw_bsd.c | 6 ---
blockdev.c | 485 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
blockjob.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
docs/bitmaps.md | 6 +--
hmp.c | 4 +-
hw/block/nvme.c | 11 ++--
hw/block/virtio-blk.c | 4 +-
hw/block/xen_disk.c | 27 +++++++++-
hw/ide/atapi.c | 31 +++++++-----
hw/ide/core.c | 12 +++--
hw/ide/macio.c | 12 ++++-
hw/scsi/scsi-disk.c | 46 +++++++++++------
include/block/accounting.h | 28 ++++++++++
include/block/block.h | 18 +++++--
include/block/block_int.h | 23 +++++++--
include/block/blockjob.h | 85 +++++++++++++++++++++++++++++--
include/qemu/timed-average.h | 64 +++++++++++++++++++++++
qapi-schema.json | 56 ++++++++++++++++++--
qapi/block-core.json | 103 ++++++++++++++++++++++++++++++++++++-
qemu-img.c | 3 --
qemu-io-cmds.c | 9 ++++
qmp-commands.hx | 82 +++++++++++++++++++++++++++---
tests/Makefile | 7 +++
tests/qemu-iotests/124 | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
tests/qemu-iotests/124.out | 4 +-
tests/qemu-iotests/136 | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/136.out | 5 ++
tests/qemu-iotests/group | 1 +
tests/test-blockjob-txn.c | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/test-timed-average.c | 90 +++++++++++++++++++++++++++++++++
util/Makefile.objs | 1 +
util/timed-average.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
42 files changed, 2618 insertions(+), 296 deletions(-)
create mode 100644 include/qemu/timed-average.h
create mode 100644 tests/qemu-iotests/136
create mode 100644 tests/qemu-iotests/136.out
create mode 100644 tests/test-blockjob-txn.c
create mode 100644 tests/test-timed-average.c
create mode 100644 util/timed-average.c
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PULL v2 for-2.5] Block pull request
2015-11-10 15:06 [Qemu-devel] [PULL v2 for-2.5] Block pull request Stefan Hajnoczi
@ 2015-11-11 11:25 ` Peter Maydell
2015-11-11 15:42 ` Stefan Hajnoczi
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2015-11-11 11:25 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers
On 10 November 2015 at 15:06, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> v2:
> * Rebase onto Kevin's block pull request
>
> The following changes since commit c400bddb916268394e352f82809eb4728424a5b1:
>
> Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-10' into queue-block (2015-11-10 14:59:26 +0100)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 7651e1c68acdaf60954668540c9df778397631d6:
>
> block: Update copyright of the accounting code (2015-11-10 14:48:26 +0000)
>
> ----------------------------------------------------------------
I'm assuming you'll need to re-rebase this when Kevin sends out a
fixed version of his pullreq; please send another mail when you do
that (ie I am dropping this from my list of things to process).
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL v2 for-2.5] Block pull request
2015-11-11 11:25 ` Peter Maydell
@ 2015-11-11 15:42 ` Stefan Hajnoczi
2015-11-11 15:50 ` Kevin Wolf
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Hajnoczi @ 2015-11-11 15:42 UTC (permalink / raw)
To: Peter Maydell, Kevin Wolf; +Cc: QEMU Developers, Stefan Hajnoczi
On Wed, Nov 11, 2015 at 11:25 AM, Peter Maydell
<peter.maydell@linaro.org> wrote:
> On 10 November 2015 at 15:06, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> v2:
>> * Rebase onto Kevin's block pull request
>>
>> The following changes since commit c400bddb916268394e352f82809eb4728424a5b1:
>>
>> Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-10' into queue-block (2015-11-10 14:59:26 +0100)
>>
>> are available in the git repository at:
>>
>> git://github.com/stefanha/qemu.git tags/block-pull-request
>>
>> for you to fetch changes up to 7651e1c68acdaf60954668540c9df778397631d6:
>>
>> block: Update copyright of the accounting code (2015-11-10 14:48:26 +0000)
>>
>> ----------------------------------------------------------------
>
> I'm assuming you'll need to re-rebase this when Kevin sends out a
> fixed version of his pullreq; please send another mail when you do
> that (ie I am dropping this from my list of things to process).
I'm currently travelling and will be offline until Friday.
Maybe Kevin can rebase this pull request onto his fixed one? It
shouldn't be a huge job (this v2 was pretty easy to rebase onto
Kevin's v1 pull request).
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL v2 for-2.5] Block pull request
2015-11-11 15:42 ` Stefan Hajnoczi
@ 2015-11-11 15:50 ` Kevin Wolf
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2015-11-11 15:50 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Peter Maydell, QEMU Developers, Stefan Hajnoczi
Am 11.11.2015 um 16:42 hat Stefan Hajnoczi geschrieben:
> On Wed, Nov 11, 2015 at 11:25 AM, Peter Maydell
> <peter.maydell@linaro.org> wrote:
> > On 10 November 2015 at 15:06, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >> v2:
> >> * Rebase onto Kevin's block pull request
> >>
> >> The following changes since commit c400bddb916268394e352f82809eb4728424a5b1:
> >>
> >> Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-10' into queue-block (2015-11-10 14:59:26 +0100)
> >>
> >> are available in the git repository at:
> >>
> >> git://github.com/stefanha/qemu.git tags/block-pull-request
> >>
> >> for you to fetch changes up to 7651e1c68acdaf60954668540c9df778397631d6:
> >>
> >> block: Update copyright of the accounting code (2015-11-10 14:48:26 +0000)
> >>
> >> ----------------------------------------------------------------
> >
> > I'm assuming you'll need to re-rebase this when Kevin sends out a
> > fixed version of his pullreq; please send another mail when you do
> > that (ie I am dropping this from my list of things to process).
>
> I'm currently travelling and will be offline until Friday.
>
> Maybe Kevin can rebase this pull request onto his fixed one? It
> shouldn't be a huge job (this v2 was pretty easy to rebase onto
> Kevin's v1 pull request).
I would assume that there are no merge conflicts, but if a rebase is
necessary, I can do that as soon as my pull request makes it through.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-11 15:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-10 15:06 [Qemu-devel] [PULL v2 for-2.5] Block pull request Stefan Hajnoczi
2015-11-11 11:25 ` Peter Maydell
2015-11-11 15:42 ` Stefan Hajnoczi
2015-11-11 15:50 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).