- Wait for ntp service before running libvirt-guests

libvirt-guests-wait-for-ntp.patch
  bnc#895194

- Canonicalize host arch name ppc64le to ppc64
  ppc64le-canonical-name.patch
  bnc#894956

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=405

libvirt-guests-wait-for-ntp.patch

@@ -0,0 +1,30 @@
+From 79a752f1eb5a6b6b4b900d8899dfb9712be824ec Mon Sep 17 00:00:00 2001
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Mon, 8 Sep 2014 10:22:14 -0600
+Subject: [PATCH] libvirt-guests: wait for ntp service
+
+If an NTP server is configured on the host, it is possible for
+libvirt-guests to start before the NTP service, in which case
+guest clocks won't be synchronized to the host clock.
+
+Add ntp-wait.service to "After" in libvirt-guests systemd service
+file, ensuring NTP has synchronized the host clock before starting
+any guests.
+
+Signed-off-by: Jim Fehlig <jfehlig@suse.com>
+---
+ tools/libvirt-guests.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libvirt-1.2.8/tools/libvirt-guests.service.in
+===================================================================
+--- libvirt-1.2.8.orig/tools/libvirt-guests.service.in
++++ libvirt-1.2.8/tools/libvirt-guests.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Suspend Active Libvirt Guests
+-After=network.target libvirtd.service
++After=network.target libvirtd.service ntp-wait.service
+ Documentation=man:libvirtd(8)
+ Documentation=http://libvirt.org
+ 

libvirt.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Sep  8 11:20:36 MDT 2014 - jfehlig@suse.com
+
+- Wait for ntp service before running libvirt-guests
+  libvirt-guests-wait-for-ntp.patch
+  bnc#895194
+
+-------------------------------------------------------------------
+Thu Sep  4 16:09:23 MDT 2014 - jfehlig@suse.com
+
+- Canonicalize host arch name ppc64le to ppc64
+  ppc64le-canonical-name.patch
+  bnc#894956
+
 -------------------------------------------------------------------
 Tue Sep  2 09:17:06 MDT 2014 - jfehlig@suse.com
 

libvirt.spec

@@ -429,12 +429,15 @@ Source1:        libvirtd.init
 Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
+# Patches pending upstream review
+Patch100:       libvirt-guests-wait-for-ntp.patch
 # Need to go upstream
-Patch100:       xen-name-for-devid.patch
-Patch101:       xen-pv-cdrom.patch
-Patch102:       blockcopy-check-dst-identical-device.patch
-Patch103:       libvirt-ppc64le-support.patch
-Patch104:       libvirt-power8-models.patch
+Patch150:       xen-name-for-devid.patch
+Patch151:       xen-pv-cdrom.patch
+Patch152:       blockcopy-check-dst-identical-device.patch
+Patch153:       libvirt-ppc64le-support.patch
+Patch154:       libvirt-power8-models.patch
+Patch155:       ppc64le-canonical-name.patch
 # Our patches
 Patch200:       libvirtd-defaults.patch
 Patch201:       libvirtd-init-script.patch
@@ -948,10 +951,12 @@ namespaces.
 %prep
 %setup -q
 %patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
+%patch150 -p1
+%patch151 -p1
+%patch152 -p1
+%patch153 -p1
+%patch154 -p1
+%patch155 -p1
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1

ppc64le-canonical-name.patch

@@ -0,0 +1,17 @@
+Canonicalize hostarch name ppc64le to ppc64
+
+See bnc#894956
+
+Index: libvirt-1.2.8/src/util/virarch.c
+===================================================================
+--- libvirt-1.2.8.orig/src/util/virarch.c
++++ libvirt-1.2.8/src/util/virarch.c
+@@ -169,6 +169,8 @@ virArch virArchFromHost(void)
+         arch = VIR_ARCH_I686;
+     } else if (STREQ(ut.machine, "amd64")) {
+         arch = VIR_ARCH_X86_64;
++    } else if (STREQ(ut.machine, "ppc64le")) {
++        arch = VIR_ARCH_PPC64;
+     } else {
+         /* Otherwise assume the canonical name */
+         if ((arch = virArchFromString(ut.machine)) == VIR_ARCH_NONE) {