Merge tag 'kvm-s390-next-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / s390 / kvm / kvm-s390.c

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index d047e84..d9e6bf3 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -155,6 +155,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
        { "instruction_diag_10", VCPU_STAT(diagnose_10) },
        { "instruction_diag_44", VCPU_STAT(diagnose_44) },
        { "instruction_diag_9c", VCPU_STAT(diagnose_9c) },
+       { "diag_9c_ignored", VCPU_STAT(diagnose_9c_ignored) },
        { "instruction_diag_258", VCPU_STAT(diagnose_258) },
        { "instruction_diag_308", VCPU_STAT(diagnose_308) },
        { "instruction_diag_500", VCPU_STAT(diagnose_500) },
@@ -453,16 +454,14 @@ static void kvm_s390_cpu_feat_init(void)
 
 int kvm_arch_init(void *opaque)
 {
-       int rc;
+       int rc = -ENOMEM;
 
        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)) {
-               rc = -ENOMEM;
-               goto out_debug_unreg;
-       }
+       if (debug_register_view(kvm_s390_dbf, &debug_sprintf_view))
+               goto out;
 
        kvm_s390_cpu_feat_init();
 
@@ -470,19 +469,17 @@ int kvm_arch_init(void *opaque)
        rc = kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);
        if (rc) {
                pr_err("A FLIC registration call failed with rc=%d\n", rc);
-               goto out_debug_unreg;
+               goto out;
        }
 
        rc = kvm_s390_gib_init(GAL_ISC);
        if (rc)
-               goto out_gib_destroy;
+               goto out;
 
        return 0;
 
-out_gib_destroy:
-       kvm_s390_gib_destroy();
-out_debug_unreg:
-       debug_unregister(kvm_s390_dbf);
+out:
+       kvm_arch_exit();
        return rc;
 }