Commit e9f2e05a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-4.21-1' of... 

Merge tag 'kvm-s390-next-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fixes for 4.21

Just two small fixes.
parents 8c5e14f4 7aedd9d4

arch/s390/kvm/kvm-s390.c

+17 −7
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
 *               Jason J. Herne <jjherne@us.ibm.com>

 */



#define KMSG_COMPONENT "kvm-s390"

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/compiler.h>

#include <linux/err.h>

#include <linux/fs.h>
@@ -44,10 +47,6 @@ 
#include "kvm-s390.h"

#include "gaccess.h"



#define KMSG_COMPONENT "kvm-s390"

#undef pr_fmt

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#define CREATE_TRACE_POINTS

#include "trace.h"

#include "trace-s390.h"
@@ -417,19 +416,30 @@ static void kvm_s390_cpu_feat_init(void) 


int kvm_arch_init(void *opaque)

{

	int rc;



	kvm_s390_dbf = debug_register("kvm-trace", 32, 1, 7 * sizeof(long));

	if (!kvm_s390_dbf)

		return -ENOMEM;



	if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view)) {

		debug_unregister(kvm_s390_dbf);

		return -ENOMEM;

		rc = -ENOMEM;

		goto out_debug_unreg;

	}



	kvm_s390_cpu_feat_init();



	/* Register floating interrupt controller interface. */

	return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);

	rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);

	if (rc) {

		pr_err("Failed to register FLIC rc=%d\n", rc);

		goto out_debug_unreg;

	}

	return 0;



out_debug_unreg:

	debug_unregister(kvm_s390_dbf);

	return rc;

}



void kvm_arch_exit(void)