Change from v1:
  Avoid changing the existing coding style in certain files.
Signed-off-by: NStuart Brady <stuart.brady@gmail.com>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6120 c046a42c-6fe2-441c-8c8c-71466251a162