X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fide.c;h=a31aec2a2558854d787633597ea068b99edb7577;hb=e5e029575affad90c19ca038a3b780820535d421;hp=67a892827c774843bbbe23ea27ecd3a63ad0517c;hpb=ada3ad58ddc6747ea1062d6e9509a978389924c9;p=palacios.git diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c index 67a8928..a31aec2 100644 --- a/palacios/src/devices/ide.c +++ b/palacios/src/devices/ide.c @@ -1521,7 +1521,7 @@ static int connect_fn(struct v3_vm_info * vm, static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct ide_internal * ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal)); - char * name = v3_cfg_val(cfg, "name"); + char * dev_id = v3_cfg_val(cfg, "ID"); PrintDebug("IDE: Initializing IDE\n"); memset(ide, 0, sizeof(struct ide_internal)); @@ -1542,10 +1542,10 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { PrintDebug("IDE: Creating IDE bus x 2\n"); - struct vm_device * dev = v3_allocate_device(name, &dev_ops, ide); + struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ide); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + PrintError("Could not attach device %s\n", dev_id); return -1; } @@ -1660,8 +1660,8 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } - if (v3_dev_add_blk_frontend(vm, name, connect_fn, (void *)ide) == -1) { - PrintError("Could not register %s as frontend\n", name); + if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) { + PrintError("Could not register %s as frontend\n", dev_id); return -1; } @@ -1694,6 +1694,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n return 0; } - - -