diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 19:26:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 19:26:49 +0100 |
| commit | 9bba618f18b1a60a3f2668db82b453f6cd9467c0 (patch) | |
| tree | 25f0ecb76346ccbe6331c8e38fd74a8b1f30be6f /chardev | |
| parent | 5093f028ce6529034efc8fdc06cec2aa2e2eea63 (diff) | |
| parent | 27d4c3789ddde40e1c7280150b46eb20a6a892e6 (diff) | |
| download | qemu-9bba618f18b1a60a3f2668db82b453f6cd9467c0.zip qemu-9bba618f18b1a60a3f2668db82b453f6cd9467c0.tar.gz qemu-9bba618f18b1a60a3f2668db82b453f6cd9467c0.tar.bz2 | |
Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into staging
# gpg: Signature made Thu 08 Jun 2017 15:12:11 BST
# gpg: using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/char-pull-request:
test-char: start a /char/serial test
chardev: don't use alias names in parse_compat()
char: fix alias devices regression
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev')
| -rw-r--r-- | chardev/char.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chardev/char.c b/chardev/char.c index 7aa0210..bcfc065 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -450,12 +450,12 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) } if (strstart(filename, "/dev/parport", NULL) || strstart(filename, "/dev/ppi", NULL)) { - qemu_opt_set(opts, "backend", "parport", &error_abort); + qemu_opt_set(opts, "backend", "parallel", &error_abort); qemu_opt_set(opts, "path", filename, &error_abort); return opts; } if (strstart(filename, "/dev/", NULL)) { - qemu_opt_set(opts, "backend", "tty", &error_abort); + qemu_opt_set(opts, "backend", "serial", &error_abort); qemu_opt_set(opts, "path", filename, &error_abort); return opts; } |