mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-02 19:31:18 +00:00
ca6dc7b585
Many of the domain xml format functions (including all of the device
format functions) had hard-coded spaces, which made for incorrect
indentation when those functions were called in a different context
(for example, commit 2122cf39 added <interface> XML into the document
provided to a network hook script, and in this case it should have
been indented by 2 spaces, but was instead indented by 6 spaces).
To make it possible to insert a properly indented device anywhere into
an XML document, this patch removes hardcoded spaces from the
formatting functions, and calls virBufferAdjustIndent() at appropriate
places instead. (a regex search of domain_conf.c was done to assure
that all occurrences of hardcoded spaces were removed).
virDomainDiskSourceDefFormatInternal() is also called from
snapshot_conf.c, so two virBufferAdjustIndent() calls were temporarily
added around that call - those functions will have hardcoded spaces
removed in a separate patch.
This could cause some conflicts when backporting future changes to the
formatting functions to older branches, but fortunately the changes
are almost all trivial, so conflict resolution will be obvious.
118 lines
3.2 KiB
C
118 lines
3.2 KiB
C
/*
|
|
* Copyright (C) 2010-2014 Red Hat, Inc.
|
|
* Copyright IBM Corp. 2008
|
|
*
|
|
* lxc_domain.h: LXC domain helpers
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "lxc_domain.h"
|
|
|
|
#include "viralloc.h"
|
|
#include "virlog.h"
|
|
#include "virerror.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_LXC
|
|
|
|
static void *virLXCDomainObjPrivateAlloc(void)
|
|
{
|
|
virLXCDomainObjPrivatePtr priv;
|
|
|
|
if (VIR_ALLOC(priv) < 0)
|
|
return NULL;
|
|
|
|
return priv;
|
|
}
|
|
|
|
static void virLXCDomainObjPrivateFree(void *data)
|
|
{
|
|
virLXCDomainObjPrivatePtr priv = data;
|
|
|
|
virCgroupFree(&priv->cgroup);
|
|
|
|
VIR_FREE(priv);
|
|
}
|
|
|
|
|
|
static int virLXCDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
|
|
{
|
|
virLXCDomainObjPrivatePtr priv = data;
|
|
|
|
virBufferAsprintf(buf, "<init pid='%llu'/>\n",
|
|
(unsigned long long)priv->initpid);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
|
|
{
|
|
virLXCDomainObjPrivatePtr priv = data;
|
|
unsigned long long thepid;
|
|
|
|
if (virXPathULongLong("string(./init[1]/@pid)", ctxt, &thepid) < 0) {
|
|
virErrorPtr err = virGetLastError();
|
|
VIR_WARN("Failed to load init pid from state %s", err ? err->message : "null");
|
|
priv->initpid = 0;
|
|
} else {
|
|
priv->initpid = thepid;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks = {
|
|
.alloc = virLXCDomainObjPrivateAlloc,
|
|
.free = virLXCDomainObjPrivateFree,
|
|
.format = virLXCDomainObjPrivateXMLFormat,
|
|
.parse = virLXCDomainObjPrivateXMLParse,
|
|
};
|
|
|
|
static int
|
|
virLXCDomainDefPostParse(virDomainDefPtr def,
|
|
virCapsPtr caps,
|
|
void *opaque ATTRIBUTE_UNUSED)
|
|
{
|
|
/* check for emulator and create a default one if needed */
|
|
if (!def->emulator &&
|
|
!(def->emulator = virDomainDefGetDefaultEmulator(def, caps)))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
|
const virDomainDef *def ATTRIBUTE_UNUSED,
|
|
virCapsPtr caps ATTRIBUTE_UNUSED,
|
|
void *opaque ATTRIBUTE_UNUSED)
|
|
{
|
|
if (dev->type == VIR_DOMAIN_DEVICE_CHR &&
|
|
dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
|
|
dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE)
|
|
dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
virDomainDefParserConfig virLXCDriverDomainDefParserConfig = {
|
|
.domainPostParseCallback = virLXCDomainDefPostParse,
|
|
.devicesPostParseCallback = virLXCDomainDeviceDefPostParse,
|
|
};
|