From nobody Wed Mar 12 17:49:51 2025 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=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740498846479526.0019215005907; Tue, 25 Feb 2025 07:54:06 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BCF01F2A; Tue, 25 Feb 2025 10:54:05 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4ADE2218A; Tue, 25 Feb 2025 10:52:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 13C921E76; Tue, 25 Feb 2025 10:51:57 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D5E6A1F6B for ; Tue, 25 Feb 2025 10:51:46 -0500 (EST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-34ODLIwyPfuaC5BoClBCtA-1; Tue, 25 Feb 2025 10:51:39 -0500 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-38f255d44acso2532185f8f.0 for ; Tue, 25 Feb 2025 07:51:37 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8fc1cbsm2726093f8f.92.2025.02.25.07.51.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 07:51:34 -0800 (PST) Received: from wheatley.pinto-pinecone.ts.net (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 113998CC8003 for ; Tue, 25 Feb 2025 15:52:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740498706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/DjJePXozH9cn/5aZcoV5y5oko3k2lyAEHL5JVvKoco=; b=ErA6gI2MsvXKFJOieQ3hP071U63FU2nb0ziw/86nV9EWxi5UjVR8et0GWc+2nOgVfkTUnn L4qV8j1rO3c9ejUg0M2qYShQb1WZqD0lMC18K2jEmLK4j0f56beigyWh+JXYiuNEBWhfmu B8pirJfrq25XCcDCtlYpwa8CeNhIoEM= X-MC-Unique: 34ODLIwyPfuaC5BoClBCtA-1 X-Mimecast-MFC-AGG-ID: 34ODLIwyPfuaC5BoClBCtA_1740498697 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740498697; x=1741103497; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/DjJePXozH9cn/5aZcoV5y5oko3k2lyAEHL5JVvKoco=; b=An5ATA8rN5nJl924oQCYFpYjmXnlMMLPaTggQVpd1cLd5NcF9SPRrc+G09eqD3xgk9 5o9mwWBI5P4D4y1kg97lxFFF1Nw4+Ux0GJdthKbAQNvPZwDJnKhKPZu/X99hOfQjjeum BZ5OIOqC2SyO8XCFAXE57MevpgRj3JklkL5S+Rb/6uKnVQA3ObQUjnO5wHDrPcimbjzT xFEw6QHONNg7FkB3LthHyhvv0VnNuenlhXnUc13fSviC3Fzdmea5aH+FknSur1IYRcIK nHaz+6HP01loocokEgzN2r2ADRK7YLFyw+S5ntr/DH/WqYw52RFK+bg294EL/0q69sHX 5HIw== X-Gm-Message-State: AOJu0YxmXSi7CX1fbrPFkP8LFdu+Km5qRBdaWncynMxuM1h43/fZSe55 /yEP7K+Qb4AC6d/afm47apUv8918yNA0pNEHbB3eSTpaXeJlGIO5yXcTJ2jxWqAuhCDxNzh4WSg Kq2FmgGm2kyTBFT4W46M6131Xol/ldr8G9HG7RMiPrhnlC0ubYY7fH3+UrO59CopPTq4laq8pDg 2SONnSi2FncV5KgnNqqAoaBzvQoeMO8YvtHPEdJ/8= X-Gm-Gg: ASbGncvrUy3uI2iJQBwrFeblgkVBtFQ+cm6HsQqtLvdSohs8RE7NvYcgSK0RY0W90Lp 1sfQzn5AaAY6S2jsjGo6s7wsTagBOGk/WuSlu6CKF2dNDKdchS51lee7p04/Yc6jRPjVVSRvgwP qHb2e/+d/lG2ImKG63bHqK6fCfJ6+vxSNU9lMRvNTZTuP1ZwwiL2SNEjN0liLD9IQwTwRXS+xA7 iYfPALQj8jTYL1OODlWPeQlEcTCfqQC5TQLQOd2K5YM4h1lH+r1WxdVbBfUjSngx9lSPs711fAJ 9y79EWNp/ieB4lrZtxBDkHCjYrgu0/J63fRc/x9PU/1hGhBAyVs= X-Received: by 2002:adf:ed4c:0:b0:38f:476f:e176 with SMTP id ffacd0b85a97d-38f6ec63868mr12945034f8f.31.1740498696825; Tue, 25 Feb 2025 07:51:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyqKATLomJepuH8ObWEu/QIQXzcWelR3rk+SkwVculYH97ObEW19lGLd1rIc00DON55wBFcQ== X-Received: by 2002:adf:ed4c:0:b0:38f:476f:e176 with SMTP id ffacd0b85a97d-38f6ec63868mr12945012f8f.31.1740498696341; Tue, 25 Feb 2025 07:51:36 -0800 (PST) From: Martin Kletzander To: devel@lists.libvirt.org Subject: [PATCH v2 2/4] qemu_agent: Add qemuAgentGetLoadAvg() Date: Tue, 25 Feb 2025 15:52:30 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1lY0zmsWpT4pi8v3E-C-lvl0gvcYL9j3TeBUntdGRow_1740498697 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FLNLSAG6UMMPAUMKOESLVXQUUNJ6NRBP X-Message-ID-Hash: FLNLSAG6UMMPAUMKOESLVXQUUNJ6NRBP X-MailFrom: mkletzan@redhat.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 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 (Header signature does not verify) X-ZM-MESSAGEID: 1740498847287019100 Content-Type: text/plain; charset="utf-8"; x-default="true" With qemu guest agent 9.3 we are able to get the load averages with a new command. Signed-off-by: Martin Kletzander --- src/qemu/qemu_agent.c | 55 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 6 +++++ tests/qemuagenttest.c | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 43fca86f10ed..27efb4b389ee 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2568,3 +2568,58 @@ int qemuAgentGetDisks(qemuAgent *agent, g_free(*disks); return -1; } + + +int +qemuAgentGetLoadAvg(qemuAgent *agent, + double *load1m, + double *load5m, + double *load15m, + bool report_unsupported) +{ + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; + virJSONValue *data =3D NULL; + int rc; + + if (load1m) + *load1m =3D 0; + + if (load5m) + *load5m =3D 0; + + if (load15m) + *load15m =3D 0; + + if (!(cmd =3D qemuAgentMakeCommand("guest-get-load", NULL))) + return -1; + + if ((rc =3D qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; + + if (!(data =3D virJSONValueObjectGetObject(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't return an array of loads")); + return -1; + } + +#define GET_NUMBER_PARAM(param_) \ + do { \ + if (param_ && \ + virJSONValueObjectGetNumberDouble(data, #param_, param_) < 0) = { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + _("'%1$s' missing in reply of guest-get-load"),= \ + #param_); \ + return -1; \ + } \ + } while (0) + + GET_NUMBER_PARAM(load1m); + GET_NUMBER_PARAM(load5m); + GET_NUMBER_PARAM(load15m); + +#undef GET_NUMBER_PARAM + + return 0; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index f98586e8f8ab..cd17a98d3924 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -195,3 +195,9 @@ int qemuAgentSSHRemoveAuthorizedKeys(qemuAgent *agent, int qemuAgentGetDisks(qemuAgent *mon, qemuAgentDiskInfo ***disks, bool report_unsupported); + +int qemuAgentGetLoadAvg(qemuAgent *agent, + double *load1m, + double *load5m, + double *load15m, + bool report_unsupported); diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 328788024197..566571cf1107 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1356,6 +1356,58 @@ testQemuAgentTimezone(const void *data) virTypedParamsFree(params, nparams); return ret; } + + +static const char testQemuAgentGetLoadAvgResponse[] =3D + "{" + " \"return\": {" + " \"load15m\": 0.03564453125," + " \"load5m\": 0.064453125," + " \"load1m\": 0.00390625" + " }" + "}"; + +static int +testQemuAgentGetLoadAvg(const void *data) +{ + virDomainXMLOption *xmlopt =3D (virDomainXMLOption *)data; + g_autoptr(qemuMonitorTest) test =3D qemuMonitorTestNewAgent(xmlopt); + double load1m =3D 0; + double load5m =3D 0; + double load15m =3D 0; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + return -1; + + if (qemuMonitorTestAddItem(test, "guest-get-load", + testQemuAgentGetLoadAvgResponse) < 0) + return -1; + + if (qemuAgentGetLoadAvg(qemuMonitorTestGetAgent(test), + &load1m, &load5m, &load15m, true) < 0) + return -1; + +#define VALIDATE_LOAD(value_, expected_) \ + do { \ + if (value_ !=3D expected_) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, \ + "Expected " #value_ " '%.11f', got '%.11f'", \ + expected_, value_); \ + return -1; \ + } \ + } while (0) + + VALIDATE_LOAD(load1m, 0.00390625); + VALIDATE_LOAD(load5m, 0.064453125); + VALIDATE_LOAD(load15m, 0.03564453125); + + return 0; +} + + static int mymain(void) { @@ -1392,6 +1444,7 @@ mymain(void) DO_TEST(Timezone); DO_TEST(SSHKeys); DO_TEST(GetDisks); + DO_TEST(GetLoadAvg); =20 DO_TEST(Timeout); /* Timeout should always be called last */ =20 --=20 2.48.1