[PATCH v2 6/8] ch: refactor virCHMonitorSaveVM

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Remove the unwanted utility function and make api calls directly from
virCHMonitorSaveVM fn

Signed-off-by: Purna Pavan Chandra <paekkaladevi@xxxxxxxxxxxxxxxxxxx>
---
 src/ch/ch_monitor.c | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
index 0875887fd8..8d8be1f46e 100644
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -925,8 +925,8 @@ virCHMonitorResumeVM(virCHMonitor *mon)
     return virCHMonitorPutNoContent(mon, URL_VM_RESUME);
 }
 
-static int
-virCHMonitorSaveRestoreVM(virCHMonitor *mon, const char *path, bool save)
+int
+virCHMonitorSaveVM(virCHMonitor *mon, const char *to)
 {
     g_autofree char *url = NULL;
     int responseCode = 0;
@@ -936,22 +936,15 @@ virCHMonitorSaveRestoreVM(virCHMonitor *mon, const char *path, bool save)
     struct curl_slist *headers = NULL;
     struct curl_data data = {0};
 
-    if (save)
-        url = g_strdup_printf("%s/%s", URL_ROOT, URL_VM_SAVE);
-    else
-        url = g_strdup_printf("%s/%s", URL_ROOT, URL_VM_RESTORE);
+    url = g_strdup_printf("%s/%s", URL_ROOT, URL_VM_SAVE);
 
     headers = curl_slist_append(headers, "Accept: application/json");
     headers = curl_slist_append(headers, "Content-Type: application/json");
 
-    path_url = g_strdup_printf("file://%s", path);
-    if (save) {
-        if (virCHMonitorBuildKeyValueStringJson(&payload, "destination_url", path_url) != 0)
-            return -1;
-    } else {
-        if (virCHMonitorBuildKeyValueStringJson(&payload, "source_url", path_url) != 0)
-            return -1;
-    }
+    path_url = g_strdup_printf("file://%s", to);
+    if (virCHMonitorBuildKeyValueStringJson(&payload, "destination_url", path_url) != 0)
+        return -1;
+
 
     VIR_WITH_OBJECT_LOCK_GUARD(mon) {
         /* reset all options of a libcurl session handle at first */
@@ -984,12 +977,6 @@ virCHMonitorSaveRestoreVM(virCHMonitor *mon, const char *path, bool save)
     return ret;
 }
 
-int
-virCHMonitorSaveVM(virCHMonitor *mon, const char *to)
-{
-    return virCHMonitorSaveRestoreVM(mon, to, true);
-}
-
 int
 virCHMonitorBuildRestoreJson(const char *from, char **jsonstr)
 {
-- 
2.34.1



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux