Revision fa879d62 hw/qdev-properties.c
b/hw/qdev-properties.c | ||
---|---|---|
312 | 312 |
bs = bdrv_find(str); |
313 | 313 |
if (bs == NULL) |
314 | 314 |
return -ENOENT; |
315 |
if (bdrv_attach(bs, dev) < 0) |
|
315 |
if (bdrv_attach_dev(bs, dev) < 0)
|
|
316 | 316 |
return -EEXIST; |
317 | 317 |
*ptr = bs; |
318 | 318 |
return 0; |
... | ... | |
323 | 323 |
BlockDriverState **ptr = qdev_get_prop_ptr(dev, prop); |
324 | 324 |
|
325 | 325 |
if (*ptr) { |
326 |
bdrv_detach(*ptr, dev); |
|
326 |
bdrv_detach_dev(*ptr, dev);
|
|
327 | 327 |
blockdev_auto_del(*ptr); |
328 | 328 |
} |
329 | 329 |
} |
... | ... | |
678 | 678 |
{ |
679 | 679 |
int res; |
680 | 680 |
|
681 |
res = bdrv_attach(value, dev); |
|
681 |
res = bdrv_attach_dev(value, dev);
|
|
682 | 682 |
if (res < 0) { |
683 | 683 |
error_report("Can't attach drive %s to %s.%s: %s", |
684 | 684 |
bdrv_get_device_name(value), |
Also available in: Unified diff