Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4de0c1a authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

[S390] kvm: use console_initcall() to initialize s390 virtio console 



Use a console_initcall() to initialize the s390 virtio console and
clean up s390 console initialization in setup.c.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 68d36bdb

arch/s390/include/asm/kvm_virtio.h

+0 −10
Original line number Diff line number Diff line
@@ -54,14 +54,4 @@ struct kvm_vqconfig { 
 * This is pagesize for historical reasons. */

#define KVM_S390_VIRTIO_RING_ALIGN	4096



#ifdef __KERNEL__

/* early virtio console setup */

#ifdef CONFIG_S390_GUEST

extern void s390_virtio_console_init(void);

#else

static inline void s390_virtio_console_init(void)

{

}

#endif /* CONFIG_VIRTIO_CONSOLE */

#endif /* __KERNEL__ */

#endif

arch/s390/kernel/setup.c

+3 −7
Original line number Diff line number Diff line
@@ -156,15 +156,11 @@ __setup("condev=", condev_setup); 


static void __init set_preferred_console(void)

{

	if (MACHINE_IS_KVM) {

	if (MACHINE_IS_KVM)

		add_preferred_console("hvc", 0, NULL);

		s390_virtio_console_init();

		return;

	}



	if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)

	else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)

		add_preferred_console("ttyS", 0, NULL);

	if (CONSOLE_IS_3270)

	else if (CONSOLE_IS_3270)

		add_preferred_console("tty3270", 0, NULL);

}

drivers/s390/kvm/kvm_virtio.c

+6 −2
Original line number Diff line number Diff line
@@ -403,10 +403,14 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) 
	return len;

}



void __init s390_virtio_console_init(void)

static int __init s390_virtio_console_init(void)

{

	virtio_cons_early_init(early_put_chars);

	if (!MACHINE_IS_KVM)

		return -ENODEV;

	return virtio_cons_early_init(early_put_chars);

}

console_initcall(s390_virtio_console_init);





/*

 * We do this after core stuff, but before the drivers.