summaryrefslogtreecommitdiffstats
path: root/qerror.h
diff options
context:
space:
mode:
authorAnthony Liguori2011-12-05 16:39:25 +0100
committerAnthony Liguori2011-12-05 16:39:25 +0100
commiteb5d5beaebd102599a915f6c4813d445ddc9dc84 (patch)
tree12ce2331571a30c67bde0b8f4ddb55996dd0ba65 /qerror.h
parentMerge remote-tracking branch 'aneesh/1.0-fixes' into staging (diff)
parentblock: convert qemu_aio_flush() calls to bdrv_drain_all() (diff)
downloadqemu-eb5d5beaebd102599a915f6c4813d445ddc9dc84.tar.gz
qemu-eb5d5beaebd102599a915f6c4813d445ddc9dc84.tar.xz
qemu-eb5d5beaebd102599a915f6c4813d445ddc9dc84.zip
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'qerror.h')
-rw-r--r--qerror.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qerror.h b/qerror.h
index 6414cd9d5b..161d654b75 100644
--- a/qerror.h
+++ b/qerror.h
@@ -207,4 +207,7 @@ QError *qobject_to_qerror(const QObject *obj);
#define QERR_QGA_COMMAND_FAILED \
"{ 'class': 'QgaCommandFailed', 'data': { 'message': %s } }"
+#define QERR_INVALID_PARAMETER_COMBINATION \
+ "{ 'class': 'InvalidParameterCombination', 'data': {} }"
+
#endif /* QERROR_H */