]> xenbits.xensource.com Git - libvirt.git/commitdiff
nodeinfo: remove FreeBSD specific code for getting memory
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 27 Apr 2016 15:30:21 +0000 (16:30 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 9 Jun 2016 17:04:44 +0000 (18:04 +0100)
The GNULIB physmem module already provides support for
the FreeBSD platform, so there's no reason to re-implement
FreeBSD portability code in libvirt. If there are bugs in
the GNULIB code, we should fix GNULIB rather than workaround
it in libvirt.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/nodeinfo.c

index bc5400f45f375a59f15c36d8b98f8ce19406cdd5..c037a384fd7d2f8a106b94310a7225e00c271cf6 100644 (file)
@@ -1892,33 +1892,6 @@ nodeGetMemoryFake(unsigned long long *mem,
 {
     int ret = -1;
 
-#if defined(__FreeBSD__)
-    unsigned long pagesize = getpagesize();
-    u_int value;
-    size_t value_size = sizeof(value);
-
-    if (mem) {
-        if (sysctlbyname("vm.stats.vm.v_page_count", &value,
-                         &value_size, NULL, 0) < 0) {
-            virReportSystemError(errno, "%s",
-                                 _("sysctl failed for vm.stats.vm.v_page_count"));
-            goto cleanup;
-        }
-        *mem = value * (unsigned long long)pagesize;
-    }
-
-    if (freeMem) {
-        if (sysctlbyname("vm.stats.vm.v_free_count", &value,
-                         &value_size, NULL, 0) < 0) {
-            virReportSystemError(errno, "%s",
-                                 _("sysctl failed for vm.stats.vm.v_free_count"));
-            goto cleanup;
-        }
-
-        *freeMem = value * (unsigned long long)pagesize;
-    }
-
-#else
     if (mem) {
         double total = physmem_total();
         if (!total) {
@@ -1941,7 +1914,6 @@ nodeGetMemoryFake(unsigned long long *mem,
 
         *freeMem = (unsigned long long) avail;
     }
-#endif
 
     ret = 0;
  cleanup: