Merge commit '7d4c3d535c6f33e1d6d158aaf2108a27b45d743d' into upstream-merge
commit8549e1cda8c9c8d181d82c56fe3c8556e1e9a309
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 12:31:39 +0000 (30 15:31 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 12:31:39 +0000 (30 15:31 +0300)
tree65a6a14b0ee07a9ab7bd58351e371eb4110f020d
parente9b8186e28d1fcbe8407e11d303fb4ab3298ca52
parent7d4c3d535c6f33e1d6d158aaf2108a27b45d743d
Merge commit '7d4c3d535c6f33e1d6d158aaf2108a27b45d743d' into upstream-merge

* commit '7d4c3d535c6f33e1d6d158aaf2108a27b45d743d':
  Replace -no-virtio-balloon by -balloon
  slirp: tftp: Relax filename format check
  sdl: Fix memory leakage
  KVM: x86: Refactor persistent CPU state

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/pc.c
qemu-options.hx
sysemu.h
vl.c