[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.1-1

[Guido Günther]

The following commit has been merged in the master branch:
commit 561ab2e62ae808e4e90c7db8a643ca1ad86ef6cd
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun May 9 14:00:57 2010 +0200

    New patch 0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
    
    patch qemuMonitorTextGetMigrationStatus to intercept unknown command 'info migrate'
    
    Thanks: Andreas Bießmann
    Closes: #574272

diff --git a/debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
new file mode 100644
index 0000000..61e0363
--- /dev/null
+++ b/debian/patches/0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -0,0 +1,64 @@
+From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann at corscience.de>
+Date: Thu, 18 Mar 2010 13:05:59 +0100
+Subject: [PATCH] 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 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
+index 3f917bf..e236588 100644
+--- a/src/qemu/qemu_monitor_text.c
++++ b/src/qemu/qemu_monitor_text.c
+@@ -1113,7 +1113,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+             *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 */
++        qemuReportError(VIR_ERR_INTERNAL_ERROR,
++                        _("command 'info migrate' is not implemented in kvm,"
++                          " please update to qemu-kvm"));
++        goto cleanup;
++   }
+ 
+ done:
+     ret = 0;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5b4033f..2706feb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-fix-Debian-specific-path-to-hvm-loader.patch
 0005-Terminate-nc-on-EOF.patch
 0006-Don-t-drop-caps-when-exec-ing-qemu.patch
+0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch

-- 
Libvirt Debian packaging