mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
chardev: add parallel chardev support to chardev-add (qmp)
Also alias the old parport name to parallel for -chardev. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
d59044ef74
commit
88a946d32d
|
@ -3042,7 +3042,8 @@
|
|||
#
|
||||
# Since: 1.4
|
||||
##
|
||||
{ 'enum': 'ChardevPortKind', 'data': [ 'serial' ] }
|
||||
{ 'enum': 'ChardevPortKind', 'data': [ 'serial',
|
||||
'parallel' ] }
|
||||
|
||||
{ 'type': 'ChardevPort', 'data': { 'device' : 'str',
|
||||
'type' : 'ChardevPortKind'} }
|
||||
|
|
44
qemu-char.c
44
qemu-char.c
|
@ -1367,17 +1367,10 @@ static void pp_close(CharDriverState *chr)
|
|||
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
|
||||
}
|
||||
|
||||
static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
|
||||
static CharDriverState *qemu_chr_open_pp_fd(int fd)
|
||||
{
|
||||
const char *filename = qemu_opt_get(opts, "path");
|
||||
CharDriverState *chr;
|
||||
ParallelCharDriver *drv;
|
||||
int fd;
|
||||
|
||||
TFR(fd = qemu_open(filename, O_RDWR));
|
||||
if (fd < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (ioctl(fd, PPCLAIM) < 0) {
|
||||
close(fd);
|
||||
|
@ -1441,16 +1434,9 @@ static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
|
||||
static CharDriverState *qemu_chr_open_pp_fd(int fd)
|
||||
{
|
||||
const char *filename = qemu_opt_get(opts, "path");
|
||||
CharDriverState *chr;
|
||||
int fd;
|
||||
|
||||
fd = qemu_open(filename, O_RDWR);
|
||||
if (fd < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
chr = g_malloc0(sizeof(CharDriverState));
|
||||
chr->opaque = (void *)(intptr_t)fd;
|
||||
|
@ -2750,6 +2736,22 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef HAVE_CHARDEV_PARPORT
|
||||
|
||||
static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
|
||||
{
|
||||
const char *filename = qemu_opt_get(opts, "path");
|
||||
int fd;
|
||||
|
||||
fd = qemu_open(filename, O_RDWR);
|
||||
if (fd < 0) {
|
||||
return NULL;
|
||||
}
|
||||
return qemu_chr_open_pp_fd(fd);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static const struct {
|
||||
const char *name;
|
||||
CharDriverState *(*open)(QemuOpts *opts);
|
||||
|
@ -2779,6 +2781,7 @@ static const struct {
|
|||
{ .name = "pty", .open = qemu_chr_open_pty },
|
||||
#endif
|
||||
#ifdef HAVE_CHARDEV_PARPORT
|
||||
{ .name = "parallel", .open = qemu_chr_open_pp },
|
||||
{ .name = "parport", .open = qemu_chr_open_pp },
|
||||
#endif
|
||||
#ifdef CONFIG_SPICE
|
||||
|
@ -3103,6 +3106,15 @@ static CharDriverState *qmp_chardev_open_port(ChardevPort *port, Error **errp)
|
|||
}
|
||||
socket_set_nonblock(fd);
|
||||
return qemu_chr_open_tty_fd(fd);
|
||||
#endif
|
||||
#ifdef HAVE_CHARDEV_PARPORT
|
||||
case CHARDEV_PORT_KIND_PARALLEL:
|
||||
flags = O_RDWR;
|
||||
fd = qmp_chardev_open_file_source(port->device, flags, errp);
|
||||
if (error_is_set(errp)) {
|
||||
return NULL;
|
||||
}
|
||||
return qemu_chr_open_pp_fd(fd);
|
||||
#endif
|
||||
default:
|
||||
error_setg(errp, "unknown chardev port (%d)", port->type);
|
||||
|
|
|
@ -1746,6 +1746,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
|
|||
"-chardev tty,id=id,path=path[,mux=on|off]\n"
|
||||
#endif
|
||||
#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
"-chardev parallel,id=id,path=path[,mux=on|off]\n"
|
||||
"-chardev parport,id=id,path=path[,mux=on|off]\n"
|
||||
#endif
|
||||
#if defined(CONFIG_SPICE)
|
||||
|
@ -1776,6 +1777,7 @@ Backend is one of:
|
|||
@option{stdio},
|
||||
@option{braille},
|
||||
@option{tty},
|
||||
@option{parallel},
|
||||
@option{parport},
|
||||
@option{spicevmc}.
|
||||
@option{spiceport}.
|
||||
|
@ -1943,9 +1945,10 @@ DragonFlyBSD hosts. It is an alias for -serial.
|
|||
|
||||
@option{path} specifies the path to the tty. @option{path} is required.
|
||||
|
||||
@item -chardev parallel ,id=@var{id} ,path=@var{path}
|
||||
@item -chardev parport ,id=@var{id} ,path=@var{path}
|
||||
|
||||
@option{parport} is only available on Linux, FreeBSD and DragonFlyBSD hosts.
|
||||
@option{parallel} is only available on Linux, FreeBSD and DragonFlyBSD hosts.
|
||||
|
||||
Connect to a local parallel port.
|
||||
|
||||
|
|
Loading…
Reference in a new issue