~ubuntu-virt/qemu/+git/qemu-lp-import:stable-2.0

Last commit made on 2014-08-18
Get this branch:
git clone -b stable-2.0 https://git.launchpad.net/~ubuntu-virt/qemu/+git/qemu-lp-import

Branch merges

Branch information

Name:
stable-2.0
Repository:
lp:~ubuntu-virt/qemu/+git/qemu-lp-import

Recent commits

f053f6b... by Michael Roth

Update VERSION for 2.0.2 release

Signed-off-by: Michael Roth <email address hidden>

3d79eb5... by Luiz Capitulino

audio: fmopl: drop INLINE macro

This commit expands all uses of the INLINE macro and drop it.

The reason for this is to avoid clashes with external libraries with
bad name conventions and also because renaming keywords is not a good
practice.

Signed-off-by: Luiz Capitulino <email address hidden>
(cherry picked from commit 37f6be977aefb5de8afe3ba62a95e88918381305)
Signed-off-by: Michael Roth <email address hidden>

6ec48b0... by Luiz Capitulino

fpu: softfloat: drop INLINE macro

This commit expands all uses of the INLINE macro and drop it.

The reason for this is to avoid clashes with external libraries with
bad name conventions and also because renaming keywords is not a good
practice.

PS: I'm fine with this change to be licensed under softfloat-2a or
softfloat-2b.

Signed-off-by: Luiz Capitulino <email address hidden>
(cherry picked from commit a49db98d1f85ada0c4e5bb22bd93d541e7159c43)
Signed-off-by: Michael Roth <email address hidden>

5433472... by Michael Roth

Update VERSION for 2.0.1 release

Signed-off-by: Michael Roth <email address hidden>

3c548f6... by Kevin Wolf

mirror: Fix qiov size for short requests

When mirroring an image of a size that is not a multiple of the
mirror job granularity, the last request would have the right nb_sectors
argument, but a qiov that is rounded up to the next multiple of the
granularity. Don't do this.

This fixes a segfault that is caused by raw-posix being confused by this
and allocating a buffer with request length, but operating on it with
qiov length.

[s/Driver/Drive/ in qemu-iotests 041 as suggested by Eric
--Stefan]

Reported-by: Eric Blake <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
Tested-by: Eric Blake <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Signed-off-by: Stefan Hajnoczi <email address hidden>
(cherry picked from commit 5a0f6fd5c84573387056e0464a7fc0c6fb70b2dc)

Conflicts:
 tests/qemu-iotests/041.out

*updated 041.out to reflect tests missing from 2.0

Signed-off-by: Michael Roth <email address hidden>

d0d83e8... by Fam Zheng

qemu-iotests: Test 0-length image for mirror

All behavior and invariant should hold for images with 0 length, so
add a class to repeat all the tests in TestSingleDrive.

Hide two unapplicable test methods that would fail with 0 image length
because it's also used as cluster size.

Signed-off-by: Fam Zheng <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit 3b9f27d2b34cb8c5cc6cec993712c7e1943e9de9)
Signed-off-by: Michael Roth <email address hidden>

98103fa... by Jeff Cody

block: make 'top' argument to block-commit optional

Now that active layer block-commit is supported, the 'top' argument
no longer needs to be mandatory.

Change it to optional, with the default being the active layer in the
device chain.

[kwolf: Rebased and resolved conflict in tests/qemu-iotests/040]

Reviewed-by: Eric Blake <email address hidden>
Reviewed-by: Benoit Canet <email address hidden>
Signed-off-by: Jeff Cody <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
Signed-off-by: Stefan Hajnoczi <email address hidden>
(cherry picked from commit 7676e2c597000eff3a7233b40cca768b358f9bc9)

Conflicts:
 qapi/block-core.json

*removed dependency on 1ad166b6

Signed-off-by: Michael Roth <email address hidden>

e5f0eb0... by Fam Zheng

qemu-iotests: Test BLOCK_JOB_READY event for 0Kb image active commit

There should be a BLOCK_JOB_READY event with active commit, regardless
of image length. Let's test the 0 length image case, and make sure it
goes through the ready->complete process.

Signed-off-by: Fam Zheng <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit 8b9a30ca5bc10545637429486836f3c206c39fab)
Signed-off-by: Michael Roth <email address hidden>

43ac708... by Fam Zheng

mirror: Go through ready -> complete process for 0 len image

When mirroring or active committing a zero length image, BLOCK_JOB_READY
is not reported now, instead the job completes because we short circuit
the mirror job loop.

This is inconsistent with non-zero length images, and only confuses
management software.

Let's do the same thing when seeing a 0-length image: report ready
immediately; wait for block-job-cancel or block-job-complete; clear the
cancel flag as existing non-zero image synced case (cancelled after
ready); then jump to the exit.

Reported-by: Eric Blake <email address hidden>
Signed-off-by: Fam Zheng <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit 9e48b025400b2d284e17860862b0a4aa02c6032d)

*removed dependency on bcada37b

Signed-off-by: Michael Roth <email address hidden>

8e09e20... by Fam Zheng

blockjob: Add block_job_yield()

This will unset busy flag and put coroutine to sleep, can be used to
wait for QMP complete/cancel.

Signed-off-by: Fam Zheng <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit dc71ce45ded4e872e25c2de32d5e7a71842b0985)
Signed-off-by: Michael Roth <email address hidden>