virt: serial and console fixes
virt: serial and console fixes

While reworking the tests, I figured out the serial and console update
one wasn't quite right and it has shown errors in the code too.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt