diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:00:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:00:32 -0500 |
| commit | 5699a02e01a4d046652bc6e77abd67e887ae209c (patch) | |
| tree | 9b5f353025bb767ad0fbf10fc9d6488be7831b13 /stubs/vm-stop.c | |
| parent | c3cb8e77804313e1be99b5f28a34a346736707a5 (diff) | |
| parent | a62eaa26c1d6d48fbdc3ac1d32bd1314f5fdc8c9 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (6) and Stefan Hajnoczi (2)
# Via Kevin Wolf
* kwolf/for-anthony:
ahci: Fix FLUSH command
migration: Fail migration on bdrv_flush_all() error
cpus: Add return value for vm_stop()
block: Add return value for bdrv_flush_all()
qemu-iotests: Update 051 reference output
block: Don't parse protocol from file.filename
block: add drive_backup HMP command
blockdev: add sync mode to drive-backup QMP command
Message-id: 1373887000-4488-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'stubs/vm-stop.c')
| -rw-r--r-- | stubs/vm-stop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stubs/vm-stop.c b/stubs/vm-stop.c index 45689354f6..f82c897dfe 100644 --- a/stubs/vm-stop.c +++ b/stubs/vm-stop.c @@ -1,7 +1,7 @@ #include "qemu-common.h" #include "sysemu/sysemu.h" -void vm_stop(RunState state) +int vm_stop(RunState state) { abort(); } |