Merge commit 'cff09e923999e3848cdf3b2dc4e6c595523cddc6' into upstream-merge
commit1bcebec26e1c4ef6a93a6cda5a5eb08041825cc4
authorAvi Kivity <avi@redhat.com>
Sun, 30 Aug 2009 10:05:00 +0000 (30 13:05 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 30 Aug 2009 10:05:00 +0000 (30 13:05 +0300)
tree80f43fa3e9478b73566f095e2173d420f656e282
parent50003955ae108d0338f1d06e09a68be6d61d0072
parentcff09e923999e3848cdf3b2dc4e6c595523cddc6
Merge commit 'cff09e923999e3848cdf3b2dc4e6c595523cddc6' into upstream-merge

* commit 'cff09e923999e3848cdf3b2dc4e6c595523cddc6':
  Add VMState support to run a function after load
  Port PCIDevice state to VMState

Conflicts:
savevm.c

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/hw.h
hw/pci.c
savevm.c