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

1 files changed, 4 insertions, 0 deletions

diff --git a/qerror.c b/qerror.c
index 935d30f62a..656efc2cf0 100644
--- a/qerror.c
+++ b/qerror.c
@@ -251,6 +251,10 @@ static const QErrorStringTable qerror_table[] = {
         .error_fmt = QERR_QGA_COMMAND_FAILED,
         .desc      = "Guest agent command failed, error was '%(message)'",
     },
+    {
+        .error_fmt = QERR_INVALID_PARAMETER_COMBINATION,
+        .desc      = "Invalid paramter combination",
+    },
     {}
 };