Whoops.
With help from the libvirt irc channel, this seems to do the trick.
Erm, yeah, what I said in the last commit too.