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

Commit 65a22694 authored by Michael Mueller's avatar Michael Mueller Committed by Greg Kroah-Hartman
Browse files

KVM: s390: unregister debug feature on failing arch init 



[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]

Make sure the debug feature and its allocated resources get
released upon unsuccessful architecture initialization.

A related indication of the issue will be reported as kernel
message.

Signed-off-by: default avatarMichael Mueller <mimu@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20181130143215.69496-2-mimu@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 697f1034

arch/s390/kvm/kvm-s390.c

+14 −3
Original line number Diff line number Diff line
@@ -319,19 +319,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)