Merge remote-tracking branch 'qmp/for-anthony' into staging

2011-06-08 12:16:24 -05:00 · 2011-06-08 12:16:24 -05:00 · 924f766af9
commit 924f766af9
parent 93e0597ef9 37628f11c6
6 changed files with 91 additions and 25 deletions
--- a/qerror.c
+++ b/qerror.c
@ -200,6 +200,10 @@ static const QErrorStringTable qerror_table[] = {
        .error_fmt = QERR_UNDEFINED_ERROR,
        .desc      = "An undefined error has ocurred",
    },
+    {
+        .error_fmt = QERR_UNSUPPORTED,
+        .desc      = "this feature or command is not currently supported",
+    },
    {
        .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
        .desc      = "'%(device)' uses a %(format) feature which is not "