[PATCH kvmtool 12/21] hw/vesa: Switch trap handling to use MMIO handler

Andre Przywara
2020-12-10T19:08:33Z

To be able to use the VESA device with the new generic I/O trap handler,
we need to use the different MMIO handler callback routine.

Replace the existing dummy in and out handlers with a joint dummy
MMIO handler, and register this using the new registration function.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
hw/vesa.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/hw/vesa.c b/hw/vesa.c
index 8659a002..7f82cdb4 100644
--- a/hw/vesa.c
+++ b/hw/vesa.c
@@ -43,21 +43,11 @@ static struct framebuffer vesafb = {
.mem_size = VESA_MEM_SIZE,
};

-static bool vesa_pci_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
+static void vesa_pci_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,
+ u8 is_write, void *ptr)
{
- return true;
}

-static bool vesa_pci_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
-{
- return true;
-}
-
-static struct ioport_operations vesa_io_ops = {
- .io_in = vesa_pci_io_in,
- .io_out = vesa_pci_io_out,
-};
-
static int vesa__bar_activate(struct kvm *kvm, struct pci_device_header *pci_hdr,
int bar_num, void *data)
{
@@ -82,7 +72,8 @@ struct framebuffer *vesa__init(struct kvm *kvm)
BUILD_BUG_ON(VESA_MEM_SIZE < VESA_BPP/8 * VESA_WIDTH * VESA_HEIGHT);

vesa_base_addr = pci_get_io_port_block(PCI_IO_SIZE);
- r = ioport__register(kvm, vesa_base_addr, &vesa_io_ops, PCI_IO_SIZE, NULL);
+ r = kvm__register_pio(kvm, vesa_base_addr, PCI_IO_SIZE, vesa_pci_io,
+ NULL);
if (r < 0)
goto out_error;

@@ -116,7 +107,7 @@ unmap_dev:
unregister_device:
device__unregister(&vesa_device);
unregister_ioport:
- ioport__unregister(kvm, vesa_base_addr);
+ kvm__deregister_pio(kvm, vesa_base_addr);
out_error:
return ERR_PTR(r);
}
--
2.17.1