From nobody Thu Sep 19 00:15:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linux.microsoft.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1719559798138166.94725938188162; Fri, 28 Jun 2024 00:29:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 18B211210; Fri, 28 Jun 2024 03:29:57 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 34E0E13D9; Fri, 28 Jun 2024 03:27:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BE42FE32; Fri, 28 Jun 2024 03:26:52 -0400 (EDT) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lists.libvirt.org (Postfix) with ESMTP id 49FD4AD4 for ; Fri, 28 Jun 2024 03:26:52 -0400 (EDT) Received: from paekkaladevi-dev-u22.gi4irqh5pfqublruu4yyku2wof.phxx.internal.cloudapp.net (unknown [20.125.125.171]) by linux.microsoft.com (Postfix) with ESMTPSA id 8C4D720B700B; Fri, 28 Jun 2024 00:26:50 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8C4D720B700B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1719559610; bh=3eBV4cZ8bxhKYaIb8eH1UiShwoAgp2Fu46VInmPq0Ug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jtlDG6ISDfGVDaI+FjobxisBYi4zkeh4ezxVyinzBCYP0TU6VRNE9EtSJTGvgJ2lR BY89kO0/amW3DLZGmdadYw/Q0L671iF3h+km+HQhAre1eujeIgYo/9DZ4xPOoOtlU9 eWIOM53nJqLFRoZl5KMOv0Fq8MadZfA+sMG4jSOc= From: Purna Pavan Chandra To: devel@lists.libvirt.org Subject: [PATCH 6/8] ch: refactor virCHMonitorSaveVM Date: Fri, 28 Jun 2024 07:26:45 +0000 Message-Id: <20240628072647.2674-7-paekkaladevi@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240628072647.2674-1-paekkaladevi@linux.microsoft.com> References: <20240628072647.2674-1-paekkaladevi@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XKK2NOPNECYYZJPDVERNWLXDTNZSQTU2 X-Message-ID-Hash: XKK2NOPNECYYZJPDVERNWLXDTNZSQTU2 X-MailFrom: paekkaladevi@linux.microsoft.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: paekkaladevi@microsoft.com, prapal@linux.microsoft.com, liuwe@microsoft.com, kumarpraveen@linux.microsoft.com, Purna Pavan Chandra X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZM-MESSAGEID: 1719559798811100002 Content-Type: text/plain; charset="utf-8" Remove the unwanted utility function and make api calls directly from virCHMonitorSaveVM fn Signed-off-by: Purna Pavan Chandra --- 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); } =20 -static int -virCHMonitorSaveRestoreVM(virCHMonitor *mon, const char *path, bool save) +int +virCHMonitorSaveVM(virCHMonitor *mon, const char *to) { g_autofree char *url =3D NULL; int responseCode =3D 0; @@ -936,22 +936,15 @@ virCHMonitorSaveRestoreVM(virCHMonitor *mon, const ch= ar *path, bool save) struct curl_slist *headers =3D NULL; struct curl_data data =3D {0}; =20 - if (save) - url =3D g_strdup_printf("%s/%s", URL_ROOT, URL_VM_SAVE); - else - url =3D g_strdup_printf("%s/%s", URL_ROOT, URL_VM_RESTORE); + url =3D g_strdup_printf("%s/%s", URL_ROOT, URL_VM_SAVE); =20 headers =3D curl_slist_append(headers, "Accept: application/json"); headers =3D curl_slist_append(headers, "Content-Type: application/json= "); =20 - path_url =3D g_strdup_printf("file://%s", path); - if (save) { - if (virCHMonitorBuildKeyValueStringJson(&payload, "destination_url= ", path_url) !=3D 0) - return -1; - } else { - if (virCHMonitorBuildKeyValueStringJson(&payload, "source_url", pa= th_url) !=3D 0) - return -1; - } + path_url =3D g_strdup_printf("file://%s", to); + if (virCHMonitorBuildKeyValueStringJson(&payload, "destination_url", p= ath_url) !=3D 0) + return -1; + =20 VIR_WITH_OBJECT_LOCK_GUARD(mon) { /* reset all options of a libcurl session handle at first */ @@ -984,12 +977,6 @@ virCHMonitorSaveRestoreVM(virCHMonitor *mon, const cha= r *path, bool save) return ret; } =20 -int -virCHMonitorSaveVM(virCHMonitor *mon, const char *to) -{ - return virCHMonitorSaveRestoreVM(mon, to, true); -} - int virCHMonitorBuildRestoreJson(const char *from, char **jsonstr) { --=20 2.34.1