[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [MINI-OS PATCH 4/6] console: drop parameter from get_console()
The parameter of get_console() is used only when running in PV mode, and it always has the same value. Drop the parameter and use start_info_ptr directly in the PV variant of get_console(). Signed-off-by: Juergen Gross <jgross@xxxxxxxx> --- arch/arm/setup.c | 2 +- arch/x86/setup.c | 2 +- console.c | 10 +++++----- include/console.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/setup.c b/arch/arm/setup.c index 1bcfa689..161d137d 100644 --- a/arch/arm/setup.c +++ b/arch/arm/setup.c @@ -40,7 +40,7 @@ void arch_init(void *dtb_pointer, uint32_t physical_offset) /* Map shared_info page */ HYPERVISOR_shared_info = map_shared_info(); - get_console(NULL); + get_console(); get_xenbus(NULL); gic_init(); diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 4e2f0749..2b314aa2 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -193,7 +193,7 @@ arch_init(void *par) /* WARN: don't do printk before here, it uses information from shared_info. Use xprintk instead. */ - get_console(par); + get_console(); get_xenbus(par); get_cmdline(par); diff --git a/console.c b/console.c index a4c50371..48c5be43 100644 --- a/console.c +++ b/console.c @@ -197,15 +197,15 @@ uint32_t console_evtchn; static struct consfront_dev* resume_xen_console(struct consfront_dev *dev); #ifdef CONFIG_PARAVIRT -void get_console(void *p) +void get_console(void) { - start_info_t *si = p; + start_info_t *si = start_info_ptr; console_ring = mfn_to_virt(si->console.domU.mfn); console_evtchn = si->console.domU.evtchn; } #else -void get_console(void *p) +void get_console(void) { uint64_t v = -1; @@ -411,9 +411,9 @@ void xencons_ring_resume(struct consfront_dev *dev) if ( dev ) { #if CONFIG_PARAVIRT - get_console(start_info_ptr); + get_console(); #else - get_console(0); + get_console(); #endif resume_xen_console(dev); } diff --git a/include/console.h b/include/console.h index d216d247..326e993b 100644 --- a/include/console.h +++ b/include/console.h @@ -76,7 +76,7 @@ void xprintk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void xencons_rx(char *buf, unsigned len, struct pt_regs *regs); void xencons_tx(void); -void get_console(void *p); +void get_console(void); void init_console(void); void console_print(struct consfront_dev *dev, const char *data, int length); void fini_consfront(struct consfront_dev *dev); -- 2.43.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |