diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 14:46:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 14:46:53 +0100 |
| commit | 50a2c45da92383138e0d3f22952f3813814e18b3 (patch) | |
| tree | f9ec964cc6ccba53aa0c372a2ffd9f44d6811c66 /tests/display-vga-test.c | |
| parent | e0097ea371a647651f6c89c3091c4962fdde26fd (diff) | |
| parent | fa666c10f2f3e15685ff88abd3bc433ddce012d6 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Andreas's fixes to --enable-modules, two 2.1 regression fixes, and a
new qtest. Michael sent a pull request of his own, so I dropped
the vhost changes.
# gpg: Signature made Fri 18 Jul 2014 14:30:34 BST using RSA key ID 9B4D86F2
# gpg: Can't check signature: public key not found
* remotes/bonzini/tags/for-upstream:
Revert "kvmclock: Ensure time in migration never goes backward"
Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation"
module: Don't complain when a module is absent
module: Simplify module_load()
qtest: new test for wdt_ib700
target-i386: Allow execute from user mode when SMEP is enabled.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/display-vga-test.c')
0 files changed, 0 insertions, 0 deletions