Merge commit '19e65b47f60c68d7e8c96aa0a36223c5a0d3422b' into upstream-merge

Merge commit '19e65b47f60c68d7e8c96aa0a36223c5a0d3422b' into upstream-merge

* commit '19e65b47f60c68d7e8c96aa0a36223c5a0d3422b':
  Add missing newline at the end of options list
  Update Sparc64 OpenBIOS image to r649.
  Sparc64: move APB PCI memory base to correct location
  PCI: Fix bus address conversion
  sparc: make command line available also via firmware configuration device
  tcg: Add tcg_unsigned_cond.
  block/bochs: improve format checking
  block.c: fix warning with _FORTIFY_SOURCE
  block/bochs.c: fix warning with _FORTIFY_SOURCE
  savevm.c: fix warning with _FORTIFY_SOURCE
  slirp/misc.c: fix warning with _FORTIFY_SOURCE
  hw/pc.c: fix warnings with _FORTIFY_SOURCE
  path.c fix warning with _FORTIFY_SOURCE
  PCI: partially revert 2e01c8cf4b076b05013c87723e3fc710b50a0a7a

Conflicts:
	qemu-options.hx

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>