Merge pull request #288 from EmbeddedAndroid/master

rbd: ensure dev_file and dev_bus are never referenced before they are se...
Merge branch 'master' into virtio