diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-29 14:55:51 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-29 14:55:51 +0100 |
| commit | 3f4331bfd112840e94935b0fd098ee88c07beabc (patch) | |
| tree | 36fd14200ceb2b73832191ae03311bcf9bd0886c /qerror.h | |
| parent | 01f590d5a3385c3d79c6afda7acd66edf4bf48d3 (diff) | |
| parent | 29ed72f15a4c8fd3ac106d874f76cc27b654fd25 (diff) | |
| download | qemu-3f4331bfd112840e94935b0fd098ee88c07beabc.zip qemu-3f4331bfd112840e94935b0fd098ee88c07beabc.tar.gz qemu-3f4331bfd112840e94935b0fd098ee88c07beabc.tar.bz2 | |
Merge branch 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable
* 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable:
migration: go to paused state after finishing incoming migration with -S
qmp: handle stop/cont in INMIGRATE state
hmp: fix info cpus for sparc targets
Diffstat (limited to 'qerror.h')
| -rw-r--r-- | qerror.h | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -165,9 +165,6 @@ void assert_no_error(Error *err); #define QERR_MIGRATION_NOT_SUPPORTED \ ERROR_CLASS_GENERIC_ERROR, "State blocked by non-migratable device '%s'" -#define QERR_MIGRATION_EXPECTED \ - ERROR_CLASS_MIGRATION_EXPECTED, "An incoming migration is expected before this command can be executed" - #define QERR_MISSING_PARAMETER \ ERROR_CLASS_GENERIC_ERROR, "Parameter '%s' is missing" |