05ff4ee618
- Add load average information type into virDomainGetGuestInfo (RHEL-88447) - qemu_agent: Add qemuAgentGetLoadAvg() (RHEL-88447) - qemu: Add support for VIR_DOMAIN_GUEST_INFO_LOAD (RHEL-88447) - virsh: Add support for VIR_DOMAIN_GUEST_INFO_LOAD (RHEL-88447) - qemu_capabilities: Fetch caps for virtio-mem-ccw too (RHEL-87532) - cpu_map: Add avx10* CPU features (RHEL-87796) - cpu_map: Add GraniteRapids-v2 CPU model (RHEL-87796) - cpu_map: Add sha512, sm3, and sm4 CPU features (RHEL-87796) - virsh: Introduce new hypervisor-cpu-models command (RHEL-11435) - qemu: remove nonsensical sanity check in processNetdevStreamDisconnectedEvent() (RHEL-80169) - qemu: make processNetDevStreamDisconnectedEvent() reusable (RHEL-80169) - qemu: respond to NETDEV_VHOST_USER_DISCONNECTED event (RHEL-80169) - qemu: put vhost-user code that's special for passt in a helper function (RHEL-80169) - qemu: make passt+vhostuser reconnect behave identically to passt+user (RHEL-80169) Resolves: RHEL-11435, RHEL-80169, RHEL-87532, RHEL-87796, RHEL-88447
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From aeff1ebf96b595337f14ef6d1412d6c407bdc085 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <aeff1ebf96b595337f14ef6d1412d6c407bdc085.1747908717.git.jdenemar@redhat.com>
|
|
From: Martin Kletzander <mkletzan@redhat.com>
|
|
Date: Tue, 25 Feb 2025 15:36:32 +0100
|
|
Subject: [PATCH] qemu: Add support for VIR_DOMAIN_GUEST_INFO_LOAD
|
|
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
(cherry picked from commit b4cf9c8cba45e65551aa9440dea2c3757a96aa0c)
|
|
|
|
https://issues.redhat.com/browse/RHEL-88447
|
|
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
---
|
|
src/qemu/qemu_driver.c | 21 ++++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index 8a354a606a..11dbbc1aab 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -19276,7 +19276,8 @@ static const unsigned int qemuDomainGetGuestInfoSupportedTypes =
|
|
VIR_DOMAIN_GUEST_INFO_HOSTNAME |
|
|
VIR_DOMAIN_GUEST_INFO_FILESYSTEM |
|
|
VIR_DOMAIN_GUEST_INFO_DISKS |
|
|
- VIR_DOMAIN_GUEST_INFO_INTERFACES;
|
|
+ VIR_DOMAIN_GUEST_INFO_INTERFACES |
|
|
+ VIR_DOMAIN_GUEST_INFO_LOAD;
|
|
|
|
static int
|
|
qemuDomainGetGuestInfoCheckSupport(unsigned int types,
|
|
@@ -19563,6 +19564,10 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
|
|
qemuAgentDiskInfo **agentdiskinfo = NULL;
|
|
virDomainInterfacePtr *ifaces = NULL;
|
|
size_t nifaces = 0;
|
|
+ double load1m = 0;
|
|
+ double load5m = 0;
|
|
+ double load15m = 0;
|
|
+ bool format_load = false;
|
|
size_t i;
|
|
|
|
virCheckFlags(0, -1);
|
|
@@ -19633,6 +19638,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
|
|
nifaces = rc;
|
|
}
|
|
|
|
+ if (supportedTypes & VIR_DOMAIN_GUEST_INFO_LOAD) {
|
|
+ rc = qemuAgentGetLoadAvg(agent, &load1m, &load5m, &load15m, report_unsupported);
|
|
+ if (rc == -1)
|
|
+ goto exitagent;
|
|
+ if (rc >= 0)
|
|
+ format_load = true;
|
|
+ }
|
|
+
|
|
qemuDomainObjExitAgent(vm, agent);
|
|
virDomainObjEndAgentJob(vm);
|
|
|
|
@@ -19659,6 +19672,12 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
|
|
virDomainInterfaceFormatParams(ifaces, nifaces, params, nparams, &maxparams);
|
|
}
|
|
|
|
+ if (format_load) {
|
|
+ virTypedParamsAddDouble(params, nparams, &maxparams, "load.1m", load1m);
|
|
+ virTypedParamsAddDouble(params, nparams, &maxparams, "load.5m", load5m);
|
|
+ virTypedParamsAddDouble(params, nparams, &maxparams, "load.15m", load15m);
|
|
+ }
|
|
+
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
--
|
|
2.49.0
|