Commit 0ee75bea authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Let vcpu structure alignment be determined at runtime 



vmx and svm vcpus have different contents and therefore may have different
alignmment requirements.  Let each specify its required alignment.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 884a0ff0

arch/ia64/kvm/vmm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ static int __init kvm_vmm_init(void) 
	vmm_fpswa_interface = fpswa_interface;

	vmm_fpswa_interface = fpswa_interface;





	/*Register vmm data to kvm side*/

	/*Register vmm data to kvm side*/

	return kvm_init(&vmm_info, 1024, THIS_MODULE);

	return kvm_init(&vmm_info, 1024, 0, THIS_MODULE);

}

}





static void __exit kvm_vmm_exit(void)

static void __exit kvm_vmm_exit(void)

arch/powerpc/kvm/44x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ static int __init kvmppc_44x_init(void) 
	if (r)

	if (r)

		return r;

		return r;





	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_44x), THIS_MODULE);

	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_44x), 0, THIS_MODULE);

}

}





static void __exit kvmppc_44x_exit(void)

static void __exit kvmppc_44x_exit(void)

arch/powerpc/kvm/book3s.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1385,7 +1385,8 @@ int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 




static int kvmppc_book3s_init(void)

static int kvmppc_book3s_init(void)

{

{

	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_book3s), THIS_MODULE);

	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_book3s), 0,

			THIS_MODULE);

}

}





static void kvmppc_book3s_exit(void)

static void kvmppc_book3s_exit(void)

arch/powerpc/kvm/e500.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static int __init kvmppc_e500_init(void) 
	flush_icache_range(kvmppc_booke_handlers,

	flush_icache_range(kvmppc_booke_handlers,

			kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);

			kvmppc_booke_handlers + max_ivor + kvmppc_handler_len);





	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), THIS_MODULE);

	return kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), 0, THIS_MODULE);

}

}





static void __init kvmppc_e500_exit(void)

static void __init kvmppc_e500_exit(void)

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -752,7 +752,7 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) 
static int __init kvm_s390_init(void)

static int __init kvm_s390_init(void)

{

{

	int ret;

	int ret;

	ret = kvm_init(NULL, sizeof(struct kvm_vcpu), THIS_MODULE);

	ret = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);

	if (ret)

	if (ret)

		return ret;

		return ret;