[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] libvirt 0.7.7 and kvm 72



Hi,
kvm 72 uses "info migration" instead of "info migrate":

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574272

It's not only that, the output format of these commands differs too so
that "virsh save" breaks. Stefan suggested the attached improved error
message.
Cheers,
 -- Guido
>From cbb911ea32272b377e8ade9736e781c2fd7d8473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann corscience de>
Date: Thu, 18 Mar 2010 13:05:59 +0100
Subject: [PATCH] patch qemuMonitorTextGetMigrationStatus to intercept unknown command 'info migrate'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

Signed-off-by: Andreas Bie??mann <biessmann corscience de>
---
 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 7f0e7f6..d0786e7 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1078,7 +1078,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;
-- 
1.6.6.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]