From: Pavel Hrdina Date: Fri, 6 May 2016 11:55:15 +0000 (+0200) Subject: domain_conf: fix migration/managedsave with usb keyboard X-Git-Tag: v1.3.3.2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e2b834073837e6819bacfa4014465ce849613d1;p=thirdparty%2Flibvirt.git domain_conf: fix migration/managedsave with usb keyboard Commin 36785c7e refactored the code for input devices but introduced a bug where we removed all keyboard from migratable XML. We have to remove only implicit keyboards like PS2 or XEN. Signed-off-by: Pavel Hrdina --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc99301cfc..7fcaafeb42 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21077,8 +21077,10 @@ virDomainInputDefFormat(virBufferPtr buf, const char *bus = virDomainInputBusTypeToString(def->bus); /* don't format keyboard into migratable XML for backward compatibility */ - if (def->type == VIR_DOMAIN_INPUT_TYPE_KBD && - flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) + if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && + def->type == VIR_DOMAIN_INPUT_TYPE_KBD && + (def->bus == VIR_DOMAIN_INPUT_BUS_PS2 || + def->bus == VIR_DOMAIN_INPUT_BUS_XEN)) return 0; if (!type) {