diff options
| author | Peter Maydell | 2020-07-07 13:41:15 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-07 13:41:15 +0200 |
| commit | 710fb08fd297d7a92163debce1959fae8f3b6ed7 (patch) | |
| tree | a9911dd0b12d5d227bdf392f2e2bc95e9e8afb62 /util | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-re... (diff) | |
| parent | tests/acceptance: Add a test for the sun4u sparc64 machine (diff) | |
| download | qemu-710fb08fd297d7a92163debce1959fae8f3b6ed7.tar.gz qemu-710fb08fd297d7a92163debce1959fae8f3b6ed7.tar.xz qemu-710fb08fd297d7a92163debce1959fae8f3b6ed7.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-06' into staging
* Fuzzer fixes from Alexander
* Clean-up patches for qtests, configure and mcf5206
* Sparc64 sun4u acceptance test
# gpg: Signature made Mon 06 Jul 2020 08:34:14 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-07-06:
tests/acceptance: Add a test for the sun4u sparc64 machine
hw/m68k/mcf5206: Replace remaining hw_error()s by qemu_log_mask()
configure / util: Auto-detect the availability of openpty()
tests/qtest: Unify the test for the xenfv and xenpv machines
fuzz: do not use POSIX shm for coverage bitmap
fuzz: fix broken qtest check at rcu_disable_atfork
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-openpty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 2e8b43bdf5..4b8df96f38 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -52,7 +52,9 @@ #endif #ifdef __sun__ -/* Once Solaris has openpty(), this is going to be removed. */ + +#if !defined(HAVE_OPENPTY) +/* Once illumos has openpty(), this is going to be removed. */ static int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { @@ -93,6 +95,7 @@ err: close(mfd); return -1; } +#endif static void cfmakeraw (struct termios *termios_p) { |