Drop patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch

not needed with QEMU since at least stretch.

debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch

@@ -13,7 +13,7 @@ require the 'TERM' environment variable to be set to the terminal type.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index f253eb2..acb669d 100644
+index 7087abe..d7e26cb 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
 @@ -847,6 +847,8 @@ int virNetSocketNewConnectSSH(const char *nodename,

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch

@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index cd6fbf2..45abc61 100644
+index a908422..935869f 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1600,7 +1600,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1598,7 +1598,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
  void virWaitForDevices(void)
  {
  # ifdef UDEVADM

debian/patches/apparmor-Allow-virt-aa-helper-to-access-the-name-service-.patch

@@ -8,7 +8,7 @@ Closes: #882979
  1 file changed, 1 insertion(+)
 
 diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-index f806e3c..69caa8c 100644
+index d57c5bb..8aa9dd2 100644
 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -3,6 +3,7 @@

debian/patches/debian/Debianize-systemd-service-files.patch

@@ -8,10 +8,10 @@ Subject: Debianize systemd service files
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 769702e..15db5f4 100644
+index 7f689e0..d57690c 100644
 --- a/src/remote/libvirtd.service.in
 +++ b/src/remote/libvirtd.service.in
-@@ -21,8 +21,8 @@ Documentation=https://libvirt.org
+@@ -22,8 +22,8 @@ Documentation=https://libvirt.org
  
  [Service]
  Type=notify

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 310e64a..fad96a2 100644
+index 106d3b8..4040cfb 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -12866,8 +12866,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13091,8 +13091,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
  @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

debian/patches/debian/Prefer-sbin-over-usr-sbin.patch

@@ -11,7 +11,7 @@ Closes: #895145
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0aecf68..5e49a3e 100644
+index e25bf0a..106b4bf 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -110,7 +110,7 @@ then

debian/patches/debian/Use-upstreams-polkit-rule.patch

@@ -10,10 +10,10 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does.
  3 files changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 0d8d380..56679be 100644
+index db8c8eb..db0a29c 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -818,7 +818,6 @@ else ! WITH_LIBVIRTD
+@@ -812,7 +812,6 @@ else ! WITH_LIBVIRTD
  install-logrotate:
  uninstall-logrotate:
  endif ! WITH_LIBVIRTD
@@ -22,10 +22,10 @@ index 0d8d380..56679be 100644
  install-init:: $(SYSVINIT_FILES) install-sysconfig
  	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
 diff --git a/src/Makefile.in b/src/Makefile.in
-index fad96a2..bd34b57 100644
+index 4040cfb..0e3bd56 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -12915,12 +12915,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13140,12 +13140,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@		$(DESTDIR)$(policydir)/org.libvirt.unix.policy
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \

debian/patches/debian/apparmor_profiles_local_include.patch

@@ -9,10 +9,10 @@ Include local apparmor profile
  2 files changed, 4 insertions(+)
 
 diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-index 6869685..f806e3c 100644
+index e32402a..d57c5bb 100644
 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-@@ -62,5 +62,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+@@ -63,5 +63,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
    /**.[iI][sS][oO] r,
    /**/disk{,.*} r,
  

debian/patches/debian/remove-RHism.diff.patch

@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 929958a..6668ab5 100644
+index dc100db..b94aa95 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.

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

-From: =?utf-8?q?Andreas_Bie=C3=9Fmann?= <biessmann@corscience.de>
-Date: Thu, 18 Mar 2010 13:05:59 +0100
-Subject: patch qemuMonitorTextGetMigrationStatus to intercept unknown command
- 'info migrate'
-
-Debian package kvm up to version 72 has not implemented the command 'info migrate'.
-This command interface returns help page of info commands and looks like this:
-
----8<---
-info version  -- show the version of qemu
-info network  -- show the network state
-info block  -- show the block devices
-info blockstats  -- show block device statistics
-info registers  -- show the cpu registers
-info cpus  -- show infos for each CPU
-info history  -- show the command line history
-info irq  -- show the interrupts statistics (if available)
-info pic  -- show i8259 (PIC) state
-info pci  -- show PCI info
-info tlb  -- show virtual to physical memory mappings
-info mem  -- show the active virtual memory mappings
-info jit  -- show dynamic compiler info
-info kqemu  -- show kqemu information
-info kvm  -- show kvm information
-info usb  -- show guest USB devices
-info usbhost  -- show host USB devices
-info profile  -- show profiling information
-info capture  -- show capture information
-info snapshots  -- show the currently saved VM snapshots
-info pcmcia  -- show guest PCMCIA status
-info mice  -- show which guest mouse is receiving events
-info vnc  -- show the vnc server status
-info name  -- show the current VM name
-info slirp  -- show SLIRP statistics
-info migration  -- show migration information
---->8---
-
-This patch triggers for 'info migration' in reply to 'info migrate' command
-to savely detect that the command 'info migrate' is not implemented.
----
- src/qemu/qemu_monitor_text.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 7c34ca5..17b82e3 100644
---- a/src/qemu/qemu_monitor_text.c
-+++ b/src/qemu/qemu_monitor_text.c
-@@ -1473,7 +1473,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
-             }
-             stats->disk_total *= 1024;
-         }
--    }
-+    } else if (strstr(reply, "info migration") != NULL) {
-+        /* 'info migrate' returned help for info commands and the help page
-+         * advertises 'info migration' command. Therefore we have an old
-+         * command implementation installed and this must be kvm 72 on debian */
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                        _("command 'info migrate' is not implemented in kvm,"
-+                          " please update to qemu-kvm"));
-+        goto cleanup;
-+   }
- 
-  done:
-     ret = 0;

debian/patches/series

@@ -3,7 +3,6 @@ debian/Debianize-libvirt-guests.patch
 debian/Debianize-systemd-service-files.patch
 debian/Debianize-virtlockd.patch
 debian/Debianize-virtlogd.patch
-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 openpty-Skip-test-if-no-pty-is-available.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Skip-vircgrouptest.patch