diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 15:05:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-20 15:05:19 +0100 |
| commit | 4113b0532da6c448f8e458b413ebde035234d0ea (patch) | |
| tree | b1c1f83d960975aeaab9712cdd167f20fdeac93f /block/mirror.c | |
| parent | fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569 (diff) | |
| parent | fb91f30bb9716c391ce0441942fffa601ad99684 (diff) | |
| download | qemu-4113b0532da6c448f8e458b413ebde035234d0ea.tar.gz | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-04-19-tag' into staging
qemu-ga patch queue for 2.6
* fixes inadvertant change that unconditionally disables qemu-ga unit test
* fixes make check failures when building with --disable-guest-agent that
were present visible before the unit test was inadvertantly disabled.
# gpg: Signature made Tue 19 Apr 2016 23:30:09 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
* remotes/mdroth/tags/qga-pull-2016-04-19-tag:
qemu-ga: do not run qga test when guest agent disabled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/mirror.c')
0 files changed, 0 insertions, 0 deletions