*/
#include <palacios/vmm.h>
+#include <palacios/vm_guest.h>
#include <palacios/vmm_dev_mgr.h>
#include <devices/pci.h>
static int io_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
- PrintError("Unhandled read on port %x\n", port);
+ PrintError(core->vm_info, core, "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) {
- PrintError("Unhandled write on port %x\n", port);
+ PrintError(core->vm_info, core, "Unhandled write on port %x\n", port);
return -1;
}
-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,
};
int ret = 0;
if (!pci) {
- PrintError("could not find PCI Device\n");
+ PrintError(vm, VCORE_NONE, "could not find PCI Device\n");
return -1;
}
state = (struct i440_state *)V3_Malloc(sizeof(struct i440_state));
+ if (!state) {
+ PrintError(vm, VCORE_NONE, "Cannot allocate state\n");
+ return -1;
+ }
+
state->pci = pci;
struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
if (dev == NULL) {
- PrintError("Could not attach device %s\n", dev_id);
+ PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
V3_Free(state);
return -1;
}
/*
if (ret != 0) {
- PrintError("Error hooking i440FX io ports\n");
+ PrintError(vm, VCORE_NONE, "Error hooking i440FX io ports\n");
v3_remove_device(dev);
return -1;
}
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);