setvcpus: Resolve test issues

This pull request replaces PR 1218 sent to virt-test prior to the split:

https://github.com/autotest/virt-test/pull/1218

There has been no changes made since the last comments in that PR