On Mon, Feb 09, 2026 at 05:38:36PM +0100, Jan Beulich wrote:
> On 05.02.2026 02:36, [email protected] wrote:
> > From: Denis Mukhin <[email protected]>
> >
> > Groups conring buffer management code in the console driver for ease of
> > maintaining this code.
> >
> > Not a functional change.
> >
> > Signed-off-by: Denis Mukhin <[email protected]>
>
> Acked-by: Jan Beulich <[email protected]>
> with one minimal adjustment:
>
> > --- a/xen/drivers/char/console.c
> > +++ b/xen/drivers/char/console.c
> > @@ -126,17 +126,6 @@ static int cf_check parse_console_timestamps(const
> > char *s);
> > custom_runtime_param("console_timestamps", parse_console_timestamps,
> > con_timestamp_mode_upd);
> >
> > -/* conring_size: allows a large console ring than default (16kB). */
> > -static uint32_t __initdata opt_conring_size;
> > -size_param("conring_size", opt_conring_size);
> > -
> > -#define _CONRING_SIZE 16384
> > -#define CONRING_IDX_MASK(i) ((i)&(conring_size-1))
> > -static char __initdata _conring[_CONRING_SIZE];
> > -static char *__read_mostly conring = _conring;
> > -static uint32_t __read_mostly conring_size = _CONRING_SIZE;
> > -static uint32_t conringc, conringp;
> > -
> > static int __read_mostly sercon_handle = -1;
> >
> > #ifdef CONFIG_X86
> > @@ -350,6 +339,17 @@ static void cf_check do_dec_thresh(unsigned char key,
> > bool unused)
> > * ********************************************************
> > */
> >
> > +/* conring_size: allows a large console ring than default (16kB). */
>
> As you move the comment, s/large/larger/. Will adjust while committing.
Thanks!
>
> > +static uint32_t __initdata opt_conring_size;
> > +size_param("conring_size", opt_conring_size);
> > +
> > +#define _CONRING_SIZE 16384
> > +#define CONRING_IDX_MASK(i) ((i)&(conring_size-1))
> > +static char __initdata _conring[_CONRING_SIZE];
> > +static char *__read_mostly conring = _conring;
> > +static uint32_t __read_mostly conring_size = _CONRING_SIZE;
> > +static uint32_t conringc, conringp;
>
> There are several other tidying things to be done here, but I'm not going
> to request that you take care of those, too.
>
> Jan
