X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=7465ea098bdbac36571b318c84ca8729ec7f12a3;hb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;hp=a4e25f56fc8e4ac0ad4b808033eb20d979b6fcd5;hpb=a9ba0182142340a2dd7b6a0b7c63727e87b08c89;p=palacios.releases.git diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c index a4e25f5..7465ea0 100644 --- a/palacios/src/devices/simple_pic.c +++ b/palacios/src/devices/simple_pic.c @@ -5,27 +5,27 @@ struct pic_internal { int pending_irq; - int error_code; + }; -int pic_intr_pending(void * private_data) { +static int pic_intr_pending(void * private_data) { struct pic_internal * data = (struct pic_internal *)private_data; return (data->pending_irq > 0); } -int pic_raise_intr(void * private_data, int irq, int error_code) { +static int pic_raise_intr(void * private_data, int irq) { struct pic_internal * data = (struct pic_internal *)private_data; data->pending_irq = irq; - data->error_code = error_code; + return 0; } -int pic_get_intr_number(void * private_data) { +static int pic_get_intr_number(void * private_data) { struct pic_internal * data = (struct pic_internal *)private_data; return data->pending_irq; @@ -67,9 +67,10 @@ static struct vm_device_ops dev_ops = { }; -struct vm_device * create_pic() { +struct vm_device * create_simple_pic() { struct pic_internal * state = NULL; - VMMMalloc(struct pic_internal *, state, sizeof(struct pic_internal)); + state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal)); + V3_ASSERT(state != NULL); struct vm_device * pic_dev = create_device("Simple Pic", &dev_ops, state);