-static int i440_free(struct vm_device * dev) {
- struct i440_state * state = dev->private_data;
+static int i440_free(struct i440_state * state) {
// unregister from PCI
}
static struct v3_device_ops dev_ops = {
- .free = i440_free,
+ .free = (int (*)(void *))i440_free,
};
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_add_device(vm, dev_id, &dev_ops, state);
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, state);
+ NULL, NULL, NULL, NULL, state);
if (!pci_dev) {
v3_remove_device(dev);