From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 3 Jun 2015 14:52:57 +0000 (+0200)
Subject: Check for balloon model in qemuDomainSetMemoryStatsPeriod
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf42e6d84820c7d63e32f52de0bf3477d0f50133;p=libvirt.git

Check for balloon model in qemuDomainSetMemoryStatsPeriod

There's no point in calling the monitor if there is no balloon.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4690406196..34e5581604 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2459,6 +2459,14 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period,
     priv = vm->privateData;
 
     if (def) {
+        if (!def->memballoon ||
+            def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Memory balloon model must be virtio to set the"
+                             " collection period"));
+            goto endjob;
+        }
+
         qemuDomainObjEnterMonitor(driver, vm);
         r = qemuMonitorSetMemoryStatsPeriod(priv->mon, period);
         if (qemuDomainObjExitMonitor(driver, vm) < 0)
@@ -2475,6 +2483,13 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period,
     }
 
     if (persistentDef) {
+        if (!persistentDef->memballoon ||
+            persistentDef->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Memory balloon model must be virtio to set the"
+                             " collection period"));
+            goto endjob;
+        }
         persistentDef->memballoon->period = period;
         ret = virDomainSaveConfig(cfg->configDir, persistentDef);
         goto endjob;