提交 70ffa02f 编写于 作者: D Dmitry Mishin 提交者: Daniel P. Berrange

conf: Add new 'append' attribute for chardevs with file source

Currently, there is no possibility for user to specify desired behaviour of
output to file - truncate or append. This patch adds an ability to explicitly
specify that user wants to preserve file's content on reopen.
Signed-off-by: NDmitry Mishin <dim@virtuozzo.com>
上级 429b4211
...@@ -3252,6 +3252,11 @@ ...@@ -3252,6 +3252,11 @@
<optional> <optional>
<attribute name="slave"/> <attribute name="slave"/>
</optional> </optional>
<optional>
<attribute name="append">
<ref name="virOnOff"/>
</attribute>
</optional>
<zeroOrMore> <zeroOrMore>
<ref name='devSeclabel'/> <ref name='devSeclabel'/>
</zeroOrMore> </zeroOrMore>
......
...@@ -1722,9 +1722,10 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, ...@@ -1722,9 +1722,10 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest,
virDomainChrSourceDefClear(dest); virDomainChrSourceDefClear(dest);
switch (src->type) { switch (src->type) {
case VIR_DOMAIN_CHR_TYPE_FILE:
dest->data.file.append = src->data.file.append;
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
if (VIR_STRDUP(dest->data.file.path, src->data.file.path) < 0) if (VIR_STRDUP(dest->data.file.path, src->data.file.path) < 0)
return -1; return -1;
...@@ -1796,9 +1797,12 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, ...@@ -1796,9 +1797,12 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
return false; return false;
switch ((virDomainChrType)src->type) { switch ((virDomainChrType)src->type) {
case VIR_DOMAIN_CHR_TYPE_FILE:
return src->data.file.append == tgt->data.file.append &&
STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
break;
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
break; break;
...@@ -9371,6 +9375,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, ...@@ -9371,6 +9375,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
char *channel = NULL; char *channel = NULL;
char *master = NULL; char *master = NULL;
char *slave = NULL; char *slave = NULL;
char *append = NULL;
int remaining = 0; int remaining = 0;
while (cur != NULL) { while (cur != NULL) {
...@@ -9380,9 +9385,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, ...@@ -9380,9 +9385,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
mode = virXMLPropString(cur, "mode"); mode = virXMLPropString(cur, "mode");
switch ((virDomainChrType) def->type) { switch ((virDomainChrType) def->type) {
case VIR_DOMAIN_CHR_TYPE_FILE:
if (!append)
append = virXMLPropString(cur, "append");
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
/* PTY path is only parsed from live xml. */ /* PTY path is only parsed from live xml. */
...@@ -9468,9 +9475,15 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, ...@@ -9468,9 +9475,15 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
case VIR_DOMAIN_CHR_TYPE_LAST: case VIR_DOMAIN_CHR_TYPE_LAST:
break; break;
case VIR_DOMAIN_CHR_TYPE_FILE:
if (append &&
(def->data.file.append = virTristateSwitchTypeFromString(append)) <= 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid append attribute value '%s'"), append);
goto error;
}
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
if (!path && if (!path &&
def->type != VIR_DOMAIN_CHR_TYPE_PTY) { def->type != VIR_DOMAIN_CHR_TYPE_PTY) {
...@@ -9611,6 +9624,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, ...@@ -9611,6 +9624,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
VIR_FREE(connectService); VIR_FREE(connectService);
VIR_FREE(path); VIR_FREE(path);
VIR_FREE(channel); VIR_FREE(channel);
VIR_FREE(append);
return remaining; return remaining;
...@@ -20056,6 +20070,10 @@ virDomainChrSourceDefFormat(virBufferPtr buf, ...@@ -20056,6 +20070,10 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) {
virBufferEscapeString(buf, "<source path='%s'", virBufferEscapeString(buf, "<source path='%s'",
def->data.file.path); def->data.file.path);
if (def->type == VIR_DOMAIN_CHR_TYPE_FILE &&
def->data.file.append)
virBufferAsprintf(buf, " append='%s'",
virTristateSwitchTypeToString(def->data.file.append));
virDomainSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags); virDomainSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags);
} }
break; break;
......
...@@ -1176,6 +1176,7 @@ struct _virDomainChrSourceDef { ...@@ -1176,6 +1176,7 @@ struct _virDomainChrSourceDef {
/* no <source> for null, vc, stdio */ /* no <source> for null, vc, stdio */
struct { struct {
char *path; char *path;
int append; /* enum virTristateSwitch */
} file; /* pty, file, pipe, or device */ } file; /* pty, file, pipe, or device */
struct { struct {
char *master; char *master;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册