Rewrite the code to make usage of some VIR_AUTOFREE logic.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>