diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-15 16:36:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-15 16:36:40 +0000 |
| commit | 078a1c37cad0d11d93ff8102f7653ce6109bb62d (patch) | |
| tree | 51da43cbb304e6d8476aae5ba2db2b237e4821b9 /tests | |
| parent | 44e3a39f30377e96f6a1f3a21f6b1c8b40b28baf (diff) | |
| parent | 88c1ee73d3231c74ff90bcfc084a7589670ec244 (diff) | |
| download | qemu-078a1c37cad0d11d93ff8102f7653ce6109bb62d.zip qemu-078a1c37cad0d11d93ff8102f7653ce6109bb62d.tar.gz qemu-078a1c37cad0d11d93ff8102f7653ce6109bb62d.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-02-15' into staging
trivial patches for 2014-02-15
# gpg: Signature made Sat 15 Feb 2014 12:10:46 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: E190 8639 3B10 B51B AC2C 8B73 5253 C5AD 74F0 C838
* remotes/mjt/tags/trivial-patches-2014-02-15:
char/serial: Fix emptyness check
gitignore: anchor all ignored names
vl: trim includes
vl: remove old, long-unused defines
net: declare struct iovec in checksum.h to fix compiler warning
linux-user: refactor do_socketcall()
configure: add hints to a remedy for feature_not_found errors
configure: add hint of libfdt to DTC dependency not found message
sparc/leon3: Initialize stack pointer
misc: Fix case Qemu -> QEMU
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/i440fx-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index fa3e3d6..bcd2181 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -350,7 +350,7 @@ static void test_i440fx_firmware(FirmwareTestFixture *fixture, qtest_start(cmdline); g_free(cmdline); - /* Qemu has loaded the firmware (because qtest_start() only returns after + /* QEMU has loaded the firmware (because qtest_start() only returns after * the QMP handshake completes). We must unlink the firmware blob right * here, because any assertion firing below would leak it in the * filesystem. This is also the reason why we recreate the blob every time |