diff options
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rw-r--r-- | qemu-char.c | 5 | ||||
| -rwxr-xr-x | roms/configure-seabios.sh | 2 | ||||
| m--------- | roms/seabios | 0 |
4 files changed, 4 insertions, 3 deletions
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index ec9eeb12c6..c2a19b8930 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin Binary files differdiff --git a/qemu-char.c b/qemu-char.c index 4f8382e540..d04b429a03 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3276,7 +3276,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ChardevReturn *ret = NULL; const char *id = qemu_opts_id(opts); const char *bid = NULL; - char *filename = g_strdup(qemu_opt_get(opts, "backend")); if (qemu_opt_get_bool(opts, "mux", 0)) { bid = g_strdup_printf("%s-base", id); @@ -3309,7 +3308,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, } chr = qemu_chr_find(id); - chr->filename = filename; qapi_out: qapi_free_ChardevBackend(backend); @@ -3803,6 +3801,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr->label = g_strdup(id); chr->avail_connections = (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1; + if (!chr->filename) { + chr->filename = g_strdup(ChardevBackendKind_lookup[backend->kind]); + } QTAILQ_INSERT_TAIL(&chardevs, chr, next); return ret; } else { diff --git a/roms/configure-seabios.sh b/roms/configure-seabios.sh index 4bb6c2b90f..98f59a24ba 100755 --- a/roms/configure-seabios.sh +++ b/roms/configure-seabios.sh @@ -2,4 +2,4 @@ config="$1" make -C seabios clean distclean cp "$config" seabios/.config -make -C seabios olddefconfig +make -C seabios oldnoconfig diff --git a/roms/seabios b/roms/seabios -Subproject 88cb66ea542906ffff8a80ef397b9e3adbb3311 +Subproject d4f7d90f47462b4e8836899adc5060fbde5253e |