Commit b5e7cf52 authored by David Hildenbrand's avatar David Hildenbrand Committed by Radim Krčmář

KVM: x86: simplify pic_ioport_read()

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 84a5c79e
...@@ -417,19 +417,16 @@ static u32 pic_poll_read(struct kvm_kpic_state *s, u32 addr1) ...@@ -417,19 +417,16 @@ static u32 pic_poll_read(struct kvm_kpic_state *s, u32 addr1)
return ret; return ret;
} }
static u32 pic_ioport_read(void *opaque, u32 addr1) static u32 pic_ioport_read(void *opaque, u32 addr)
{ {
struct kvm_kpic_state *s = opaque; struct kvm_kpic_state *s = opaque;
unsigned int addr;
int ret; int ret;
addr = addr1;
addr &= 1;
if (s->poll) { if (s->poll) {
ret = pic_poll_read(s, addr1); ret = pic_poll_read(s, addr);
s->poll = 0; s->poll = 0;
} else } else
if (addr == 0) if ((addr & 1) == 0)
if (s->read_reg_select) if (s->read_reg_select)
ret = s->isr; ret = s->isr;
else else
......
Markdown is supported
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