提交 33b62676 编写于 作者: D Daniel P. Berrangé

conf: drop virCapsPtr param from device post parse callback

None of the impls of this callback require the virCapsPtr param.
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 c9193362
......@@ -132,7 +132,6 @@ bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver,
static int
bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -5215,7 +5215,6 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock)
static int
virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt)
{
......@@ -5470,7 +5469,6 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDefPtr dev,
static int
virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps,
unsigned int flags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque)
......@@ -5478,14 +5476,14 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
int ret;
if (xmlopt->config.devicesPostParseCallback) {
ret = xmlopt->config.devicesPostParseCallback(dev, def, caps, flags,
ret = xmlopt->config.devicesPostParseCallback(dev, def, flags,
xmlopt->config.priv,
parseOpaque);
if (ret < 0)
return ret;
}
if ((ret = virDomainDeviceDefPostParseCommon(dev, def, caps, flags, xmlopt)) < 0)
if ((ret = virDomainDeviceDefPostParseCommon(dev, def, flags, xmlopt)) < 0)
return ret;
if (virDomainDeviceDefPostParseCheckFeatures(dev, xmlopt) < 0)
......@@ -5497,7 +5495,6 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
static int
virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps,
unsigned int flags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque)
......@@ -5513,7 +5510,7 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
parseOpaque = data;
}
ret = virDomainDeviceDefPostParse(dev, def, caps, flags, xmlopt, parseOpaque);
ret = virDomainDeviceDefPostParse(dev, def, flags, xmlopt, parseOpaque);
if (data && xmlopt->config.domainPostParseDataFree)
xmlopt->config.domainPostParseDataFree(data);
......@@ -5523,7 +5520,6 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
struct virDomainDefPostParseDeviceIteratorData {
virCapsPtr caps;
virDomainXMLOptionPtr xmlopt;
void *parseOpaque;
unsigned int parseFlags;
......@@ -5537,7 +5533,7 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def,
void *opaque)
{
struct virDomainDefPostParseDeviceIteratorData *data = opaque;
return virDomainDeviceDefPostParse(dev, def, data->caps,
return virDomainDeviceDefPostParse(dev, def,
data->parseFlags, data->xmlopt,
data->parseOpaque);
}
......@@ -5814,7 +5810,7 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
int
virDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque)
......@@ -5822,7 +5818,6 @@ virDomainDefPostParse(virDomainDefPtr def,
int ret = -1;
bool localParseOpaque = false;
struct virDomainDefPostParseDeviceIteratorData data = {
.caps = caps,
.xmlopt = xmlopt,
.parseFlags = parseFlags,
.parseOpaque = parseOpaque,
......@@ -7125,7 +7120,6 @@ virDomainDefValidate(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt)
{
struct virDomainDefPostParseDeviceIteratorData data = {
.caps = caps,
.xmlopt = xmlopt,
.parseFlags = parseFlags,
};
......@@ -16427,7 +16421,7 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainDeviceDefPtr
virDomainDeviceDefParse(const char *xmlStr,
const virDomainDef *def,
virCapsPtr caps,
virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque,
unsigned int flags)
......@@ -16585,7 +16579,7 @@ virDomainDeviceDefParse(const char *xmlStr,
}
/* callback to fill driver specific device aspects */
if (virDomainDeviceDefPostParseOne(dev, def, caps, flags,
if (virDomainDeviceDefPostParseOne(dev, def, flags,
xmlopt, parseOpaque) < 0)
return NULL;
......
......@@ -2648,7 +2648,6 @@ typedef int (*virDomainDefPostParseCallback)(virDomainDefPtr def,
* private data). */
typedef int (*virDomainDeviceDefPostParseCallback)(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps,
unsigned int parseFlags,
void *opaque,
void *parseOpaque);
......
......@@ -278,7 +278,6 @@ virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks = {
static int
libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -376,7 +376,6 @@ virLXCDomainDefPostParse(virDomainDefPtr def,
static int
virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def G_GNUC_UNUSED,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -1103,7 +1103,6 @@ openvzDomainDefPostParse(virDomainDefPtr def,
static int
openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def G_GNUC_UNUSED,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -1079,7 +1079,6 @@ phypDomainDefPostParse(virDomainDefPtr def,
static int
phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
const virDomainDef *def G_GNUC_UNUSED,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -8031,7 +8031,6 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDefPtr hostdev,
static int
qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags,
void *opaque,
void *parseOpaque)
......
......@@ -133,7 +133,6 @@ vmwareDomainDefPostParse(virDomainDefPtr def,
static int
vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
const virDomainDef *def G_GNUC_UNUSED,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -546,7 +546,6 @@ virVMXDomainDefPostParse(virDomainDefPtr def,
static int
virVMXDomainDevicesDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
const virDomainDef *def G_GNUC_UNUSED,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
......@@ -271,7 +271,6 @@ vzDomainDefValidate(const virDomainDef *def,
static int
vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED,
void *parseOpaque G_GNUC_UNUSED)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册