Verify that xvda is true, rather than assume it is. Fixes #525

Title says it all.