From ba911c5db27c28673a6d2b16a8709bc14d6ee43c Mon Sep 17 00:00:00 2001 From: Denis Mukhin Date: Wed, 12 Aug 2026 10:46:37 +0200 Subject: [PATCH] xen/console: do not use XENCONS_RING_IDX in console_init_ring() Replace XENCONS_RING_IDX with unsigned int for the console ring indices, as the console ring is not a Xen console (XENCONS) ring. Suggested-by: Andrew Cooper Signed-off-by: Denis Mukhin Reviewed-by: Stefano Stabellini --- xen/drivers/char/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index ea4e3ff341..37fdda93a4 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -463,7 +463,7 @@ static void cf_check conring_dump_keyhandler(unsigned char key) void __init console_init_ring(void) { char *ring; - XENCONS_RING_IDX done, size, n; + unsigned int done, size, n; unsigned int order, memflags; unsigned long flags; @@ -484,8 +484,8 @@ void __init console_init_ring(void) size = conringp - conringc; for ( done = 0; done < size; done += n ) { - XENCONS_RING_IDX src = (conringc + done) & (conring_size - 1); - XENCONS_RING_IDX dst = (conringc + done) & (opt_conring_size - 1); + unsigned int src = (conringc + done) & (conring_size - 1); + unsigned int dst = (conringc + done) & (opt_conring_size - 1); n = min(opt_conring_size - dst, conring_size - src); n = min(size - done, n);