Rediff remaining patches

debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch

@@ -16,13 +16,13 @@ Bug: https://bugzilla.redhat.com/show_bug.cgi?id=614420
  1 files changed, 24 insertions(+), 3 deletions(-)
 
 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 4b0c2ee..391b08a 100644
+index dcdc937..034a501 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
-@@ -596,9 +596,30 @@ int virNetSocketNewConnectSSH(const char *nodename,
-     if (noTTY)
-         virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes",
+@@ -628,9 +628,30 @@ int virNetSocketNewConnectSSH(const char *nodename,
                               "-e", "none", NULL);
+     if (noVerify)
+         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
 -    virCommandAddArgList(cmd, nodename,
 -                         netcat ? netcat : "nc",
 -                         "-U", path, NULL);

debian/patches/Debianize-libvirt-guests.patch

@@ -9,7 +9,7 @@ Origin: vendor
  2 files changed, 17 insertions(+), 32 deletions(-)
 
 diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh
-index 30f957a..a3b8a15 100644
+index 367177e..43f35c9 100644
 --- a/tools/libvirt-guests.init.sh
 +++ b/tools/libvirt-guests.init.sh
 @@ -4,8 +4,8 @@
@@ -23,7 +23,7 @@ index 30f957a..a3b8a15 100644
  # Default-Start: 2 3 4 5
  # Default-Stop: 0 1 6
  # Short-Description: suspend/resume libvirt guests on shutdown/boot
-@@ -14,41 +14,27 @@
+@@ -14,42 +14,28 @@
  #              See http://libvirt.org
  ### END INIT INFO
  
@@ -64,6 +64,7 @@ index 30f957a..a3b8a15 100644
 +ON_SHUTDOWN=shutdown
 +SHUTDOWN_TIMEOUT=30
  START_DELAY=0
+ BYPASS_CACHE=0
  
 -test -f "$sysconfdir"/sysconfig/libvirt-guests &&
 -    . "$sysconfdir"/sysconfig/libvirt-guests
@@ -76,7 +77,7 @@ index 30f957a..a3b8a15 100644
  
  RETVAL=0
  
-@@ -310,8 +296,7 @@ gueststatus() {
+@@ -316,8 +302,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start
@@ -87,7 +88,7 @@ index 30f957a..a3b8a15 100644
      if [ -f "$LISTFILE" ]; then
          gettext "stopped, with saved guests"; echo
 diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 37b258e..b5a7b76 100644
+index 9b8b64f..e0644db 100644
 --- a/tools/libvirt-guests.sysconf
 +++ b/tools/libvirt-guests.sysconf
 @@ -8,7 +8,7 @@
@@ -99,7 +100,7 @@ index 37b258e..b5a7b76 100644
  
  # number of seconds to wait between each guest start
  #START_DELAY=0
-@@ -21,7 +21,7 @@
+@@ -21,10 +21,10 @@
  #             which just needs a long time to shutdown. When setting
  #             ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
  #             value suitable for your guests.
@@ -109,4 +110,7 @@ index 37b258e..b5a7b76 100644
  # number of seconds we're willing to wait for a guest to shut down
 -#SHUTDOWN_TIMEOUT=0
 +#SHUTDOWN_TIMEOUT=30
+ 
+ # If non-zero, try to bypass the file system cache when saving and
+ # restoring guests, even though this may give slower operation for
 -- 

debian/patches/Disable-failing-virnetsockettest.patch

@@ -8,10 +8,10 @@ until we debugged the interaction with pbuilder
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index f6c7274..6532645 100644
+index e72b9a0..f76a779 100644
 --- a/tests/virnetsockettest.c
 +++ b/tests/virnetsockettest.c
-@@ -484,6 +484,7 @@ mymain(void)
+@@ -488,6 +488,7 @@ mymain(void)
      if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
          ret = -1;
  
@@ -19,9 +19,9 @@ index f6c7274..6532645 100644
      if (virtTestRun("Socket External Command /dev/zero", 1, testSocketCommandNormal, NULL) < 0)
          ret = -1;
      if (virtTestRun("Socket External Command /dev/does-not-exist", 1, testSocketCommandFail, NULL) < 0)
-@@ -525,6 +526,7 @@ mymain(void)
+@@ -553,6 +554,7 @@ mymain(void)
      };
-     if (virtTestRun("SSH test 4", 1, testSocketSSH, &sshData4) < 0)
+     if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0)
          ret = -1;
 +#endif
  

debian/patches/allow-libvirt-group-to-access-the-socket.patch

@@ -8,7 +8,7 @@ Subject: allow libvirt group to access the socket
  2 files changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 3a071b0..36dab4c 100644
+index 95e43dd..8876ce7 100644
 --- a/daemon/libvirtd.conf
 +++ b/daemon/libvirtd.conf
 @@ -78,7 +78,7 @@

debian/patches/fix-Debian-specific-path-to-hvm-loader.patch

@@ -12,10 +12,10 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 6a46a39..4bc7154 100644
+index 0309d8a..8c50f20 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
-@@ -2339,7 +2339,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2341,7 +2341,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?

debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch

@@ -42,10 +42,10 @@ to savely detect that the command 'info migrate' is not implemented.
  1 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index aa5d1c6..a2b0614 100644
+index 84941f9..635cf93 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1237,7 +1237,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1259,7 +1259,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              *total *= 1024;
  
          }

debian/patches/qemu-disable-network.diff.patch

@@ -8,10 +8,10 @@ Subject: qemu-disable-network.diff
  2 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index cd8a7e9..0927833 100644
+index 46b92a8..0125489 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1406,9 +1406,6 @@ if WITH_NETWORK
+@@ -1432,9 +1432,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -22,10 +22,10 @@ index cd8a7e9..0927833 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index e688234..e29370f 100644
+index 8bcf3b5..0e86d15 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -6266,9 +6266,6 @@ install-data-local:
+@@ -6352,9 +6352,6 @@ install-data-local:
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }

debian/patches/remove-RHism.diff.patch

@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 736b919..a89bba6 100644
+index 5b7fa9c..b995837 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -97,7 +97,7 @@ Output elapsed time information for each command.

debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch

@@ -25,10 +25,10 @@ Otherwise this results in crashes like:
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/tools/virsh.c b/tools/virsh.c
-index 9a189fd..3a42a4b 100644
+index f2fd9e5..39d41a1 100644
 --- a/tools/virsh.c
 +++ b/tools/virsh.c
-@@ -13374,6 +13374,9 @@ vshInit(vshControl *ctl)
+@@ -14340,6 +14340,9 @@ vshInit(vshControl *ctl)
      /* set up the signals handlers to catch disconnections */
      vshSetupSignals();