Commit 6bf050f9 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

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

Pointer print format fixes
parents 0af2f6be 0c7fbae5

arch/s390/kvm/intercept.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int handle_validity(struct kvm_vcpu *vcpu) 


	vcpu->stat.exit_validity++;

	trace_kvm_s390_intercept_validity(vcpu, viwhy);

	KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%pK)", viwhy,

	KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%p)", viwhy,

		  current->pid, vcpu->kvm);



	/* do not warn on invalid runtime instrumentation mode */

arch/s390/kvm/interrupt.c

+4 −4
Original line number Diff line number Diff line
@@ -3161,7 +3161,7 @@ void kvm_s390_gisa_clear(struct kvm *kvm) 
	if (!gi->origin)

		return;

	gisa_clear_ipm(gi->origin);

	VM_EVENT(kvm, 3, "gisa 0x%pK cleared", gi->origin);

	VM_EVENT(kvm, 3, "gisa 0x%p cleared", gi->origin);

}



void kvm_s390_gisa_init(struct kvm *kvm)
@@ -3177,7 +3177,7 @@ void kvm_s390_gisa_init(struct kvm *kvm) 
	hrtimer_setup(&gi->timer, gisa_vcpu_kicker, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	memset(gi->origin, 0, sizeof(struct kvm_s390_gisa));

	gi->origin->next_alert = (u32)virt_to_phys(gi->origin);

	VM_EVENT(kvm, 3, "gisa 0x%pK initialized", gi->origin);

	VM_EVENT(kvm, 3, "gisa 0x%p initialized", gi->origin);

}



void kvm_s390_gisa_enable(struct kvm *kvm)
@@ -3218,7 +3218,7 @@ void kvm_s390_gisa_destroy(struct kvm *kvm) 
		process_gib_alert_list();

	hrtimer_cancel(&gi->timer);

	gi->origin = NULL;

	VM_EVENT(kvm, 3, "gisa 0x%pK destroyed", gisa);

	VM_EVENT(kvm, 3, "gisa 0x%p destroyed", gisa);

}



void kvm_s390_gisa_disable(struct kvm *kvm)
@@ -3467,7 +3467,7 @@ int __init kvm_s390_gib_init(u8 nisc) 
		}

	}



	KVM_EVENT(3, "gib 0x%pK (nisc=%d) initialized", gib, gib->nisc);

	KVM_EVENT(3, "gib 0x%p (nisc=%d) initialized", gib, gib->nisc);

	goto out;



out_unreg_gal:

arch/s390/kvm/kvm-s390.c

+5 −5
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att 
		}

		mutex_unlock(&kvm->lock);

		VM_EVENT(kvm, 3, "SET: max guest address: %lu", new_limit);

		VM_EVENT(kvm, 3, "New guest asce: 0x%pK",

		VM_EVENT(kvm, 3, "New guest asce: 0x%p",

			 (void *) kvm->arch.gmap->asce);

		break;

	}
@@ -3466,7 +3466,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
		kvm_s390_gisa_init(kvm);

	INIT_LIST_HEAD(&kvm->arch.pv.need_cleanup);

	kvm->arch.pv.set_aside = NULL;

	KVM_EVENT(3, "vm 0x%pK created by pid %u", kvm, current->pid);

	KVM_EVENT(3, "vm 0x%p created by pid %u", kvm, current->pid);



	return 0;

out_err:
@@ -3529,7 +3529,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
	kvm_s390_destroy_adapters(kvm);

	kvm_s390_clear_float_irqs(kvm);

	kvm_s390_vsie_destroy(kvm);

	KVM_EVENT(3, "vm 0x%pK destroyed", kvm);

	KVM_EVENT(3, "vm 0x%p destroyed", kvm);

}



/* Section: vcpu related */
@@ -3650,7 +3650,7 @@ static int sca_switch_to_extended(struct kvm *kvm) 


	free_page((unsigned long)old_sca);



	VM_EVENT(kvm, 2, "Switched to ESCA (0x%pK -> 0x%pK)",

	VM_EVENT(kvm, 2, "Switched to ESCA (0x%p -> 0x%p)",

		 old_sca, kvm->arch.sca);

	return 0;

}
@@ -4027,7 +4027,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
			goto out_free_sie_block;

	}



	VM_EVENT(vcpu->kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK",

	VM_EVENT(vcpu->kvm, 3, "create cpu %d at 0x%p, sie block at 0x%p",

		 vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);

	trace_kvm_s390_create_vcpu(vcpu->vcpu_id, vcpu, vcpu->arch.sie_block);

arch/s390/kvm/trace-s390.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ TRACE_EVENT(kvm_s390_create_vcpu, 
		    __entry->sie_block = sie_block;

		    ),



	    TP_printk("create cpu %d at 0x%pK, sie block at 0x%pK",

	    TP_printk("create cpu %d at 0x%p, sie block at 0x%p",

		      __entry->id, __entry->vcpu, __entry->sie_block)

	);
@@ -255,7 +255,7 @@ TRACE_EVENT(kvm_s390_enable_css, 
		    __entry->kvm = kvm;

		    ),



	    TP_printk("enabling channel I/O support (kvm @ %pK)\n",

	    TP_printk("enabling channel I/O support (kvm @ %p)\n",

		      __entry->kvm)

	);