KVM: x86: convert kvm_(set|get)_ioapic() into void (33392b49) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/x86/kvm/ioapic.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -642,7 +642,7 @@ void kvm_ioapic_destroy(struct kvm *kvm)
	kfree(ioapic);		kfree(ioapic);
	}		}

	int kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state)		void kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state)
	{		{
	struct kvm_ioapic *ioapic = kvm->arch.vioapic;		struct kvm_ioapic *ioapic = kvm->arch.vioapic;

	@@ -650,10 +650,9 @@ int kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state)
	memcpy(state, ioapic, sizeof(struct kvm_ioapic_state));		memcpy(state, ioapic, sizeof(struct kvm_ioapic_state));
	state->irr &= ~ioapic->irr_delivered;		state->irr &= ~ioapic->irr_delivered;
	spin_unlock(&ioapic->lock);		spin_unlock(&ioapic->lock);
	return 0;
	}		}

	int kvm_set_ioapic(struct kvm kvm, struct kvm_ioapic_state state)		void kvm_set_ioapic(struct kvm kvm, struct kvm_ioapic_state state)
	{		{
	struct kvm_ioapic *ioapic = kvm->arch.vioapic;		struct kvm_ioapic *ioapic = kvm->arch.vioapic;

	@@ -664,5 +663,4 @@ int kvm_set_ioapic(struct kvm kvm, struct kvm_ioapic_state state)
	kvm_vcpu_request_scan_ioapic(kvm);		kvm_vcpu_request_scan_ioapic(kvm);
	kvm_ioapic_inject_all(ioapic, state->irr);		kvm_ioapic_inject_all(ioapic, state->irr);
	spin_unlock(&ioapic->lock);		spin_unlock(&ioapic->lock);
	return 0;
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -128,8 +128,8 @@ void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id);
	int kvm_irq_delivery_to_apic(struct kvm kvm, struct kvm_lapic src,		int kvm_irq_delivery_to_apic(struct kvm kvm, struct kvm_lapic src,
	struct kvm_lapic_irq *irq,		struct kvm_lapic_irq *irq,
	struct dest_map *dest_map);		struct dest_map *dest_map);
	int kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state);		void kvm_get_ioapic(struct kvm kvm, struct kvm_ioapic_state state);
	int kvm_set_ioapic(struct kvm kvm, struct kvm_ioapic_state state);		void kvm_set_ioapic(struct kvm kvm, struct kvm_ioapic_state state);
	void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu,		void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu,
	ulong *ioapic_handled_vectors);		ulong *ioapic_handled_vectors);
	void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,		void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3729,7 +3729,7 @@ static int kvm_vm_ioctl_get_irqchip(struct kvm kvm, struct kvm_irqchip chip)
	sizeof(struct kvm_pic_state));		sizeof(struct kvm_pic_state));
	break;		break;
	case KVM_IRQCHIP_IOAPIC:		case KVM_IRQCHIP_IOAPIC:
	r = kvm_get_ioapic(kvm, &chip->chip.ioapic);		kvm_get_ioapic(kvm, &chip->chip.ioapic);
	break;		break;
	default:		default:
	r = -EINVAL;		r = -EINVAL;
	@@ -3758,7 +3758,7 @@ static int kvm_vm_ioctl_set_irqchip(struct kvm kvm, struct kvm_irqchip chip)
	spin_unlock(&pic->lock);		spin_unlock(&pic->lock);
	break;		break;
	case KVM_IRQCHIP_IOAPIC:		case KVM_IRQCHIP_IOAPIC:
	r = kvm_set_ioapic(kvm, &chip->chip.ioapic);		kvm_set_ioapic(kvm, &chip->chip.ioapic);
	break;		break;
	default:		default:
	r = -EINVAL;		r = -EINVAL;