From: Johannes Berg Date: Fri, 24 May 2019 22:08:43 +0000 (+0200) Subject: um: Add an option to make serial driver non-raw X-Git-Tag: v5.6-rc1~147^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1dc67d0e7df21b3d27beb3ec7b2c9e2b721daff;p=thirdparty%2Fkernel%2Flinux.git um: Add an option to make serial driver non-raw In some cases, for example when the program(s) running inside UML isn't/aren't interactive (like the hwsim tests for wpa_supplicant) there's really no value in having the serial lines configured to be raw as they are now by default. Setting them to non-raw lets one abort the whole UML with Ctrl-C, which is really the right thing to do in these cases, basically the whole UML instance is more like a single (testing) program. Add a "ssl-non-raw" option to UML to support such a mode. Signed-off-by: Johannes Berg Signed-off-by: Richard Weinberger --- diff --git a/arch/um/drivers/chan_user.h b/arch/um/drivers/chan_user.h index 72222bb036f50..4e51b85e2a23a 100644 --- a/arch/um/drivers/chan_user.h +++ b/arch/um/drivers/chan_user.h @@ -11,7 +11,7 @@ struct chan_opts { void (*const announce)(char *dev_name, int dev); char *xterm_title; - const int raw; + int raw; }; struct chan_ops { diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index b213201b8a3bd..26c5716fac0fe 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c @@ -196,3 +196,11 @@ static int ssl_chan_setup(char *str) __setup("ssl", ssl_chan_setup); __channel_help(ssl_chan_setup, "ssl"); + +static int ssl_non_raw_setup(char *str) +{ + opts.raw = 0; + return 1; +} +__setup("ssl-non-raw", ssl_non_raw_setup); +__channel_help(ssl_non_raw_setup, "set serial lines to non-raw mode");