diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:14:10 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:14:10 -0500 |
| commit | 3469a60d9f6f7ba6fca3fe0788391f7285ead631 (patch) | |
| tree | 460bb059eb31a09f6610e7ea3db8685a36953d44 /include | |
| parent | 28b9d47db61a96d2630c7ffa6cbfdcdd1536f7cb (diff) | |
| parent | 594278d9f251222675f1c24f5fbb1b05560b8711 (diff) | |
| download | qemu-3469a60d9f6f7ba6fca3fe0788391f7285ead631.tar.gz | |
Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging
# By Anthony PERARD (2) and Liu, Jinsong (2)
# Via Stefano Stabellini
* sstabellini/xen-2013-09-25:
xen: Enable cpu-hotplug on xenfv machine.
xen: Fix vcpu initialization.
qemu: Add qemu xen logic for Xen HVM S3 resume
qemu: Adjust qemu wakeup
Message-id: alpine.DEB.2.02.1309251749180.5498@kaball.uk.xensource.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/sysemu.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index e2c6f58d9e..ffc53aa848 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -41,9 +41,11 @@ int vm_stop(RunState state); int vm_stop_force_state(RunState state); typedef enum WakeupReason { - QEMU_WAKEUP_REASON_OTHER = 0, + /* Always keep QEMU_WAKEUP_REASON_NONE = 0 */ + QEMU_WAKEUP_REASON_NONE = 0, QEMU_WAKEUP_REASON_RTC, QEMU_WAKEUP_REASON_PMTIMER, + QEMU_WAKEUP_REASON_OTHER, } WakeupReason; void qemu_system_reset_request(void); |