[libvirt] [PATCH] conf: Fix XMl generation for smartcards

When formating XML for smartcard device with mode=host, libvirt generates invalid XML if the device has address info associated: <smartcard mode='host' <address type='ccid' controller='0' slot='1'/> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 59adf36..f2bb3aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7058,6 +7058,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); return 0; } + virBufferAddLit(buf, ">\n"); break; case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES: -- 1.7.4

On 02/14/2011 04:18 AM, Jiri Denemark wrote:
When formating XML for smartcard device with mode=host, libvirt
s/formating/formatting/
generates invalid XML if the device has address info associated:
<smartcard mode='host' <address type='ccid' controller='0' slot='1'/> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 59adf36..f2bb3aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7058,6 +7058,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); return 0; } + virBufferAddLit(buf, ">\n"); break;
ACK; thanks for catching this. Definitely a pre-0.8.8 bug fix. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

On Mon, Feb 14, 2011 at 09:31:49 -0700, Eric Blake wrote:
On 02/14/2011 04:18 AM, Jiri Denemark wrote:
When formating XML for smartcard device with mode=host, libvirt
s/formating/formatting/
generates invalid XML if the device has address info associated:
<smartcard mode='host' <address type='ccid' controller='0' slot='1'/> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 59adf36..f2bb3aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7058,6 +7058,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); return 0; } + virBufferAddLit(buf, ">\n"); break;
ACK; thanks for catching this. Definitely a pre-0.8.8 bug fix.
Fixed (XMl => XML in subject line as well) and pushed. Jirka
participants (2)
-
Eric Blake
-
Jiri Denemark