static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
- // struct vm_device * dev = priv_data;
PrintError("Unhandled read on port %x\n", port);
return -1;
}
static int io_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
- // struct vm_device * dev = priv_data;
PrintError("Unhandled write on port %x\n", port);
return -1;
}
-static int i440_free(struct vm_device * dev) {
- struct i440_state * state = dev->private_data;
- int i;
-
- for (i = 0; i < 4; i++) {
- v3_unhook_io_port(dev->vm, 0x0cf8 + i);
- v3_unhook_io_port(dev->vm, 0x0cfc + i);
- }
+static int i440_free(struct i440_state * state) {
// unregister from PCI
}
static struct v3_device_ops dev_ops = {
- .free = i440_free,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))i440_free,
+
};
struct i440_state * state = NULL;
struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
char * dev_id = v3_cfg_val(cfg, "ID");
+ int ret = 0;
if (!pci) {
PrintError("could not find PCI Device\n");
state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
+ if (!state) {
+ PrintError("Cannot allocate state\n");
+ return -1;
+ }
+
state->pci = pci;
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
- if (v3_attach_device(vm, dev) == -1) {
+ if (dev == NULL) {
PrintError("Could not attach device %s\n", dev_id);
V3_Free(state);
return -1;
}
for (i = 0; i < 4; i++) {
- v3_hook_io_port(vm, 0x0cf8 + i, &io_read, &io_write, dev);
- v3_hook_io_port(vm, 0x0cfc + i, &io_read, &io_write, dev);
+ ret |= v3_dev_hook_io(dev, 0x0cf8 + i, &io_read, &io_write);
+ ret |= v3_dev_hook_io(dev, 0x0cfc + i, &io_read, &io_write);
+ }
+
+ /*
+ if (ret != 0) {
+ PrintError("Error hooking i440FX io ports\n");
+ v3_remove_device(dev);
+ return -1;
}
+ */
for (i = 0; i < 6; i++) {
bars[i].type = PCI_BAR_NONE;
pci_dev = v3_pci_register_device(state->pci, PCI_STD_DEVICE,
0, 0, 0, "i440FX", bars,
- NULL, NULL, NULL, dev);
+ NULL, NULL, NULL, NULL, state);
if (!pci_dev) {
- v3_detach_device(dev);
+ v3_remove_device(dev);
return -1;
}