[[RESEND] 5/8] migration/dirtyrate: Implement qemuDomainCalculateDirtyRate

Hao Wang posted 1 patch 1 week ago
Failed in applying to current master (apply log)
src/qemu/qemu_migration.c    | 29 +++++++++++++++++++++++++++++
src/qemu/qemu_migration.h    |  5 +++++
src/qemu/qemu_monitor.c      | 12 ++++++++++++
src/qemu/qemu_monitor.h      |  4 ++++
src/qemu/qemu_monitor_json.c | 22 ++++++++++++++++++++++
src/qemu/qemu_monitor_json.h |  4 ++++
6 files changed, 76 insertions(+)

[[RESEND] 5/8] migration/dirtyrate: Implement qemuDomainCalculateDirtyRate

Posted by Hao Wang 1 week ago
Implement qemuDomainCalculateDirtyRate which calculates domain's memory
dirty rate using qmp "calc-dirty-rate".

Signed-off-by: Hao Wang <wanghao232@huawei.com>
Signed-off-by: Zhou Yimin <zhouyimin@huawei.com>
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com>
---
 src/qemu/qemu_migration.c    | 29 +++++++++++++++++++++++++++++
 src/qemu/qemu_migration.h    |  5 +++++
 src/qemu/qemu_monitor.c      | 12 ++++++++++++
 src/qemu/qemu_monitor.h      |  4 ++++
 src/qemu/qemu_monitor_json.c | 22 ++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |  4 ++++
 6 files changed, 76 insertions(+)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index be89c0d807..a3c2618bd1 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5870,3 +5870,32 @@ qemuDomainQueryDirtyRate(virDomainPtr dom,
 
     return ret;
 }
+
+
+int
+qemuDomainCalculateDirtyRate(virDomainPtr dom,
+                             virDomainObjPtr vm,
+                             long long sec)
+{
+    virQEMUDriverPtr driver = dom->conn->privateData;
+    qemuDomainObjPrivatePtr priv;
+    int ret = -1;
+
+    if (!virDomainObjIsActive(vm)) {
+        virReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("domain is not running"));
+        return ret;
+    }
+
+    priv = vm->privateData;
+
+    VIR_DEBUG("Calculate dirty rate during %lld seconds", sec);
+    if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_DIRTYRATE) < 0)
+        return ret;
+
+    ret = qemuMonitorCalculateDirtyRate(priv->mon, sec);
+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
+        ret = -1;
+
+    return ret;
+}
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 0cd12adb27..15f707fb57 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -263,3 +263,8 @@ int
 qemuDomainQueryDirtyRate(virDomainPtr dom,
                          virDomainObjPtr vm,
                          virDomainDirtyRateInfoPtr info);
+
+int
+qemuDomainCalculateDirtyRate(virDomainPtr dom,
+                             virDomainObjPtr vm,
+                             long long sec);
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 35b0db1c13..017dd69dbf 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4658,3 +4658,15 @@ qemuMonitorQueryDirtyRate(qemuMonitorPtr mon,
 
     return qemuMonitorJSONQueryDirtyRate(mon, info);
 }
+
+
+int
+qemuMonitorCalculateDirtyRate(qemuMonitorPtr mon,
+                              long long sec)
+{
+    VIR_DEBUG("seconds=%lld", sec);
+
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONCalculateDirtyRate(mon, sec);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 15601b7ee8..5555a51fb9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1447,3 +1447,7 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
 int
 qemuMonitorQueryDirtyRate(qemuMonitorPtr mon,
                           virDomainDirtyRateInfoPtr info);
+
+int
+qemuMonitorCalculateDirtyRate(qemuMonitorPtr mon,
+                              long long sec);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 1ce9f8576b..d68dc86b7d 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -9468,3 +9468,25 @@ qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon,
 
     return qemuMonitorJSONExtractDirtyRateInfo(data, info);
 }
+
+
+int
+qemuMonitorJSONCalculateDirtyRate(qemuMonitorPtr mon,
+                                  long long sec)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("calc-dirty-rate",
+                                           "I:calc-time", (long)sec,
+                                           NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+        return -1;
+
+    return 0;
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index f3f5b78fb9..6c5fb2b091 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -698,3 +698,7 @@ qemuMonitorJSONGetCPUMigratable(qemuMonitorPtr mon,
 int
 qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon,
                               virDomainDirtyRateInfoPtr info);
+
+int
+qemuMonitorJSONCalculateDirtyRate(qemuMonitorPtr mon,
+                                  long long sec);
-- 
2.23.0