]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
libxl: get maximum memory of running domain
authorMarkus Groß <gross@univention.de>
Thu, 2 Jun 2011 12:16:32 +0000 (20:16 +0800)
committerDaniel Veillard <veillard@redhat.com>
Thu, 2 Jun 2011 12:16:32 +0000 (20:16 +0800)
* src/libxl/libxl_driver.c: fix the libxlDomainGetInfo to return the
  maximum memory for running domain

src/libxl/libxl_driver.c

index 3491f402d604e7230fbf8694b20ffce4284ba8a8..61c3494bc49996a2cdc3995420e150944c127225 100644 (file)
@@ -1639,6 +1639,7 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
     if (!virDomainObjIsActive(vm)) {
         info->cpuTime = 0;
         info->memory = vm->def->mem.cur_balloon;
+        info->maxMem = vm->def->mem.max_balloon;
     } else {
         if (libxl_domain_info(&driver->ctx, &d_info, dom->id) != 0) {
             libxlError(VIR_ERR_INTERNAL_ERROR,
@@ -1647,10 +1648,10 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
         }
         info->cpuTime = d_info.cpu_time;
         info->memory = d_info.current_memkb;
+        info->maxMem = d_info.max_memkb;
     }
 
     info->state = virDomainObjGetState(vm, NULL);
-    info->maxMem = vm->def->mem.max_balloon;
     info->nrVirtCpu = vm->def->vcpus;
     ret = 0;