diff options
| author | Peter Maydell | 2016-07-21 21:12:37 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-21 21:12:37 +0200 |
| commit | 206d0c24361a083fbdcb2cc86fb75dc8b7f251a2 (patch) | |
| tree | 75dd4919f09372b4ef9928084ece6c7999ff76fc /tests | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-07-21-1... (diff) | |
| parent | intel_iommu: avoid unnamed fields (diff) | |
| download | qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.tar.gz qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.tar.xz qemu-206d0c24361a083fbdcb2cc86fb75dc8b7f251a2.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, pci, virtio: new features, cleanups, fixes
- interrupt remapping for intel iommus
- a bunch of virtio cleanups
- fixes all over the place
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 21 Jul 2016 18:49:30 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream: (57 commits)
intel_iommu: avoid unnamed fields
virtio: Update migration docs
virtio-gpu: Wrap in vmstate
virtio-gpu: Use migrate_add_blocker for virgl migration blocking
virtio-input: Wrap in vmstate
9pfs: Wrap in vmstate
virtio-serial: Wrap in vmstate
virtio-net: Wrap in vmstate
virtio-balloon: Wrap in vmstate
virtio-rng: Wrap in vmstate
virtio-blk: Wrap in vmstate
virtio-scsi: Wrap in vmstate
virtio: Migration helper function and macro
virtio-serial: Remove old migration version support
virtio-net: Remove old migration version support
virtio-scsi: Replace HandleOutput typedef
Revert "mirror: Workaround for unexpected iohandler events during completion"
virtio-scsi: Call virtio_add_queue_aio
virtio-blk: Call virtio_add_queue_aio
virtio: Introduce virtio_add_queue_aio
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/prom-env-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c index 6df57d224b..7a628574c3 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -30,7 +30,7 @@ static void check_guest_memory(void) int i; /* Poll until code has run and modified memory. Wait at most 30 seconds */ - for (i = 0; i < 3000; ++i) { + for (i = 0; i < 10000; ++i) { signature = readl(ADDRESS); if (signature == MAGIC) { break; |