From: Osier Yang <jyang@redhat.com>
Date: Thu, 15 Mar 2012 11:40:33 +0000 (+0800)
Subject: numad: Fix typo and warning
X-Git-Tag: v0.9.11-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d86120fc52cfce20ec368989abb6590976850536;p=thirdparty%2Flibvirt.git

numad: Fix typo and warning

src/libvirt_private.syms:
  s/virDomainCpuPlacement/virDomainCpuPlacementMode/
src/qemu/qemu_process.c
  def->mem.cur_balloon expects "llu"
--
pushed under build-breaker rule
---

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d58082a2b5..e40c80eed8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -271,8 +271,8 @@ virDomainControllerModelSCSITypeToString;
 virDomainControllerModelUSBTypeFromString;
 virDomainControllerModelUSBTypeToString;
 virDomainControllerTypeToString;
-virDomainCpuPlacementTypeFromString;
-virDomainCpuPlacementTypeToString;
+virDomainCpuPlacementModeTypeFromString;
+virDomainCpuPlacementModeTypeToString;
 virDomainCpuSetFormat;
 virDomainCpuSetParse;
 virDomainDefAddImplicitControllers;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 56cb531d81..0af3751a6e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1641,7 +1641,7 @@ qemuGetNumadAdvice(virDomainDefPtr def)
     char *args = NULL;
     char *output = NULL;
 
-    if (virAsprintf(&args, "%d:%lu", def->vcpus, def->mem.cur_balloon) < 0) {
+    if (virAsprintf(&args, "%d:%llu", def->vcpus, def->mem.cur_balloon) < 0) {
         virReportOOMError();
         goto out;
     }