On Tue, Feb 04, 2014 at 12:49:20PM +0100, Hans de Goede wrote: > Try to get a server managed fd from the Options before trying to open the > device node ourselves. > > Signed-off-by: Hans de Goede <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> Cheers, Peter > --- > hw/xfree86/os-support/shared/posix_tty.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/xfree86/os-support/shared/posix_tty.c > b/hw/xfree86/os-support/shared/posix_tty.c > index 4d08c1e..6e2af00 100644 > --- a/hw/xfree86/os-support/shared/posix_tty.c > +++ b/hw/xfree86/os-support/shared/posix_tty.c > @@ -124,7 +124,11 @@ xf86OpenSerial(XF86OptionPtr options) > return -1; > } > > - SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); > + fd = xf86CheckIntOption(options, "fd", -1); > + > + if (fd == -1) > + SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); > + > if (fd == -1) { > xf86Msg(X_ERROR, > "xf86OpenSerial: Cannot open device %s\n\t%s.\n", > -- > 1.8.5.3 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
