Move some declarations around in the QEMU CharDriver code