Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (103 commits)
  Replace -no-virtio-balloon by -balloon
  x86: Factor out pc_new_cpu
  Revert "Introduce reset notifier order"
  slirp: tftp: Relax filename format check
  monitor: Refactor acl commnds
  sdl: Fix memory leakage
  monitor: Add completion for help command
  KVM: x86: Refactor persistent CPU state
  monitor: Make pci_add device options truely optional
  kvm: Rework VCPU synchronization
  monitor: Drop pci_addr prefix from hotplug commands
  Rename SOUND_HW to sound-obj-y
  Substitute ifdef CONFIG_FOO by obj-
  move CONFIG_* values from yes to y
  qcow2: Cache refcount blocks during snapshot creation
  Substitute ifdef CONFIG_FOO by obj-
  block-raw: Allow pread beyond the end of growable images
  make tags useful for block drivers and hardaware devices
  Substitute ifdef CONFIG_FOO by sound-obj-
  Rename BLOCK_OBJS to block-obj-y
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>