openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86: simplify pic_ioport_read() 

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
David Hildenbrand 2017-04-07 10:50:40 +02:00 committed by Radim Krčmář
parent 84a5c79e70
commit b5e7cf52e1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kvm/i8259.c
View File

@ -417,19 +417,16 @@ static u32 pic_poll_read(struct kvm_kpic_state *s, u32 addr1)
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;
unsigned int addr;
int ret;
addr = addr1;
addr &= 1;
if (s->poll) {
ret = pic_poll_read(s, addr1);
ret = pic_poll_read(s, addr);
s->poll = 0;
} else
if (addr == 0)
if ((addr & 1) == 0)
if (s->read_reg_select)
ret = s->isr;
else