Instead of three temporary variables and three free calls, have one temporary
variable (with four names) and one free call.
Signed-off-by: Avi Kivity <avi@redhat.com>
struct kvm_vcpu *vcpu = filp->private_data;
void __user *argp = (void __user *)arg;
int r;
struct kvm_vcpu *vcpu = filp->private_data;
void __user *argp = (void __user *)arg;
int r;
- struct kvm_lapic_state *lapic = NULL;
- struct kvm_xsave *xsave = NULL;
- struct kvm_xcrs *xcrs = NULL;
+ union {
+ struct kvm_lapic_state *lapic;
+ struct kvm_xsave *xsave;
+ struct kvm_xcrs *xcrs;
+ void *buffer;
+ } u;
switch (ioctl) {
case KVM_GET_LAPIC: {
r = -EINVAL;
if (!vcpu->arch.apic)
goto out;
switch (ioctl) {
case KVM_GET_LAPIC: {
r = -EINVAL;
if (!vcpu->arch.apic)
goto out;
- lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
+ u.lapic = kzalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
- r = kvm_vcpu_ioctl_get_lapic(vcpu, lapic);
+ r = kvm_vcpu_ioctl_get_lapic(vcpu, u.lapic);
if (r)
goto out;
r = -EFAULT;
if (r)
goto out;
r = -EFAULT;
- if (copy_to_user(argp, lapic, sizeof(struct kvm_lapic_state)))
+ if (copy_to_user(argp, u.lapic, sizeof(struct kvm_lapic_state)))
r = -EINVAL;
if (!vcpu->arch.apic)
goto out;
r = -EINVAL;
if (!vcpu->arch.apic)
goto out;
- lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
+ u.lapic = kmalloc(sizeof(struct kvm_lapic_state), GFP_KERNEL);
- if (copy_from_user(lapic, argp, sizeof(struct kvm_lapic_state)))
+ if (copy_from_user(u.lapic, argp, sizeof(struct kvm_lapic_state)))
- r = kvm_vcpu_ioctl_set_lapic(vcpu, lapic);
+ r = kvm_vcpu_ioctl_set_lapic(vcpu, u.lapic);
break;
}
case KVM_GET_XSAVE: {
break;
}
case KVM_GET_XSAVE: {
- xsave = kzalloc(sizeof(struct kvm_xsave), GFP_KERNEL);
+ u.xsave = kzalloc(sizeof(struct kvm_xsave), GFP_KERNEL);
- kvm_vcpu_ioctl_x86_get_xsave(vcpu, xsave);
+ kvm_vcpu_ioctl_x86_get_xsave(vcpu, u.xsave);
- if (copy_to_user(argp, xsave, sizeof(struct kvm_xsave)))
+ if (copy_to_user(argp, u.xsave, sizeof(struct kvm_xsave)))
break;
r = 0;
break;
}
case KVM_SET_XSAVE: {
break;
r = 0;
break;
}
case KVM_SET_XSAVE: {
- xsave = kzalloc(sizeof(struct kvm_xsave), GFP_KERNEL);
+ u.xsave = kzalloc(sizeof(struct kvm_xsave), GFP_KERNEL);
- if (copy_from_user(xsave, argp, sizeof(struct kvm_xsave)))
+ if (copy_from_user(u.xsave, argp, sizeof(struct kvm_xsave)))
- r = kvm_vcpu_ioctl_x86_set_xsave(vcpu, xsave);
+ r = kvm_vcpu_ioctl_x86_set_xsave(vcpu, u.xsave);
break;
}
case KVM_GET_XCRS: {
break;
}
case KVM_GET_XCRS: {
- xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL);
+ u.xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL);
- kvm_vcpu_ioctl_x86_get_xcrs(vcpu, xcrs);
+ kvm_vcpu_ioctl_x86_get_xcrs(vcpu, u.xcrs);
- if (copy_to_user(argp, xcrs,
+ if (copy_to_user(argp, u.xcrs,
sizeof(struct kvm_xcrs)))
break;
r = 0;
break;
}
case KVM_SET_XCRS: {
sizeof(struct kvm_xcrs)))
break;
r = 0;
break;
}
case KVM_SET_XCRS: {
- xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL);
+ u.xcrs = kzalloc(sizeof(struct kvm_xcrs), GFP_KERNEL);
- if (copy_from_user(xcrs, argp,
+ if (copy_from_user(u.xcrs, argp,
sizeof(struct kvm_xcrs)))
break;
sizeof(struct kvm_xcrs)))
break;
- r = kvm_vcpu_ioctl_x86_set_xcrs(vcpu, xcrs);
+ r = kvm_vcpu_ioctl_x86_set_xcrs(vcpu, u.xcrs);
break;
}
default:
r = -EINVAL;
}
out:
break;
}
default:
r = -EINVAL;
}
out:
- kfree(lapic);
- kfree(xsave);
- kfree(xcrs);