From: Yuri Pudgorodskiy <yur@virtuozzo.com>
Date: Thu, 28 Jan 2016 08:55:09 +0000 (+0300)
Subject: qemu: guest agent: introduce new error code VIR_ERR_AGENT_UNSYNCED
X-Git-Tag: v2.3.0-rc1~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914d5e1cbf2ef85afff67876cb4fba1d2432ce07;p=thirdparty%2Flibvirt.git

qemu: guest agent: introduce new error code VIR_ERR_AGENT_UNSYNCED

A separate error code will help recognize real failures from
necessity to try again

Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
---

diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index 2ec560e063..efe83aadb2 100644
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -315,6 +315,8 @@ typedef enum {
     VIR_ERR_AUTH_UNAVAILABLE = 94,	/* authentication unavailable */
     VIR_ERR_NO_SERVER = 95,             /* Server was not found */
     VIR_ERR_NO_CLIENT = 96,             /* Client was not found */
+    VIR_ERR_AGENT_UNSYNCED = 97,        /* guest agent replies with wrong id
+                                           to guest-sync command */
 } virErrorNumber;
 
 /**
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index eeede6b1da..fdc4fed277 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -966,21 +966,21 @@ qemuAgentGuestSync(qemuAgentPtr mon)
         goto cleanup;
 
     if (!sync_msg.rxObject) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+        virReportError(VIR_ERR_AGENT_UNSYNCED, "%s",
                        _("Missing monitor reply object"));
         goto cleanup;
     }
 
     if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject,
                                          "return", &id_ret) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+        virReportError(VIR_ERR_AGENT_UNSYNCED, "%s",
                        _("Malformed return value"));
         goto cleanup;
     }
 
     VIR_DEBUG("Guest returned ID: %llu", id_ret);
     if (id_ret != id) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
+        virReportError(VIR_ERR_AGENT_UNSYNCED,
                        _("Guest agent returned ID: %llu instead of %llu"),
                        id_ret, id);
         goto cleanup;
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 1177570ef0..29583084e9 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -1394,6 +1394,12 @@ virErrorMsg(virErrorNumber error, const char *info)
             else
                 errmsg = _("Client not found: %s");
             break;
+        case VIR_ERR_AGENT_UNSYNCED:
+            if (info == NULL)
+                errmsg = _("guest agent replied with wrong id to guest-sync command");
+            else
+                errmsg = _("guest agent replied with wrong id to guest-sync command: %s");
+            break;
     }
     return errmsg;
 }