diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 19:06:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 19:06:09 +0000 |
| commit | b90da81d9f2d3d974db13bc69f961974741b0e2e (patch) | |
| tree | 226b97684ddd9959a3e84a43a6f5f56ddff04e2a /migration/colo.c | |
| parent | e80b4b8fb6babce7dcc91ea9ddeecbc351fd4646 (diff) | |
| parent | 83a00f6095a36de2024d6cca57470c4dedfb85ee (diff) | |
| download | qemu-b90da81d9f2d3d974db13bc69f961974741b0e2e.tar.gz | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86 and machine queue, 2016-10-31
# gpg: Signature made Mon 31 Oct 2016 18:29:18 GMT
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-and-machine-pull-request:
target-i386: Print warning when mixing [+-]foo and foo=(on|off)
tests: Remove unneeded "-vnc none" option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/colo.c')
0 files changed, 0 insertions, 0 deletions