qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 271b38: tests: avoid coroutine pool test cras

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 271b38: tests: avoid coroutine pool test crash
Date: Tue, 07 Jun 2016 09:00:06 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 271b385e7ec2f1ca23c5345599cd58d9651427e5
      
https://github.com/qemu/qemu/commit/271b385e7ec2f1ca23c5345599cd58d9651427e5
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M tests/test-coroutine.c

  Log Message:
  -----------
  tests: avoid coroutine pool test crash

Skip the test_co_queue test case if the coroutine pool is not enabled.
The test case does not work without the pool because it touches memory
belonging to a freed coroutine (on purpose).

Reported-by: Eduardo Habkost <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden


  Commit: 0d97891312d24891868e341674541f4147c7faf4
      
https://github.com/qemu/qemu/commit/0d97891312d24891868e341674541f4147c7faf4
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev-backup: Use bdrv_lookup_bs on target

This allows backing up to a BDS that has not been attached to any BB.

Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: efd7556708bdfb61dab259e08bd71fbe5680ddcd
      
https://github.com/qemu/qemu/commit/efd7556708bdfb61dab259e08bd71fbe5680ddcd
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev-backup: Don't move target AioContext if it's attached

If the BDS is attached, it will want to stay on the AioContext where its
BlockBackend is. Don't call bdrv_set_aio_context in this case.

Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 348295838384941d1e5420d10e57366c4e303d45
      
https://github.com/qemu/qemu/commit/348295838384941d1e5420d10e57366c4e303d45
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: Remove op blocker for dataplane

Block layer is prepared to unspecialize dataplane, an evidence is this
almost complete list of unblocked operations. It has all types except
two (actually three if DATAPLANE itself counts but blockdev.c makes sure
attaching twice is not possible): MIRROR_TARGET and BACKUP_TARGET.

blockdev-mirror refuses to start if target is attached, so the first is
not a problem.

By removing BACKUP_TARGET, blockdev-backup will become permissive to
write to a virtio-blk dataplane disk, but that is not worse than
non-dataplane given the latter is already possible. In either case,
blockdev.c always checks the target and source are on the same
AioContext, or bring them together if possible.

Signed-off-by: Fam Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ef8875b5491b6eb375d0636e6cfe430f93c058f9
      
https://github.com/qemu/qemu/commit/ef8875b5491b6eb375d0636e6cfe430f93c058f9
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M hw/scsi/virtio-scsi.c
    M include/hw/virtio/virtio-scsi.h

  Log Message:
  -----------
  virtio-scsi: Remove op blocker for dataplane

The previous patch dropped all op blockers from virtio-blk data plane.
The situation of virtio-scsi is exactly the same it can drop them too.

Signed-off-by: Fam Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3a90c4ace2c3b368be419f02b0b09ab596877706
      
https://github.com/qemu/qemu/commit/3a90c4ace2c3b368be419f02b0b09ab596877706
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M hw/scsi/virtio-scsi.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: drop duplicate virtio_queue_get_id() function

The virtio_queue_get_id() function is the lesser used duplicate of
virtio_get_queue_index().  Use the latter instead.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: a7944dfad09626320791e62be6e2c9ee204c0c1c
      
https://github.com/qemu/qemu/commit/a7944dfad09626320791e62be6e2c9ee204c0c1c
  Author: Kevin Wolf <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M block/io.c
    M include/block/block.h
    M trace-events

  Log Message:
  -----------
  block/io: Remove unused bdrv_aio_write_zeroes()

Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e3a4f91b4dda92666379e4865ea9847644f3bc19
      
https://github.com/qemu/qemu/commit/e3a4f91b4dda92666379e4865ea9847644f3bc19
  Author: Changlong Xie <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M include/block/blockjob.h

  Log Message:
  -----------
  iostatus: fix comments for block_job_iostatus_reset

Signed-off-by: Changlong Xie <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 117bc3fa22d359db6c4f0c10f34c8c9e00ed64af
      
https://github.com/qemu/qemu/commit/117bc3fa22d359db6c4f0c10f34c8c9e00ed64af
  Author: Peter Lieven <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M block/io.c
    M tests/qemu-iotests/077
    M tests/qemu-iotests/077.out

  Log Message:
  -----------
  block/io: optimize bdrv_co_pwritev for small requests

in a read-modify-write cycle a small request might cause
head and tail to fall into the same aligned block. Currently
QEMU reads the same block twice in this case which is
not necessary.

Signed-off-by: Peter Lieven <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 41574268b7e61ab98384ca7048f3fec862433401
      
https://github.com/qemu/qemu/commit/41574268b7e61ab98384ca7048f3fec862433401
  Author: Eric Blake <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M block/io.c
    M include/block/block.h

  Log Message:
  -----------
  block: Move BlockRequest type to io.c

I was thrown by the fact that the public type BlockRequest had
an anonymous union, but no obvious discriminator.  Turns out
that the only client of the second branch of the union was code
internal to io.c, now that commit 91c6e4b killed public
multiwrite, so move it into io.c and improve the comments.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>


  Commit: c8a9fd80719e63615dac12e3625223fb54aa8430
      
https://github.com/qemu/qemu/commit/c8a9fd80719e63615dac12e3625223fb54aa8430
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M block/io.c

  Log Message:
  -----------
  block: Drop bdrv_ioctl_bh_cb

Similar to the "!drv || !drv->bdrv_aio_ioctl" case above, here it is
okay to set co.ret and return. As pointed out by Paolo, a BH will be
created as necessary by the caller (bdrv_co_maybe_schedule_bh).
Besides, as pointed out by Kevin, "data" was leaked before.

Reported-by: Kevin Wolf <address@hidden>
Reported-by: Paolo Bonzini <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8860eabdee32f78d9a34273a340b8f74476bc9a0
      
https://github.com/qemu/qemu/commit/8860eabdee32f78d9a34273a340b8f74476bc9a0
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M tests/test-throttle.c
    M util/throttle.c

  Log Message:
  -----------
  throttle: refuse iops-size without iops-total/read/write

In a similar vein to commit ee2bdc33c913b7d765baa5aa338c29fb30a05c9a
("throttle: refuse bps_max/iops_max without bps/iops") it is likely that
the user made a configuration error if iops-size has been set but no
iops limit has been set.

Print an error message so the user can check their throttling
configuration.  They should either remove iops-size if they don't want
any throttling or specify one of iops-total, iops-read, or iops-write.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Message-id: address@hidden


  Commit: 40eeb397c8b8008aa13bca3a8cb25d152eb5ab44
      
https://github.com/qemu/qemu/commit/40eeb397c8b8008aa13bca3a8cb25d152eb5ab44
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M block/io.c
    M blockdev.c
    M hw/block/dataplane/virtio-blk.c
    M hw/scsi/virtio-scsi.c
    M hw/virtio/virtio.c
    M include/block/block.h
    M include/block/blockjob.h
    M include/hw/virtio/virtio-scsi.h
    M include/hw/virtio/virtio.h
    M tests/qemu-iotests/077
    M tests/qemu-iotests/077.out
    M tests/test-coroutine.c
    M tests/test-throttle.c
    M trace-events
    M util/throttle.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

# gpg: Signature made Tue 07 Jun 2016 15:26:09 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request:
  throttle: refuse iops-size without iops-total/read/write
  block: Drop bdrv_ioctl_bh_cb
  block: Move BlockRequest type to io.c
  block/io: optimize bdrv_co_pwritev for small requests
  iostatus: fix comments for block_job_iostatus_reset
  block/io: Remove unused bdrv_aio_write_zeroes()
  virtio: drop duplicate virtio_queue_get_id() function
  virtio-scsi: Remove op blocker for dataplane
  virtio-blk: Remove op blocker for dataplane
  blockdev-backup: Don't move target AioContext if it's attached
  blockdev-backup: Use bdrv_lookup_bs on target
  tests: avoid coroutine pool test crash

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/79cecb352060...40eeb397c8b8
reply via email to
[Prev in Thread] Current Thread [Next in Thread]