Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kvm/i8259.c

+3 −6
Original line number Diff line number Diff line
@@ -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