Handle more hvm disk cases.