diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 10:47:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 10:47:07 +0000 |
| commit | 613c12ec28573b10cae0cd91139ba69b964f347c (patch) | |
| tree | b66907dde9f7aa0bf57503fea2be092b43d26e56 /include | |
| parent | be813ef02d18ba58e1ff32f1706bcacb88f1f764 (diff) | |
| parent | 2a7a1a56d1e30de07cf7d7636a35bf7706b9500e (diff) | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
tests: test-qmp-commands: Fix double free
qapi script: do not add "_" for every capitalized char in enum
qapi script: do not allow string discriminator
qapi: convert BlockdevOptions to use enum discriminator
qapi script: support enum type as discriminator in union
qapi script: use same function to generate enum string
qapi script: code move for generate_enum_name()
qapi script: check correctness of union
qapi script: remember line number in schema parsing
qapi script: add check for duplicated key
qapi script: remember explicitly defined enum values
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qapi/qmp/qerror.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 25193c943b..da75abf6d6 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -159,7 +159,7 @@ void qerror_report_err(Error *err); ERROR_CLASS_GENERIC_ERROR, "Invalid JSON syntax" #define QERR_KVM_MISSING_CAP \ - ERROR_CLASS_K_V_M_MISSING_CAP, "Using KVM without %s, %s unavailable" + ERROR_CLASS_KVM_MISSING_CAP, "Using KVM without %s, %s unavailable" #define QERR_MIGRATION_ACTIVE \ ERROR_CLASS_GENERIC_ERROR, "There's a migration process in progress" |