From 0aac8c94472c01a6525679ace35c0ec9d9e28f0a Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 18 Sep 2008 08:54:23 +0000
Subject: [PATCH] Fix trailing whitespace & unmarked diagnostic warning

---
 ChangeLog         | 5 +++++
 configure.in      | 2 +-
 libvirt.spec.in   | 2 +-
 src/qemu_driver.c | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ac49101e7..2bc1da1242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 18 09:52:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/qemu_driver.c, configure.in, libvirt.spec.in: Remove
+	trailing whitespace & fix diagnostic string translation.
+
 Wed Sep 17 17:02:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	* src/openvz_driver.c: Fix segfault in OpenVZ driver
diff --git a/configure.in b/configure.in
index fcc2cdec7e..6a2ada104e 100644
--- a/configure.in
+++ b/configure.in
@@ -318,7 +318,7 @@ fi
 
 dnl
 dnl check for kvm headers
-dnl 
+dnl
 AC_CHECK_HEADERS([linux/kvm.h])
 
 dnl Need to test if pkg-config exists
diff --git a/libvirt.spec.in b/libvirt.spec.in
index cc5aca56bd..708d8add17 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -243,7 +243,7 @@ sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
 
 # If we are not building with certain options, we need to remove files
 # so that we don't get Installed (but unpackaged) errors
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libvirt 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libvirt
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libvirt
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libvirt.pc
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 33190f6f82..9d8f75a782 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -1808,10 +1808,10 @@ static int kvmGetMaxVCPUs(void) {
     int maxvcpus = 1;
 
     int r, fd;
-    
+
     fd = open(KVM_DEVICE, O_RDONLY);
     if (fd < 0) {
-        qemudLog(QEMUD_WARN, _("Unable to open " KVM_DEVICE ": %s\n"), strerror(errno));
+        qemudLog(QEMUD_WARN, _("Unable to open %s: %s\n"), KVM_DEVICE, strerror(errno));
         return maxvcpus;
     }
 
-- 
2.47.2