diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-20 15:16:00 -0500 |
commit | 7f67d8922e2da59c02852de39f888d7873e8645c (patch) | |
tree | fde41774a54f63bce66a739332c3dbd27365af91 /qerror.c | |
parent | 27acf660aa1678ff3e7291fa81f4d5d4020b20f8 (diff) | |
parent | 6e0ca8820dddd04056c43327f3b3699f572d03d4 (diff) | |
download | qemu-7f67d8922e2da59c02852de39f888d7873e8645c.zip qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.gz qemu-7f67d8922e2da59c02852de39f888d7873e8645c.tar.bz2 |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'qerror.c')
-rw-r--r-- | qerror.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -194,6 +194,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "QMP input object member '%(member)' is unexpected", }, { + .error_fmt = QERR_RESET_REQUIRED, + .desc = "Resetting the Virtual Machine is required", + }, + { .error_fmt = QERR_SET_PASSWD_FAILED, .desc = "Could not set password", }, |