diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-28 19:44:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-28 19:44:03 +0100 |
| commit | b1753831b0e58587db4fdf8219237331269c00c3 (patch) | |
| tree | f3350b652dc03533a8c47455c7b3f12c376a1960 | |
| parent | 3461487523b897d324e8d91f3fd20ed55f849544 (diff) | |
| parent | 9c15f57891af7c2cb3baf2d66a1b1f3f87a665ba (diff) | |
| download | qemu-b1753831b0e58587db4fdf8219237331269c00c3.zip qemu-b1753831b0e58587db4fdf8219237331269c00c3.tar.gz qemu-b1753831b0e58587db4fdf8219237331269c00c3.tar.bz2 | |
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging
slirp: update to latest stable-4.2 branch
# gpg: Signature made Tue 28 Jul 2020 15:30:09 BST
# gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg: issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/slirp-pull-request:
slirp: update to latest stable-4.2 branch
test-char: abort on serial test error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| m--------- | slirp | 0 | ||||
| -rw-r--r-- | tests/test-char.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/slirp b/slirp -Subproject 2faae0f778f818fadc873308f983289df697eb9 +Subproject ce94eba2042d52a0ba3d9e252ebce86715e9427 diff --git a/tests/test-char.c b/tests/test-char.c index 614bdac..d35cc83 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1200,7 +1200,7 @@ static void char_serial_test(void) /* test tty alias */ qemu_opt_set(opts, "backend", "tty", &error_abort); - chr = qemu_chr_new_from_opts(opts, NULL, NULL); + chr = qemu_chr_new_from_opts(opts, NULL, &error_abort); g_assert_nonnull(chr); object_unparent(OBJECT(chr)); |