diff options
| author |   Martin Kletzander <mkletzan@redhat.com> | 2012-09-18 11:40:52 +0200 |
|---|---|---|
| committer | Martin Kletzander <mkletzan@redhat.com> | 2012-09-18 16:42:53 +0200 |
| commit | e6bd3ce056f5362a229aad93278abc11814bb476 (patch) | |
| tree | 356f5ecdc5eb0d515cfad160948e3c0e2d28ae0c | |
| parent | secret: Fix error for private secrets (diff) | |
| download | libvirt-e6bd3ce056f5362a229aad93278abc11814bb476.tar.gz libvirt-e6bd3ce056f5362a229aad93278abc11814bb476.tar.bz2 libvirt-e6bd3ce056f5362a229aad93278abc11814bb476.zip | |
Fix minor details not only in apic eoi
The introduction of APIC EOI patches had a few little details that
could look better, so this patch fixes that and one more place in the
file as well (same problem).
| -rw-r--r-- | docs/formatdomain.html.in | 6 | ||||
| -rw-r--r-- | src/conf/domain_conf.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8bdfbf175..51f897cd9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1020,9 +1020,9 @@ </dd> <dt><code>apic</code></dt> <dd>APIC allows the use of programmable IRQ - management. <span class="since">Since 0.10.2 (QEMU only)</span> - there is an optional attribute <code>eoi</code> with values "on" - and "off" which toggles the availability of EOI (End of + management. <span class="since">Since 0.10.2 (QEMU only)</span> there is + an optional attribute <code>eoi</code> with values <code>on</code> + and <code>off</code> which toggles the availability of EOI (End of Interrupt) for the guest. </dd> <dt><code>hap</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b8ba0e2d0..15b360a76 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8617,7 +8617,6 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virReportError(VIR_ERR_XML_ERROR, _("Unsupported CPU placement mode '%s'"), tmp); - VIR_FREE(tmp); goto error; } VIR_FREE(tmp); @@ -8851,7 +8850,6 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown value for attribute eoi: %s"), tmp); - VIR_FREE(tmp); goto error; } def->apic_eoi = eoi; @@ -13433,6 +13431,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, } virBufferAddLit(buf, " <os>\n"); + virBufferAddLit(buf, " <type"); if (def->os.arch) virBufferAsprintf(buf, " arch='%s'", def->os.arch); @@ -13523,7 +13522,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, " eoi='%s'", virDomainApicEoiTypeToString(def->apic_eoi)); } - virBufferAsprintf(buf, "/>\n"); + virBufferAddLit(buf, "/>\n"); } } virBufferAddLit(buf, " </features>\n"); |