Fix code style issues while at it, to please checkpatch. Backports commit 28035bcdf4647245743cf87cea3788331bf67a5f from qemu