Commit 026fb59c authored by Julien Thierry's avatar Julien Thierry Committed by Will Deacon
Browse files

brlock: Always pass argument to br_read_lock/unlock



The kvm argument is not passed to br_read_lock/unlock, this works for
the barrier implementation because the argument is not used. This ever
breaks if another lock implementation is used.
Reviewed-by: Andre Przywara's avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 90fa9c78
......@@ -184,7 +184,7 @@ bool kvm__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction,
void *ptr = data;
struct kvm *kvm = vcpu->kvm;
br_read_lock();
br_read_lock(kvm);
entry = ioport_search(&ioport_tree, port);
if (!entry)
goto out;
......@@ -201,7 +201,7 @@ bool kvm__emulate_io(struct kvm_cpu *vcpu, u16 port, void *data, int direction,
}
out:
br_read_unlock();
br_read_unlock(kvm);
if (ret)
return true;
......
......@@ -124,7 +124,7 @@ bool kvm__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, u8 *data, u32 len, u
{
struct mmio_mapping *mmio;
br_read_lock();
br_read_lock(vcpu->kvm);
mmio = mmio_search(&mmio_tree, phys_addr, len);
if (mmio)
......@@ -135,7 +135,7 @@ bool kvm__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, u8 *data, u32 len, u
to_direction(is_write),
(unsigned long long)phys_addr, len);
}
br_read_unlock();
br_read_unlock(vcpu->kvm);
return true;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment