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

This commit is contained in:
Anthony Liguori 2011-06-08 12:16:24 -05:00
commit 924f766af9
6 changed files with 91 additions and 25 deletions

View file

@ -169,6 +169,9 @@ QError *qobject_to_qerror(const QObject *obj);
#define QERR_UNDEFINED_ERROR \
"{ 'class': 'UndefinedError', 'data': {} }"
#define QERR_UNSUPPORTED \
"{ 'class': 'Unsupported', 'data': {} }"
#define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \
"{ 'class': 'UnknownBlockFormatFeature', 'data': { 'device': %s, 'format': %s, 'feature': %s } }"