From 065f3f4c3415e56ff73f913dd0bf2cc24258f9e0 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@libreoffice.org>
Date: Wed, 2 Nov 2016 19:19:34 +0100
Subject: QEMU Guest Agent bug mititigation for libvirt 1.2.9.

---
 virsh-ga | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'virsh-ga')

diff --git a/virsh-ga b/virsh-ga
index 2b26c82..6724298 100755
--- a/virsh-ga
+++ b/virsh-ga
@@ -52,7 +52,9 @@ sub ga_send(@) {
         my $h = JSON->new->utf8->allow_nonref->decode($str{$out});
         return $h->{return};
     }
-    elsif ($str{$err} eq "error: Guest agent is not responding: QEMU guest agent is not connected\n") {
+    elsif ($str{$err} eq "error: Guest agent is not responding: QEMU guest agent is not connected\n"
+        or $str{$err} eq "error: Guest agent is not responding: Guest agent not available for now\n"
+        or $str{$err} =~ /\Aerror: internal error: Guest agent returned ID: \d+ instead of \d+\n\z/) {
         exit 128;
     } else {
         die $str{$err};
-- 
cgit v1.2.3