Sounds good! Thanks, Jose
On Sat, Jan 11, 2014 at 06:55:53PM +0200, Dimitris Aragiorgis wrote: > Hi, > > since qemu 1.7 and Ganeti 2.9 are officially backported to wheezy > maybe is a good idea to push it against stable-2.9 and not stable-2.10. > > What do you think? > > Thanks, > dimara > > > * Dimitris Aragiorgis <[email protected]> [2014-01-11 18:48:18 +0200]: > > > Commit de253f14 of QEMU repo "BREAKS QMP's compatibility for > > the error response" as it removes "data" key from qmp error > > response messages. To this end we only log "class" and "desc" > > values of the message. > > > > Signed-off-by: Dimitris Aragiorgis <[email protected]> > > Signed-off-by: Stratos Psomadakis <[email protected]> > > --- > > lib/hypervisor/hv_kvm.py | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py > > index 3df5e14..3b254e1 100644 > > --- a/lib/hypervisor/hv_kvm.py > > +++ b/lib/hypervisor/hv_kvm.py > > @@ -462,7 +462,6 @@ class QmpConnection(MonitorSocket): > > _RETURN_KEY = RETURN_KEY = "return" > > _ACTUAL_KEY = ACTUAL_KEY = "actual" > > _ERROR_CLASS_KEY = "class" > > - _ERROR_DATA_KEY = "data" > > _ERROR_DESC_KEY = "desc" > > _EXECUTE_KEY = "execute" > > _ARGUMENTS_KEY = "arguments" > > @@ -606,11 +605,10 @@ class QmpConnection(MonitorSocket): > > err = response[self._ERROR_KEY] > > if err: > > raise errors.HypervisorError("kvm: error executing the %s" > > - " command: %s (%s, %s):" % > > + " command: %s (%s):" % > > (command, > > err[self._ERROR_DESC_KEY], > > - err[self._ERROR_CLASS_KEY], > > - err[self._ERROR_DATA_KEY])) > > + err[self._ERROR_CLASS_KEY])) > > > > elif not response[self._EVENT_KEY]: > > return response > > -- > > 1.7.10.4 -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
