On 10/12/2015 02:03 AM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <[email protected]> > --- > qemu-char.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) >
> @@ -4242,7 +4250,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
> ChardevBackend *backend,
> if (chr == NULL) {
> switch (backend->kind) {
> case CHARDEV_BACKEND_KIND_FILE:
> - chr = qmp_chardev_open_file(backend->file, &local_err);
> + abort();
> break;
The break is now dead code.
> #ifdef HAVE_CHARDEV_SERIAL
> case CHARDEV_BACKEND_KIND_SERIAL:
> @@ -4380,7 +4388,7 @@ static void register_types(void)
> register_char_driver("ringbuf", CHARDEV_BACKEND_KIND_RINGBUF,
> qemu_chr_parse_ringbuf, NULL);
> register_char_driver("file", CHARDEV_BACKEND_KIND_FILE,
> - qemu_chr_parse_file_out, NULL);
> + qemu_chr_parse_file_out, qmp_chardev_open_file);
Reviewed-by: Eric Blake <[email protected]>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
