12:05 p.m.
Hi,
This is a continuation of what we started in [1]. The changes
are all trivial, but done in parts to make the review less
annoying.
domain_conf.c is still a huge beast, but here we're putting it on
a diet, losing ~1k lines.
[1] https://www.redhat.com/archives/libvir-list/2020-December/msg00509.html
Daniel Henrique Barboza (12):
domain_conf: move duplicate check functions to domain_validate.c
domain_conf.c: rename virDomainDeviceInfoIterateInternal()
domain_conf: move address validation functions to domain_validate.c
domain_conf: move all virDomainDefValidateInternal() helpers to
domain_validate.c
domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
domain_validate.c: make local functions static
domain_conf: move net device validation to domain_validate.c
domain_conf: move all DeviceDefValidateInternal() helpers to
domain_validate
domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
domain_validate.c: make virDomainDeviceDefValidateInternal() helpers
static
domain_validate.c: put IOMMU validation into a new function
domain_validate.c: use VIR_ERR_CONFIG_UNSUPPORTED in validate
functions
src/conf/domain_conf.c | 1040 ++----------------------------------
src/conf/domain_conf.h | 58 +-
src/conf/domain_validate.c | 966 ++++++++++++++++++++++++++++++++-
src/conf/domain_validate.h | 31 +-
src/libvirt_private.syms | 9 +-
src/libxl/libxl_domain.c | 1 +
src/libxl/libxl_driver.c | 1 +
src/lxc/lxc_driver.c | 1 +
src/lxc/lxc_process.c | 1 +
src/qemu/qemu_domain.c | 1 +
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_process.c | 1 +
12 files changed, 1066 insertions(+), 1045 deletions(-)
--
2.26.2
12:05 p.m.
New subject: [PATCH 01/12] domain_conf: move duplicate check functions to domain_validate.c
virDomainDefCheckDuplicateDiskInfo() and virDomainDefCheckDuplicateDriveAddresses()
are static functions used by virDomainDefValidateInternal(). Let's
move them to domain_validate.c to start clearing up the path to
move virDomainDefValidateInternal().
Change the functions name slightly to be more on par with their
new home.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 129 +------------------------------------
src/conf/domain_conf.h | 5 ++
src/conf/domain_validate.c | 125 +++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 2 +
4 files changed, 135 insertions(+), 126 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 23415b323c..0f5d314e2c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4867,7 +4867,7 @@ virDomainDefPostParseGraphics(virDomainDef *def)
* Return true if any disk is already using the given address on the
* given bus, false otherwise.
*/
-static bool
+bool
virDomainDriveAddressIsUsedByDisk(const virDomainDef *def,
virDomainDiskBus bus_type,
const virDomainDeviceDriveAddress *addr)
@@ -6599,129 +6599,6 @@ virDomainDefValidateDeviceIterator(virDomainDefPtr def,
}
-static int
-virDomainDefCheckDuplicateDiskInfo(const virDomainDef *def)
-{
- size_t i;
- size_t j;
-
- for (i = 0; i < def->ndisks; i++) {
- for (j = i + 1; j < def->ndisks; j++) {
- if (virDomainDiskDefCheckDuplicateInfo(def->disks[i],
- def->disks[j]) < 0)
- return -1;
- }
- }
-
- return 0;
-}
-
-/**
- * virDomainDefCheckDuplicateDriveAddresses:
- * @def: domain definition to check against
- *
- * This function checks @def for duplicate drive addresses. Drive
- * addresses are only in use for disks and hostdevs at the moment.
- *
- * Returns 0 in case of there are no duplicate drive addresses, -1
- * otherwise.
- */
-static int
-virDomainDefCheckDuplicateDriveAddresses(const virDomainDef *def)
-{
- size_t i;
- size_t j;
-
- for (i = 0; i < def->ndisks; i++) {
- virDomainDiskDefPtr disk_i = def->disks[i];
- virDomainDeviceInfoPtr disk_info_i = &disk_i->info;
-
- if (disk_info_i->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
- continue;
-
- for (j = i + 1; j < def->ndisks; j++) {
- virDomainDiskDefPtr disk_j = def->disks[j];
- virDomainDeviceInfoPtr disk_info_j = &disk_j->info;
-
- if (disk_i->bus != disk_j->bus)
- continue;
-
- if (disk_info_j->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
- continue;
-
- if (virDomainDeviceInfoAddressIsEqual(disk_info_i, disk_info_j)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Found duplicate drive address for disk with
"
- "target name '%s' controller='%u'
bus='%u' "
- "target='%u' unit='%u'"),
- disk_i->dst,
- disk_info_i->addr.drive.controller,
- disk_info_i->addr.drive.bus,
- disk_info_i->addr.drive.target,
- disk_info_i->addr.drive.unit);
- return -1;
- }
- }
-
- /* Note: There is no need to check for conflicts with SCSI
- * hostdevs above, because conflicts with hostdevs are checked
- * in the next loop.
- */
- }
-
- for (i = 0; i < def->nhostdevs; i++) {
- virDomainHostdevDefPtr hdev_i = def->hostdevs[i];
- virDomainDeviceInfoPtr hdev_info_i = hdev_i->info;
- virDomainDeviceDriveAddressPtr hdev_addr_i;
-
- if (!virHostdevIsSCSIDevice(hdev_i))
- continue;
-
- if (hdev_i->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
- continue;
-
- hdev_addr_i = &hdev_info_i->addr.drive;
- for (j = i + 1; j < def->nhostdevs; j++) {
- virDomainHostdevDefPtr hdev_j = def->hostdevs[j];
- virDomainDeviceInfoPtr hdev_info_j = hdev_j->info;
-
- if (!virHostdevIsSCSIDevice(hdev_j))
- continue;
-
- /* Address type check for hdev_j will be done implicitly
- * in virDomainDeviceInfoAddressIsEqual() */
-
- if (virDomainDeviceInfoAddressIsEqual(hdev_info_i, hdev_info_j)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("SCSI host address controller='%u' "
- "bus='%u' target='%u'
unit='%u' in "
- "use by another SCSI host device"),
- hdev_addr_i->bus,
- hdev_addr_i->controller,
- hdev_addr_i->target,
- hdev_addr_i->unit);
- return -1;
- }
- }
-
- if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI,
- hdev_addr_i)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("SCSI host address controller='%u' "
- "bus='%u' target='%u' unit='%u'
in "
- "use by another SCSI disk"),
- hdev_addr_i->bus,
- hdev_addr_i->controller,
- hdev_addr_i->target,
- hdev_addr_i->unit);
- return -1;
- }
- }
-
- return 0;
-}
-
-
bool
virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
virDomainLifecycleAction action)
@@ -6899,10 +6776,10 @@ static int
virDomainDefValidateInternal(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt)
{
- if (virDomainDefCheckDuplicateDiskInfo(def) < 0)
+ if (virDomainDefDuplicateDiskInfoValidate(def) < 0)
return -1;
- if (virDomainDefCheckDuplicateDriveAddresses(def) < 0)
+ if (virDomainDefDuplicateDriveAddressesValidate(def) < 0)
return -1;
if (virDomainDefGetVcpusTopology(def, NULL) < 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 72771c46b9..71e42d6617 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3915,6 +3915,11 @@ bool
virDomainBlockIoTuneInfoEqual(const virDomainBlockIoTuneInfo *a,
const virDomainBlockIoTuneInfo *b);
+bool
+virDomainDriveAddressIsUsedByDisk(const virDomainDef *def,
+ virDomainDiskBus bus_type,
+ const virDomainDeviceDriveAddress *addr);
+
bool
virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev)
ATTRIBUTE_NONNULL(1);
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 0eed1ba982..8bbd60c836 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -635,3 +635,128 @@ virDomainDefIdMapValidate(const virDomainDef *def)
return 0;
}
+
+
+int
+virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def)
+{
+ size_t i;
+ size_t j;
+
+ for (i = 0; i < def->ndisks; i++) {
+ for (j = i + 1; j < def->ndisks; j++) {
+ if (virDomainDiskDefCheckDuplicateInfo(def->disks[i],
+ def->disks[j]) < 0)
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+
+
+/**
+ * virDomainDefDuplicateDriveAddressesValidate:
+ * @def: domain definition to check against
+ *
+ * This function checks @def for duplicate drive addresses. Drive
+ * addresses are only in use for disks and hostdevs at the moment.
+ *
+ * Returns 0 in case of there are no duplicate drive addresses, -1
+ * otherwise.
+ */
+int
+virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def)
+{
+ size_t i;
+ size_t j;
+
+ for (i = 0; i < def->ndisks; i++) {
+ virDomainDiskDefPtr disk_i = def->disks[i];
+ virDomainDeviceInfoPtr disk_info_i = &disk_i->info;
+
+ if (disk_info_i->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
+ continue;
+
+ for (j = i + 1; j < def->ndisks; j++) {
+ virDomainDiskDefPtr disk_j = def->disks[j];
+ virDomainDeviceInfoPtr disk_info_j = &disk_j->info;
+
+ if (disk_i->bus != disk_j->bus)
+ continue;
+
+ if (disk_info_j->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
+ continue;
+
+ if (virDomainDeviceInfoAddressIsEqual(disk_info_i, disk_info_j)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Found duplicate drive address for disk with
"
+ "target name '%s' controller='%u'
bus='%u' "
+ "target='%u' unit='%u'"),
+ disk_i->dst,
+ disk_info_i->addr.drive.controller,
+ disk_info_i->addr.drive.bus,
+ disk_info_i->addr.drive.target,
+ disk_info_i->addr.drive.unit);
+ return -1;
+ }
+ }
+
+ /* Note: There is no need to check for conflicts with SCSI
+ * hostdevs above, because conflicts with hostdevs are checked
+ * in the next loop.
+ */
+ }
+
+ for (i = 0; i < def->nhostdevs; i++) {
+ virDomainHostdevDefPtr hdev_i = def->hostdevs[i];
+ virDomainDeviceInfoPtr hdev_info_i = hdev_i->info;
+ virDomainDeviceDriveAddressPtr hdev_addr_i;
+
+ if (!virHostdevIsSCSIDevice(hdev_i))
+ continue;
+
+ if (hdev_i->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
+ continue;
+
+ hdev_addr_i = &hdev_info_i->addr.drive;
+ for (j = i + 1; j < def->nhostdevs; j++) {
+ virDomainHostdevDefPtr hdev_j = def->hostdevs[j];
+ virDomainDeviceInfoPtr hdev_info_j = hdev_j->info;
+
+ if (!virHostdevIsSCSIDevice(hdev_j))
+ continue;
+
+ /* Address type check for hdev_j will be done implicitly
+ * in virDomainDeviceInfoAddressIsEqual() */
+
+ if (virDomainDeviceInfoAddressIsEqual(hdev_info_i, hdev_info_j)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("SCSI host address controller='%u' "
+ "bus='%u' target='%u'
unit='%u' in "
+ "use by another SCSI host device"),
+ hdev_addr_i->bus,
+ hdev_addr_i->controller,
+ hdev_addr_i->target,
+ hdev_addr_i->unit);
+ return -1;
+ }
+ }
+
+ if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI,
+ hdev_addr_i)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("SCSI host address controller='%u' "
+ "bus='%u' target='%u' unit='%u'
in "
+ "use by another SCSI disk"),
+ hdev_addr_i->bus,
+ hdev_addr_i->controller,
+ hdev_addr_i->target,
+ hdev_addr_i->unit);
+ return -1;
+ }
+ }
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 497a02b9b3..1f1a5b1bd1 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -45,3 +45,5 @@ int virDomainSmartcardDefValidate(const virDomainSmartcardDef
*smartcard,
int virDomainDefTunablesValidate(const virDomainDef *def);
int virDomainControllerDefValidate(const virDomainControllerDef *controller);
int virDomainDefIdMapValidate(const virDomainDef *def);
+int virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def);
+int virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def);
--
2.26.2
12:05 p.m.
New subject: [PATCH 02/12] domain_conf.c: rename virDomainDeviceInfoIterateInternal()
Next patch will move virDomainDefValidateAliases() to domain_validate.c,
which uses virDomainDeviceInfoIterateInternal(), meaning that this
function will be made public. Rename it now to remove the 'Internal'
of its name.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 52 +++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0f5d314e2c..d3ea79b708 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4223,10 +4223,10 @@ enum {
* behaviour can be altered with virDomainDeviceIterateFlags.
*/
static int
-virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
- virDomainDeviceInfoCallback cb,
- unsigned int iteratorFlags,
- void *opaque)
+virDomainDeviceInfoIterateFlags(virDomainDefPtr def,
+ virDomainDeviceInfoCallback cb,
+ unsigned int iteratorFlags,
+ void *opaque)
{
size_t i;
int rc;
@@ -4452,7 +4452,7 @@ virDomainDeviceInfoIterate(virDomainDefPtr def,
virDomainDeviceInfoCallback cb,
void *opaque)
{
- return virDomainDeviceInfoIterateInternal(def, cb, 0, opaque);
+ return virDomainDeviceInfoIterateFlags(def, cb, 0, opaque);
}
@@ -4460,10 +4460,10 @@ bool
virDomainDefHasDeviceAddress(virDomainDefPtr def,
virDomainDeviceInfoPtr info)
{
- if (virDomainDeviceInfoIterateInternal(def,
- virDomainDefHasDeviceAddressIterator,
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
- info) < 0)
+ if (virDomainDeviceInfoIterateFlags(def,
+ virDomainDefHasDeviceAddressIterator,
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
+ info) < 0)
return true;
return false;
@@ -6007,11 +6007,11 @@ virDomainDefPostParse(virDomainDefPtr def,
}
/* iterate the devices */
- ret = virDomainDeviceInfoIterateInternal(def,
- virDomainDefPostParseDeviceIterator,
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
- DOMAIN_DEVICE_ITERATE_MISSING_INFO,
- &data);
+ ret = virDomainDeviceInfoIterateFlags(def,
+ virDomainDefPostParseDeviceIterator,
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
+ DOMAIN_DEVICE_ITERATE_MISSING_INFO,
+ &data);
if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
goto cleanup;
@@ -6496,10 +6496,10 @@ virDomainDefValidateAliases(const virDomainDef *def,
if (!(data.aliases = virHashNew(NULL)))
goto cleanup;
- if (virDomainDeviceInfoIterateInternal((virDomainDefPtr) def,
- virDomainDeviceDefValidateAliasesIterator,
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
- &data) < 0)
+ if (virDomainDeviceInfoIterateFlags((virDomainDefPtr) def,
+ virDomainDeviceDefValidateAliasesIterator,
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
+ &data) < 0)
goto cleanup;
if (aliases)
@@ -6874,11 +6874,11 @@ virDomainDefValidate(virDomainDefPtr def,
return -1;
/* iterate the devices */
- if (virDomainDeviceInfoIterateInternal(def,
- virDomainDefValidateDeviceIterator,
- (DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
- DOMAIN_DEVICE_ITERATE_MISSING_INFO),
- &data) < 0)
+ if (virDomainDeviceInfoIterateFlags(def,
+ virDomainDefValidateDeviceIterator,
+ (DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
+ DOMAIN_DEVICE_ITERATE_MISSING_INFO),
+ &data) < 0)
return -1;
if (virDomainDefValidateInternal(def, xmlopt) < 0)
@@ -30846,9 +30846,9 @@ virDomainDefFindDevice(virDomainDefPtr def,
virDomainDefFindDeviceCallbackData data = { devAlias, dev };
dev->type = VIR_DOMAIN_DEVICE_NONE;
- virDomainDeviceInfoIterateInternal(def, virDomainDefFindDeviceCallback,
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
- &data);
+ virDomainDeviceInfoIterateFlags(def, virDomainDefFindDeviceCallback,
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
+ &data);
if (dev->type == VIR_DOMAIN_DEVICE_NONE) {
if (reportError) {
--
2.26.2
12:05 p.m.
New subject: [PATCH 03/12] domain_conf: move address validation functions to domain_validate.c
virDomainDefValidateAliases() is one of the static functions that
needs to be handled before moving virDomainDefValidateInternal().
Let's move all related validate functions to domain_validate.c
at the same time.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 144 +------------------------------------
src/conf/domain_conf.h | 14 ++--
src/conf/domain_validate.c | 138 +++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 5 ++
src/libvirt_private.syms | 5 +-
src/qemu/qemu_driver.c | 1 +
6 files changed, 159 insertions(+), 148 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d3ea79b708..0425fbaca3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4213,16 +4213,11 @@ virDomainSkipBackcompatConsole(virDomainDefPtr def,
}
-enum {
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES = 1 << 0,
- DOMAIN_DEVICE_ITERATE_MISSING_INFO = 1 << 1,
-} virDomainDeviceIterateFlags;
-
/*
* Iterates over domain devices calling @cb on each device. The default
* behaviour can be altered with virDomainDeviceIterateFlags.
*/
-static int
+int
virDomainDeviceInfoIterateFlags(virDomainDefPtr def,
virDomainDeviceInfoCallback cb,
unsigned int iteratorFlags,
@@ -6427,143 +6422,6 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
}
-struct virDomainDefValidateAliasesData {
- GHashTable *aliases;
-};
-
-
-static int
-virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
- virDomainDeviceDefPtr dev,
- virDomainDeviceInfoPtr info,
- void *opaque)
-{
- struct virDomainDefValidateAliasesData *data = opaque;
- const char *alias = info->alias;
-
- if (!virDomainDeviceAliasIsUserAlias(alias))
- return 0;
-
- /* Some crazy backcompat for consoles. */
- if (def->nserials && def->nconsoles &&
- def->consoles[0]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE
&&
- def->consoles[0]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL
&&
- dev->type == VIR_DOMAIN_DEVICE_CHR &&
- virDomainChrEquals(def->serials[0], dev->data.chr))
- return 0;
-
- if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
- dev->data.hostdev->parentnet) {
- /* This hostdev is a copy of some previous interface.
- * Aliases are duplicated. */
- return 0;
- }
-
- if (virHashLookup(data->aliases, alias)) {
- virReportError(VIR_ERR_XML_ERROR,
- _("non unique alias detected: %s"),
- alias);
- return -1;
- }
-
- if (virHashAddEntry(data->aliases, alias, (void *) 1) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to construct table of device aliases"));
- return -1;
- }
-
- return 0;
-}
-
-
-/**
- * virDomainDefValidateAliases:
- *
- * Check for uniqueness of device aliases. If @aliases is not
- * NULL return hash table of all the aliases in it.
- *
- * Returns 0 on success,
- * -1 otherwise (with error reported).
- */
-static int
-virDomainDefValidateAliases(const virDomainDef *def,
- GHashTable **aliases)
-{
- struct virDomainDefValidateAliasesData data;
- int ret = -1;
-
- /* We are not storing copies of aliases. Don't free them. */
- if (!(data.aliases = virHashNew(NULL)))
- goto cleanup;
-
- if (virDomainDeviceInfoIterateFlags((virDomainDefPtr) def,
- virDomainDeviceDefValidateAliasesIterator,
- DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
- &data) < 0)
- goto cleanup;
-
- if (aliases)
- *aliases = g_steal_pointer(&data.aliases);
-
- ret = 0;
- cleanup:
- virHashFree(data.aliases);
- return ret;
-}
-
-
-static int
-virDomainDeviceValidateAliasImpl(const virDomainDef *def,
- virDomainDeviceDefPtr dev)
-{
- GHashTable *aliases = NULL;
- virDomainDeviceInfoPtr info = virDomainDeviceGetInfo(dev);
- int ret = -1;
-
- if (!info || !info->alias)
- return 0;
-
- if (virDomainDefValidateAliases(def, &aliases) < 0)
- goto cleanup;
-
- if (virHashLookup(aliases, info->alias)) {
- virReportError(VIR_ERR_XML_ERROR,
- _("non unique alias detected: %s"),
- info->alias);
- goto cleanup;
- }
-
- ret = 0;
- cleanup:
-
- virHashFree(aliases);
- return ret;
-}
-
-
-int
-virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
- virDomainDeviceDefPtr dev,
- unsigned int flags)
-{
- virDomainDefPtr persDef = NULL;
- virDomainDefPtr liveDef = NULL;
-
- if (virDomainObjGetDefs(vm, flags, &liveDef, &persDef) < 0)
- return -1;
-
- if (persDef &&
- virDomainDeviceValidateAliasImpl(persDef, dev) < 0)
- return -1;
-
- if (liveDef &&
- virDomainDeviceValidateAliasImpl(liveDef, dev) < 0)
- return -1;
-
- return 0;
-}
-
-
static int
virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
const virDomainDef *def,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 71e42d6617..ba03a55c7b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2759,6 +2759,11 @@ typedef enum {
VIR_DOMAIN_TAINT_LAST
} virDomainTaintFlags;
+typedef enum {
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES = 1 << 0,
+ DOMAIN_DEVICE_ITERATE_MISSING_INFO = 1 << 1,
+} virDomainDeviceIterateFlags;
+
/* Guest VM runtime state */
typedef struct _virDomainStateReason virDomainStateReason;
struct _virDomainStateReason {
@@ -2987,10 +2992,6 @@ int virDomainDefPostParse(virDomainDefPtr def,
void *parseOpaque);
bool virDomainDefHasUSB(const virDomainDef *def);
-int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
- virDomainDeviceDefPtr dev,
- unsigned int flags);
-
bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
int virDomainDefValidate(virDomainDefPtr def,
@@ -3130,6 +3131,11 @@ virDomainChrSourceDefNew(virDomainXMLOptionPtr xmlopt);
virDomainChrDefPtr virDomainChrDefNew(virDomainXMLOptionPtr xmlopt);
+int virDomainDeviceInfoIterateFlags(virDomainDefPtr def,
+ virDomainDeviceInfoCallback cb,
+ unsigned int iteratorFlags,
+ void *opaque);
+
virDomainGraphicsDefPtr
virDomainGraphicsDefNew(virDomainXMLOptionPtr xmlopt);
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 8bbd60c836..962336033f 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -760,3 +760,141 @@ virDomainDefDuplicateDriveAddressesValidate(const virDomainDef
*def)
return 0;
}
+
+
+
+struct virDomainDefValidateAliasesData {
+ GHashTable *aliases;
+};
+
+
+static int
+virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
+ virDomainDeviceDefPtr dev,
+ virDomainDeviceInfoPtr info,
+ void *opaque)
+{
+ struct virDomainDefValidateAliasesData *data = opaque;
+ const char *alias = info->alias;
+
+ if (!virDomainDeviceAliasIsUserAlias(alias))
+ return 0;
+
+ /* Some crazy backcompat for consoles. */
+ if (def->nserials && def->nconsoles &&
+ def->consoles[0]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE
&&
+ def->consoles[0]->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL
&&
+ dev->type == VIR_DOMAIN_DEVICE_CHR &&
+ virDomainChrEquals(def->serials[0], dev->data.chr))
+ return 0;
+
+ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
+ dev->data.hostdev->parentnet) {
+ /* This hostdev is a copy of some previous interface.
+ * Aliases are duplicated. */
+ return 0;
+ }
+
+ if (virHashLookup(data->aliases, alias)) {
+ virReportError(VIR_ERR_XML_ERROR,
+ _("non unique alias detected: %s"),
+ alias);
+ return -1;
+ }
+
+ if (virHashAddEntry(data->aliases, alias, (void *) 1) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Unable to construct table of device aliases"));
+ return -1;
+ }
+
+ return 0;
+}
+
+
+/**
+ * virDomainDefValidateAliases:
+ *
+ * Check for uniqueness of device aliases. If @aliases is not
+ * NULL return hash table of all the aliases in it.
+ *
+ * Returns 0 on success,
+ * -1 otherwise (with error reported).
+ */
+int
+virDomainDefValidateAliases(const virDomainDef *def,
+ GHashTable **aliases)
+{
+ struct virDomainDefValidateAliasesData data;
+ int ret = -1;
+
+ /* We are not storing copies of aliases. Don't free them. */
+ if (!(data.aliases = virHashNew(NULL)))
+ goto cleanup;
+
+ if (virDomainDeviceInfoIterateFlags((virDomainDefPtr) def,
+ virDomainDeviceDefValidateAliasesIterator,
+ DOMAIN_DEVICE_ITERATE_ALL_CONSOLES,
+ &data) < 0)
+ goto cleanup;
+
+ if (aliases)
+ *aliases = g_steal_pointer(&data.aliases);
+
+ ret = 0;
+ cleanup:
+ virHashFree(data.aliases);
+ return ret;
+}
+
+
+static int
+virDomainDeviceValidateAliasImpl(const virDomainDef *def,
+ virDomainDeviceDefPtr dev)
+{
+ GHashTable *aliases = NULL;
+ virDomainDeviceInfoPtr info = virDomainDeviceGetInfo(dev);
+ int ret = -1;
+
+ if (!info || !info->alias)
+ return 0;
+
+ if (virDomainDefValidateAliases(def, &aliases) < 0)
+ goto cleanup;
+
+ if (virHashLookup(aliases, info->alias)) {
+ virReportError(VIR_ERR_XML_ERROR,
+ _("non unique alias detected: %s"),
+ info->alias);
+ goto cleanup;
+ }
+
+ ret = 0;
+ cleanup:
+
+ virHashFree(aliases);
+ return ret;
+}
+
+
+int
+virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
+ virDomainDeviceDefPtr dev,
+ unsigned int flags)
+{
+ virDomainDefPtr persDef = NULL;
+ virDomainDefPtr liveDef = NULL;
+
+ if (virDomainObjGetDefs(vm, flags, &liveDef, &persDef) < 0)
+ return -1;
+
+ if (persDef &&
+ virDomainDeviceValidateAliasImpl(persDef, dev) < 0)
+ return -1;
+
+ if (liveDef &&
+ virDomainDeviceValidateAliasImpl(liveDef, dev) < 0)
+ return -1;
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 1f1a5b1bd1..521a98ef11 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -47,3 +47,8 @@ int virDomainControllerDefValidate(const virDomainControllerDef
*controller);
int virDomainDefIdMapValidate(const virDomainDef *def);
int virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def);
int virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def);
+int virDomainDefValidateAliases(const virDomainDef *def,
+ GHashTable **aliases);
+int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
+ virDomainDeviceDefPtr dev,
+ unsigned int flags);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 992488f754..c3056232db 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -354,7 +354,6 @@ virDomainDeviceGetInfo;
virDomainDeviceInfoIterate;
virDomainDeviceSetData;
virDomainDeviceTypeToString;
-virDomainDeviceValidateAliasForHotplug;
virDomainDiskBackingStoreFormat;
virDomainDiskBackingStoreParse;
virDomainDiskBusTypeToString;
@@ -744,6 +743,10 @@ virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown;
+# conf/domain_validate.h
+virDomainDeviceValidateAliasForHotplug;
+
+
# conf/interface_conf.h
virInterfaceDefFormat;
virInterfaceDefFree;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 58c376fbe5..5f0fb0a55f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -70,6 +70,7 @@
#include "domain_audit.h"
#include "domain_cgroup.h"
#include "domain_driver.h"
+#include "domain_validate.h"
#include "node_device_conf.h"
#include "virpci.h"
#include "virusb.h"
--
2.26.2
12:05 p.m.
New subject: [PATCH 04/12] domain_conf: move all virDomainDefValidateInternal() helpers to domain_validate.c
This patches moves the remaining static functions that
virDomainDefValidateInternal() uses to domain_validate.c. This
allows the next patch to move virDomainDefValidateInternal(),
and virDomainDefValidate(), without too much hassle.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 165 -------------------------------------
src/conf/domain_conf.h | 24 ++++++
src/conf/domain_validate.c | 142 +++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 6 ++
4 files changed, 172 insertions(+), 165 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0425fbaca3..1cd7733652 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -68,30 +68,6 @@
VIR_LOG_INIT("conf.domain_conf");
-/* This structure holds various callbacks and data needed
- * while parsing and creating domain XMLs */
-struct _virDomainXMLOption {
- virObject parent;
-
- /* XML parser callbacks and defaults */
- virDomainDefParserConfig config;
-
- /* domain private data management callbacks */
- virDomainXMLPrivateDataCallbacks privateData;
-
- /* XML namespace callbacks */
- virXMLNamespace ns;
-
- /* ABI stability callbacks */
- virDomainABIStability abi;
-
- /* Private data for save image stored in snapshot XML */
- virSaveCookieCallbacks saveCookie;
-
- /* Snapshot postparse callbacks */
- virDomainMomentPostParseCallback momentPostParse;
-};
-
#define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \
(VIR_DOMAIN_DEF_FORMAT_SECURE | \
VIR_DOMAIN_DEF_FORMAT_INACTIVE | \
@@ -6489,147 +6465,6 @@ virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
}
-static int
-virDomainDefLifecycleActionValidate(const virDomainDef *def)
-{
- if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF,
- def->onPoweroff)) {
- return -1;
- }
-
- if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_REBOOT,
- def->onReboot)) {
- return -1;
- }
-
- if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_CRASH,
- def->onCrash)) {
- return -1;
- }
-
- return 0;
-}
-
-
-#define CPUTUNE_VALIDATE_PERIOD(name) \
- do { \
- if (def->cputune.name > 0 && \
- (def->cputune.name < 1000 || def->cputune.name > 1000000)) { \
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
- _("Value of cputune '%s' must be in range "
\
- "[1000, 1000000]"), #name); \
- return -1; \
- } \
- } while (0)
-
-#define CPUTUNE_VALIDATE_QUOTA(name) \
- do { \
- if (def->cputune.name > 0 && \
- (def->cputune.name < 1000 || \
- def->cputune.name > 18446744073709551LL)) { \
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
- _("Value of cputune '%s' must be in range "
\
- "[1000, 18446744073709551]"), #name); \
- return -1; \
- } \
- } while (0)
-
-static int
-virDomainDefCputuneValidate(const virDomainDef *def)
-{
- CPUTUNE_VALIDATE_PERIOD(period);
- CPUTUNE_VALIDATE_PERIOD(global_period);
- CPUTUNE_VALIDATE_PERIOD(emulator_period);
- CPUTUNE_VALIDATE_PERIOD(iothread_period);
-
- CPUTUNE_VALIDATE_QUOTA(quota);
- CPUTUNE_VALIDATE_QUOTA(global_quota);
- CPUTUNE_VALIDATE_QUOTA(emulator_quota);
- CPUTUNE_VALIDATE_QUOTA(iothread_quota);
-
- return 0;
-}
-#undef CPUTUNE_VALIDATE_PERIOD
-#undef CPUTUNE_VALIDATE_QUOTA
-
-
-static int
-virDomainDefMemtuneValidate(const virDomainDef *def)
-{
- const virDomainMemtune *mem = &(def->mem);
- size_t i;
- ssize_t pos = virDomainNumaGetNodeCount(def->numa) - 1;
-
- for (i = 0; i < mem->nhugepages; i++) {
- size_t j;
- ssize_t nextBit;
-
- for (j = 0; j < i; j++) {
- if (mem->hugepages[i].nodemask &&
- mem->hugepages[j].nodemask &&
- virBitmapOverlaps(mem->hugepages[i].nodemask,
- mem->hugepages[j].nodemask)) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("nodeset attribute of hugepages "
- "of sizes %llu and %llu intersect"),
- mem->hugepages[i].size,
- mem->hugepages[j].size);
- return -1;
- } else if (!mem->hugepages[i].nodemask &&
- !mem->hugepages[j].nodemask) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("two master hugepages detected: "
- "%llu and %llu"),
- mem->hugepages[i].size,
- mem->hugepages[j].size);
- return -1;
- }
- }
-
- if (!mem->hugepages[i].nodemask) {
- /* This is the master hugepage to use. Skip it as it has no
- * nodemask anyway. */
- continue;
- }
-
- nextBit = virBitmapNextSetBit(mem->hugepages[i].nodemask, pos);
- if (nextBit >= 0) {
- virReportError(VIR_ERR_XML_DETAIL,
- _("hugepages: node %zd not found"),
- nextBit);
- return -1;
- }
- }
-
- return 0;
-}
-
-
-static int
-virDomainDefOSValidate(const virDomainDef *def,
- virDomainXMLOptionPtr xmlopt)
-{
- if (!def->os.loader)
- return 0;
-
- if (def->os.firmware &&
- !(xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT)) {
- virReportError(VIR_ERR_XML_DETAIL, "%s",
- _("firmware auto selection not implemented for this
driver"));
- return -1;
- }
-
- if (!def->os.loader->path &&
- def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) {
- virReportError(VIR_ERR_XML_DETAIL, "%s",
- _("no loader path specified and firmware auto selection
disabled"));
- return -1;
- }
-
- return 0;
-}
-
-
static int
virDomainDefValidateInternal(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ba03a55c7b..5f8ec16b7d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2982,6 +2982,30 @@ virXMLNamespacePtr
virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt)
ATTRIBUTE_NONNULL(1);
+/* This structure holds various callbacks and data needed
+ * while parsing and creating domain XMLs */
+struct _virDomainXMLOption {
+ virObject parent;
+
+ /* XML parser callbacks and defaults */
+ virDomainDefParserConfig config;
+
+ /* domain private data management callbacks */
+ virDomainXMLPrivateDataCallbacks privateData;
+
+ /* XML namespace callbacks */
+ virXMLNamespace ns;
+
+ /* ABI stability callbacks */
+ virDomainABIStability abi;
+
+ /* Private data for save image stored in snapshot XML */
+ virSaveCookieCallbacks saveCookie;
+
+ /* Snapshot postparse callbacks */
+ virDomainMomentPostParseCallback momentPostParse;
+};
+
bool
virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
const virDomainDeviceDriveAddress *addr);
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 962336033f..02cd761ee2 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -22,6 +22,7 @@
#include "domain_validate.h"
#include "domain_conf.h"
+#include "virconftypes.h"
#include "virlog.h"
#include "virutil.h"
@@ -898,3 +899,144 @@ virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
return 0;
}
+
+
+int
+virDomainDefLifecycleActionValidate(const virDomainDef *def)
+{
+ if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF,
+ def->onPoweroff)) {
+ return -1;
+ }
+
+ if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_REBOOT,
+ def->onReboot)) {
+ return -1;
+ }
+
+ if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_CRASH,
+ def->onCrash)) {
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int
+virDomainDefMemtuneValidate(const virDomainDef *def)
+{
+ const virDomainMemtune *mem = &(def->mem);
+ size_t i;
+ ssize_t pos = virDomainNumaGetNodeCount(def->numa) - 1;
+
+ for (i = 0; i < mem->nhugepages; i++) {
+ size_t j;
+ ssize_t nextBit;
+
+ for (j = 0; j < i; j++) {
+ if (mem->hugepages[i].nodemask &&
+ mem->hugepages[j].nodemask &&
+ virBitmapOverlaps(mem->hugepages[i].nodemask,
+ mem->hugepages[j].nodemask)) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("nodeset attribute of hugepages "
+ "of sizes %llu and %llu intersect"),
+ mem->hugepages[i].size,
+ mem->hugepages[j].size);
+ return -1;
+ } else if (!mem->hugepages[i].nodemask &&
+ !mem->hugepages[j].nodemask) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("two master hugepages detected: "
+ "%llu and %llu"),
+ mem->hugepages[i].size,
+ mem->hugepages[j].size);
+ return -1;
+ }
+ }
+
+ if (!mem->hugepages[i].nodemask) {
+ /* This is the master hugepage to use. Skip it as it has no
+ * nodemask anyway. */
+ continue;
+ }
+
+ nextBit = virBitmapNextSetBit(mem->hugepages[i].nodemask, pos);
+ if (nextBit >= 0) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("hugepages: node %zd not found"),
+ nextBit);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+
+int
+virDomainDefOSValidate(const virDomainDef *def,
+ virDomainXMLOptionPtr xmlopt)
+{
+ if (!def->os.loader)
+ return 0;
+
+ if (def->os.firmware &&
+ !(xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT)) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("firmware auto selection not implemented for this
driver"));
+ return -1;
+ }
+
+ if (!def->os.loader->path &&
+ def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("no loader path specified and firmware auto selection
disabled"));
+ return -1;
+ }
+
+ return 0;
+}
+
+
+#define CPUTUNE_VALIDATE_PERIOD(name) \
+ do { \
+ if (def->cputune.name > 0 && \
+ (def->cputune.name < 1000 || def->cputune.name > 1000000)) { \
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
+ _("Value of cputune '%s' must be in range "
\
+ "[1000, 1000000]"), #name); \
+ return -1; \
+ } \
+ } while (0)
+
+#define CPUTUNE_VALIDATE_QUOTA(name) \
+ do { \
+ if (def->cputune.name > 0 && \
+ (def->cputune.name < 1000 || \
+ def->cputune.name > 18446744073709551LL)) { \
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \
+ _("Value of cputune '%s' must be in range "
\
+ "[1000, 18446744073709551]"), #name); \
+ return -1; \
+ } \
+ } while (0)
+
+int
+virDomainDefCputuneValidate(const virDomainDef *def)
+{
+ CPUTUNE_VALIDATE_PERIOD(period);
+ CPUTUNE_VALIDATE_PERIOD(global_period);
+ CPUTUNE_VALIDATE_PERIOD(emulator_period);
+ CPUTUNE_VALIDATE_PERIOD(iothread_period);
+
+ CPUTUNE_VALIDATE_QUOTA(quota);
+ CPUTUNE_VALIDATE_QUOTA(global_quota);
+ CPUTUNE_VALIDATE_QUOTA(emulator_quota);
+ CPUTUNE_VALIDATE_QUOTA(iothread_quota);
+
+ return 0;
+}
+#undef CPUTUNE_VALIDATE_PERIOD
+#undef CPUTUNE_VALIDATE_QUOTA
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 521a98ef11..4247dfd758 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -23,6 +23,7 @@
#include <glib-object.h>
#include "domain_conf.h"
+#include "virconftypes.h"
int virDomainDefBootValidate(const virDomainDef *def);
int virDomainDefVideoValidate(const virDomainDef *def);
@@ -52,3 +53,8 @@ int virDomainDefValidateAliases(const virDomainDef *def,
int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
unsigned int flags);
+int virDomainDefLifecycleActionValidate(const virDomainDef *def);
+int virDomainDefMemtuneValidate(const virDomainDef *def);
+int virDomainDefOSValidate(const virDomainDef *def,
+ virDomainXMLOptionPtr xmlopt);
+int virDomainDefCputuneValidate(const virDomainDef *def);
--
2.26.2
12:05 p.m.
New subject: [PATCH 05/12] domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
Move virDomainDeviceDefValidate() and all its helper functions to
domain_validate.c.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 137 +------------------------------------
src/conf/domain_conf.h | 16 +++--
src/conf/domain_validate.c | 129 ++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 4 ++
src/libvirt_private.syms | 2 +-
src/qemu/qemu_process.c | 1 +
6 files changed, 147 insertions(+), 142 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1cd7733652..bf9d00094c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5643,13 +5643,6 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev,
}
-struct virDomainDefPostParseDeviceIteratorData {
- virDomainXMLOptionPtr xmlopt;
- void *parseOpaque;
- unsigned int parseFlags;
-};
-
-
static int
virDomainDefPostParseDeviceIterator(virDomainDefPtr def,
virDomainDeviceDefPtr dev,
@@ -6398,7 +6391,7 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
}
-static int
+int
virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
const virDomainDef *def,
unsigned int parseFlags,
@@ -6420,19 +6413,6 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
}
-static int
-virDomainDefValidateDeviceIterator(virDomainDefPtr def,
- virDomainDeviceDefPtr dev,
- virDomainDeviceInfoPtr info G_GNUC_UNUSED,
- void *opaque)
-{
- struct virDomainDefPostParseDeviceIteratorData *data = opaque;
- return virDomainDeviceDefValidate(dev, def,
- data->parseFlags, data->xmlopt,
- data->parseOpaque);
-}
-
-
bool
virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
virDomainLifecycleAction action)
@@ -6465,121 +6445,6 @@ virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
}
-static int
-virDomainDefValidateInternal(const virDomainDef *def,
- virDomainXMLOptionPtr xmlopt)
-{
- if (virDomainDefDuplicateDiskInfoValidate(def) < 0)
- return -1;
-
- if (virDomainDefDuplicateDriveAddressesValidate(def) < 0)
- return -1;
-
- if (virDomainDefGetVcpusTopology(def, NULL) < 0)
- return -1;
-
- if (virDomainDefValidateAliases(def, NULL) < 0)
- return -1;
-
- if (def->iommu &&
- def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
- def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_QEMU) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("IOMMU interrupt remapping requires split I/O APIC "
- "(ioapic driver='qemu')"));
- return -1;
- }
-
- if (def->iommu &&
- def->iommu->eim == VIR_TRISTATE_SWITCH_ON &&
- def->iommu->intremap != VIR_TRISTATE_SWITCH_ON) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("IOMMU eim requires interrupt remapping to be
enabled"));
- return -1;
- }
-
- if (virDomainDefLifecycleActionValidate(def) < 0)
- return -1;
-
- if (virDomainDefMemtuneValidate(def) < 0)
- return -1;
-
- if (virDomainDefOSValidate(def, xmlopt) < 0)
- return -1;
-
- if (virDomainDefCputuneValidate(def) < 0)
- return -1;
-
- if (virDomainDefBootValidate(def) < 0)
- return -1;
-
- if (virDomainDefVideoValidate(def) < 0)
- return -1;
-
- if (virDomainDefTunablesValidate(def) < 0)
- return -1;
-
- if (virDomainDefIdMapValidate(def) < 0)
- return -1;
-
- if (virDomainNumaDefValidate(def->numa) < 0)
- return -1;
-
- return 0;
-}
-
-
-/**
- * virDomainDefValidate:
- * @def: domain definition
- * @caps: driver capabilities object
- * @parseFlags: virDomainDefParseFlags
- * @xmlopt: XML parser option object
- * @parseOpaque: hypervisor driver specific data for this validation run
- *
- * This validation function is designed to take checks of globally invalid
- * configurations that the parser needs to accept so that VMs don't vanish upon
- * daemon restart. Such definition can be rejected upon startup or define, where
- * this function shall be called.
- *
- * Returns 0 if domain definition is valid, -1 on error and reports an
- * appropriate message.
- */
-int
-virDomainDefValidate(virDomainDefPtr def,
- unsigned int parseFlags,
- virDomainXMLOptionPtr xmlopt,
- void *parseOpaque)
-{
- struct virDomainDefPostParseDeviceIteratorData data = {
- .xmlopt = xmlopt,
- .parseFlags = parseFlags,
- .parseOpaque = parseOpaque,
- };
-
- /* validate configuration only in certain places */
- if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)
- return 0;
-
- /* call the domain config callback */
- if (xmlopt->config.domainValidateCallback &&
- xmlopt->config.domainValidateCallback(def, xmlopt->config.priv,
parseOpaque) < 0)
- return -1;
-
- /* iterate the devices */
- if (virDomainDeviceInfoIterateFlags(def,
- virDomainDefValidateDeviceIterator,
- (DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
- DOMAIN_DEVICE_ITERATE_MISSING_INFO),
- &data) < 0)
- return -1;
-
- if (virDomainDefValidateInternal(def, xmlopt) < 0)
- return -1;
-
- return 0;
-}
-
int
virDomainObjCheckActive(virDomainObjPtr dom)
{
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5f8ec16b7d..1c1533ed2f 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3006,6 +3006,12 @@ struct _virDomainXMLOption {
virDomainMomentPostParseCallback momentPostParse;
};
+struct virDomainDefPostParseDeviceIteratorData {
+ virDomainXMLOptionPtr xmlopt;
+ void *parseOpaque;
+ unsigned int parseFlags;
+};
+
bool
virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
const virDomainDeviceDriveAddress *addr);
@@ -3018,11 +3024,6 @@ bool virDomainDefHasUSB(const virDomainDef *def);
bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
-int virDomainDefValidate(virDomainDefPtr def,
- unsigned int parseFlags,
- virDomainXMLOptionPtr xmlopt,
- void *parseOpaque);
-
int
virDomainActualNetDefValidate(const virDomainNetDef *net);
@@ -3124,6 +3125,11 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def);
void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def);
void virDomainShmemDefFree(virDomainShmemDefPtr def);
void virDomainDeviceDefFree(virDomainDeviceDefPtr def);
+int virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
+ const virDomainDef *def,
+ unsigned int parseFlags,
+ virDomainXMLOptionPtr xmlopt,
+ void *parseOpaque);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDeviceDef, virDomainDeviceDefFree);
virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
const virDomainDef *def,
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 02cd761ee2..47aa3e4375 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1040,3 +1040,132 @@ virDomainDefCputuneValidate(const virDomainDef *def)
}
#undef CPUTUNE_VALIDATE_PERIOD
#undef CPUTUNE_VALIDATE_QUOTA
+
+
+static int
+virDomainDefValidateInternal(const virDomainDef *def,
+ virDomainXMLOptionPtr xmlopt)
+{
+ if (virDomainDefDuplicateDiskInfoValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefDuplicateDriveAddressesValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefGetVcpusTopology(def, NULL) < 0)
+ return -1;
+
+ if (virDomainDefValidateAliases(def, NULL) < 0)
+ return -1;
+
+ if (def->iommu &&
+ def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
+ def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_QEMU) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("IOMMU interrupt remapping requires split I/O APIC "
+ "(ioapic driver='qemu')"));
+ return -1;
+ }
+
+ if (def->iommu &&
+ def->iommu->eim == VIR_TRISTATE_SWITCH_ON &&
+ def->iommu->intremap != VIR_TRISTATE_SWITCH_ON) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("IOMMU eim requires interrupt remapping to be
enabled"));
+ return -1;
+ }
+
+ if (virDomainDefLifecycleActionValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefMemtuneValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefOSValidate(def, xmlopt) < 0)
+ return -1;
+
+ if (virDomainDefCputuneValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefBootValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefVideoValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefTunablesValidate(def) < 0)
+ return -1;
+
+ if (virDomainDefIdMapValidate(def) < 0)
+ return -1;
+
+ if (virDomainNumaDefValidate(def->numa) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+static int
+virDomainDefValidateDeviceIterator(virDomainDefPtr def,
+ virDomainDeviceDefPtr dev,
+ virDomainDeviceInfoPtr info G_GNUC_UNUSED,
+ void *opaque)
+{
+ struct virDomainDefPostParseDeviceIteratorData *data = opaque;
+ return virDomainDeviceDefValidate(dev, def,
+ data->parseFlags, data->xmlopt,
+ data->parseOpaque);
+}
+
+
+/**
+ * virDomainDefValidate:
+ * @def: domain definition
+ * @caps: driver capabilities object
+ * @parseFlags: virDomainDefParseFlags
+ * @xmlopt: XML parser option object
+ * @parseOpaque: hypervisor driver specific data for this validation run
+ *
+ * This validation function is designed to take checks of globally invalid
+ * configurations that the parser needs to accept so that VMs don't vanish upon
+ * daemon restart. Such definition can be rejected upon startup or define, where
+ * this function shall be called.
+ *
+ * Returns 0 if domain definition is valid, -1 on error and reports an
+ * appropriate message.
+ */
+int
+virDomainDefValidate(virDomainDefPtr def,
+ unsigned int parseFlags,
+ virDomainXMLOptionPtr xmlopt,
+ void *parseOpaque)
+{
+ struct virDomainDefPostParseDeviceIteratorData data = {
+ .xmlopt = xmlopt,
+ .parseFlags = parseFlags,
+ .parseOpaque = parseOpaque,
+ };
+
+ /* validate configuration only in certain places */
+ if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)
+ return 0;
+
+ /* call the domain config callback */
+ if (xmlopt->config.domainValidateCallback &&
+ xmlopt->config.domainValidateCallback(def, xmlopt->config.priv,
parseOpaque) < 0)
+ return -1;
+
+ /* iterate the devices */
+ if (virDomainDeviceInfoIterateFlags(def,
+ virDomainDefValidateDeviceIterator,
+ (DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
+ DOMAIN_DEVICE_ITERATE_MISSING_INFO),
+ &data) < 0)
+ return -1;
+
+ if (virDomainDefValidateInternal(def, xmlopt) < 0)
+ return -1;
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 4247dfd758..309ae5f950 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -58,3 +58,7 @@ int virDomainDefMemtuneValidate(const virDomainDef *def);
int virDomainDefOSValidate(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt);
int virDomainDefCputuneValidate(const virDomainDef *def);
+int virDomainDefValidate(virDomainDefPtr def,
+ unsigned int parseFlags,
+ virDomainXMLOptionPtr xmlopt,
+ void *parseOpaque);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c3056232db..3cbc336bad 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -342,7 +342,6 @@ virDomainDefSave;
virDomainDefSetMemoryTotal;
virDomainDefSetVcpus;
virDomainDefSetVcpusMax;
-virDomainDefValidate;
virDomainDefVcpuOrderClear;
virDomainDeleteConfig;
virDomainDeviceAliasIsUserAlias;
@@ -744,6 +743,7 @@ virDomainConfVMNWFilterTeardown;
# conf/domain_validate.h
+virDomainDefValidate;
virDomainDeviceValidateAliasForHotplug;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3b64caa619..bb78967ca3 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -74,6 +74,7 @@
#include "virhostcpu.h"
#include "domain_audit.h"
#include "domain_nwfilter.h"
+#include "domain_validate.h"
#include "locking/domain_lock.h"
#include "viruuid.h"
#include "virprocess.h"
--
2.26.2
12:05 p.m.
New subject: [PATCH 06/12] domain_validate.c: make local functions static
virDomainDefValidateInternal() helpers can now be made static again
since they're all in the same file.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_validate.c | 22 +++++++++++-----------
src/conf/domain_validate.h | 13 -------------
2 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 47aa3e4375..6632262ca2 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -30,7 +30,7 @@
VIR_LOG_INIT("conf.domain_validate");
-int
+static int
virDomainDefBootValidate(const virDomainDef *def)
{
if (def->os.bm_timeout_set && def->os.bm_timeout > 65535) {
@@ -52,7 +52,7 @@ virDomainDefBootValidate(const virDomainDef *def)
}
-int
+static int
virDomainDefVideoValidate(const virDomainDef *def)
{
size_t i;
@@ -499,7 +499,7 @@ virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
}
-int
+static int
virDomainDefTunablesValidate(const virDomainDef *def)
{
size_t i, j;
@@ -615,7 +615,7 @@ virDomainControllerDefValidate(const virDomainControllerDef
*controller)
}
-int
+static int
virDomainDefIdMapValidate(const virDomainDef *def)
{
if ((def->idmap.uidmap && !def->idmap.gidmap) ||
@@ -638,7 +638,7 @@ virDomainDefIdMapValidate(const virDomainDef *def)
}
-int
+static int
virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def)
{
size_t i;
@@ -667,7 +667,7 @@ virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def)
* Returns 0 in case of there are no duplicate drive addresses, -1
* otherwise.
*/
-int
+static int
virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def)
{
size_t i;
@@ -822,7 +822,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
* Returns 0 on success,
* -1 otherwise (with error reported).
*/
-int
+static int
virDomainDefValidateAliases(const virDomainDef *def,
GHashTable **aliases)
{
@@ -901,7 +901,7 @@ virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
}
-int
+static int
virDomainDefLifecycleActionValidate(const virDomainDef *def)
{
if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF,
@@ -923,7 +923,7 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def)
}
-int
+static int
virDomainDefMemtuneValidate(const virDomainDef *def)
{
const virDomainMemtune *mem = &(def->mem);
@@ -975,7 +975,7 @@ virDomainDefMemtuneValidate(const virDomainDef *def)
}
-int
+static int
virDomainDefOSValidate(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt)
{
@@ -1023,7 +1023,7 @@ virDomainDefOSValidate(const virDomainDef *def,
} \
} while (0)
-int
+static int
virDomainDefCputuneValidate(const virDomainDef *def)
{
CPUTUNE_VALIDATE_PERIOD(period);
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 309ae5f950..e89cadab75 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -25,8 +25,6 @@
#include "domain_conf.h"
#include "virconftypes.h"
-int virDomainDefBootValidate(const virDomainDef *def);
-int virDomainDefVideoValidate(const virDomainDef *def);
int virDomainVideoDefValidate(const virDomainVideoDef *video,
const virDomainDef *def);
int virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels,
@@ -43,21 +41,10 @@ int virDomainRNGDefValidate(const virDomainRNGDef *rng,
const virDomainDef *def);
int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
const virDomainDef *def);
-int virDomainDefTunablesValidate(const virDomainDef *def);
int virDomainControllerDefValidate(const virDomainControllerDef *controller);
-int virDomainDefIdMapValidate(const virDomainDef *def);
-int virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def);
-int virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def);
-int virDomainDefValidateAliases(const virDomainDef *def,
- GHashTable **aliases);
int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
unsigned int flags);
-int virDomainDefLifecycleActionValidate(const virDomainDef *def);
-int virDomainDefMemtuneValidate(const virDomainDef *def);
-int virDomainDefOSValidate(const virDomainDef *def,
- virDomainXMLOptionPtr xmlopt);
-int virDomainDefCputuneValidate(const virDomainDef *def);
int virDomainDefValidate(virDomainDefPtr def,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
--
2.26.2
4:18 a.m.
New subject: [PATCH 06/12] domain_validate.c: make local functions static
On 12/11/20 7:05 PM, Daniel Henrique Barboza wrote:
virDomainDefValidateInternal() helpers can now be made static again
since they're all in the same file.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_validate.c | 22 +++++++++++-----------
src/conf/domain_validate.h | 13 -------------
2 files changed, 11 insertions(+), 24 deletions(-)
I guess virSecurityDeviceLabelDefValidate() is also a good candidate to
be made static in this patch.
Michal
6:43 a.m.
New subject: [PATCH 06/12] domain_validate.c: make local functions static
On 12/14/20 7:18 AM, Michal Privoznik wrote:
On 12/11/20 7:05 PM, Daniel Henrique Barboza wrote:
> virDomainDefValidateInternal() helpers can now be made static again
> since they're all in the same file.
>
> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
> ---
> src/conf/domain_validate.c | 22 +++++++++++-----------
> src/conf/domain_validate.h | 13 -------------
> 2 files changed, 11 insertions(+), 24 deletions(-)
>
I guess virSecurityDeviceLabelDefValidate() is also a good candidate to be made static in
this patch.
Good catch. Just did that before pushing it.
DHB
Michal
12:05 p.m.
New subject: [PATCH 07/12] domain_conf: move net device validation to domain_validate.c
The next objective is to move virDomainDeviceDefValidate() to
domain_validate.c. First let's move all the static helpers.
The net device validation functions are used across multiple
drivers, so let's move them separately first.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 153 -------------------------------------
src/conf/domain_conf.h | 3 -
src/conf/domain_validate.c | 152 ++++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 2 +
src/libvirt_private.syms | 2 +-
src/libxl/libxl_domain.c | 1 +
src/libxl/libxl_driver.c | 1 +
src/lxc/lxc_driver.c | 1 +
src/lxc/lxc_process.c | 1 +
src/qemu/qemu_domain.c | 1 +
10 files changed, 160 insertions(+), 157 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bf9d00094c..a541e7bca6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6022,159 +6022,6 @@ virDomainDefHasUSB(const virDomainDef *def)
}
-
-static int
-virDomainNetDefValidatePortOptions(const char *macstr,
- virDomainNetType type,
- const virNetDevVPortProfile *vport,
- virTristateBool isolatedPort)
-{
- /*
- * This function can be called for either a config interface
- * object (NetDef) or a runtime interface object (ActualNetDef),
- * by calling it with either, e.g., the "type" (what is in the
- * config) or the "actualType" (what is determined at runtime by
- * acquiring a port from the network).
- */
- /*
- * port isolation can only be set for an interface that is
- * connected to a Linux host bridge (either a libvirt-managed
- * network, or plain type='bridge')
- */
- if (isolatedPort == VIR_TRISTATE_BOOL_YES) {
- if (!(type == VIR_DOMAIN_NET_TYPE_NETWORK ||
- type == VIR_DOMAIN_NET_TYPE_BRIDGE)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("interface %s - <port isolated='yes'/> is
not supported for network interfaces with type='%s'"),
- macstr, virDomainNetTypeToString(type));
- return -1;
- }
- /*
- * also not allowed for anything with <virtualport> setting
- * (openvswitch or 802.11Qb[gh])
- */
- if (vport && vport->virtPortType != VIR_NETDEV_VPORT_PROFILE_NONE) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("interface %s - <port isolated='yes'/> is
not supported for network interfaces with virtualport type='%s'"),
- macstr, virNetDevVPortTypeToString(vport->virtPortType));
- return -1;
- }
- }
- return 0;
-}
-
-
-int
-virDomainActualNetDefValidate(const virDomainNetDef *net)
-{
- /* Unlike virDomainNetDefValidate(), which is a static function
- * called internally to this file, virDomainActualNetDefValidate()
- * is a public function that can be called from a hypervisor after
- * it has completely setup the NetDef for use by a domain,
- * including possibly allocating a port from the network driver
- * (which could change the effective/"actual" type of the NetDef,
- * thus changing what should/shouldn't be allowed by validation).
- *
- * This function should contain validations not specific to a
- * particular hypervisor (e.g. whether or not specifying bandwidth
- * is allowed for a type of interface), but *not*
- * hypervisor-specific things.
- */
- char macstr[VIR_MAC_STRING_BUFLEN];
- virDomainNetType actualType = virDomainNetGetActualType(net);
- const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net);
- const virNetDevBandwidth *bandwidth = virDomainNetGetActualBandwidth(net);
-
- virMacAddrFormat(&net->mac, macstr);
-
- if (virDomainNetGetActualVlan(net)) {
- /* vlan configuration via libvirt is only supported for PCI
- * Passthrough SR-IOV devices (hostdev or macvtap passthru
- * mode) and openvswitch bridges. Otherwise log an error and
- * fail
- */
- if (!(actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV ||
- (actualType == VIR_DOMAIN_NET_TYPE_DIRECT &&
- virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_PASSTHRU)
||
- (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE &&
- vport && vport->virtPortType ==
VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("interface %s - vlan tag not supported for this
connection type"),
- macstr);
- return -1;
- }
- }
-
- /* bandwidth configuration via libvirt is not supported for
- * hostdev network devices
- */
- if (bandwidth && actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("interface %s - bandwidth settings are not supported
"
- "for hostdev interfaces"),
- macstr);
- return -1;
- }
-
- if (virDomainNetDefValidatePortOptions(macstr, actualType, vport,
- virDomainNetGetActualPortOptionsIsolated(net))
< 0) {
- return -1;
- }
-
- return 0;
-}
-
-
-static int
-virDomainNetDefValidate(const virDomainNetDef *net)
-{
- char macstr[VIR_MAC_STRING_BUFLEN];
-
- virMacAddrFormat(&net->mac, macstr);
-
- if ((net->hostIP.nroutes || net->hostIP.nips) &&
- net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Invalid attempt to set network interface "
- "host-side IP route and/or address info on "
- "interface of type '%s'. This is only supported
"
- "on interfaces of type 'ethernet'"),
- virDomainNetTypeToString(net->type));
- return -1;
- }
- if (net->managed_tap == VIR_TRISTATE_BOOL_NO &&
- net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unmanaged target dev is not supported on "
- "interfaces of type '%s'"),
- virDomainNetTypeToString(net->type));
- return -1;
- }
-
- if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT) {
- if (!net->teaming.persistent) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("teaming persistent attribute must be set if teaming
type is 'transient'"));
- return -1;
- }
- } else {
- if (net->teaming.persistent) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("teaming persistent attribute not allowed if teaming
type is '%s'"),
- virDomainNetTeamingTypeToString(net->teaming.type));
- return -1;
- }
- }
-
- if (virDomainNetDefValidatePortOptions(macstr, net->type,
net->virtPortProfile,
- net->isolatedPort) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-
static int
virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
{
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1c1533ed2f..e35c4206df 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3024,9 +3024,6 @@ bool virDomainDefHasUSB(const virDomainDef *def);
bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
-int
-virDomainActualNetDefValidate(const virDomainNetDef *net);
-
static inline bool
virDomainObjIsActive(virDomainObjPtr dom)
{
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 6632262ca2..6ca4ebb0ea 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1169,3 +1169,155 @@ virDomainDefValidate(virDomainDefPtr def,
return 0;
}
+
+
+static int
+virDomainNetDefValidatePortOptions(const char *macstr,
+ virDomainNetType type,
+ const virNetDevVPortProfile *vport,
+ virTristateBool isolatedPort)
+{
+ /*
+ * This function can be called for either a config interface
+ * object (NetDef) or a runtime interface object (ActualNetDef),
+ * by calling it with either, e.g., the "type" (what is in the
+ * config) or the "actualType" (what is determined at runtime by
+ * acquiring a port from the network).
+ */
+ /*
+ * port isolation can only be set for an interface that is
+ * connected to a Linux host bridge (either a libvirt-managed
+ * network, or plain type='bridge')
+ */
+ if (isolatedPort == VIR_TRISTATE_BOOL_YES) {
+ if (!(type == VIR_DOMAIN_NET_TYPE_NETWORK ||
+ type == VIR_DOMAIN_NET_TYPE_BRIDGE)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("interface %s - <port isolated='yes'/> is
not supported for network interfaces with type='%s'"),
+ macstr, virDomainNetTypeToString(type));
+ return -1;
+ }
+ /*
+ * also not allowed for anything with <virtualport> setting
+ * (openvswitch or 802.11Qb[gh])
+ */
+ if (vport && vport->virtPortType != VIR_NETDEV_VPORT_PROFILE_NONE) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("interface %s - <port isolated='yes'/> is
not supported for network interfaces with virtualport type='%s'"),
+ macstr, virNetDevVPortTypeToString(vport->virtPortType));
+ return -1;
+ }
+ }
+ return 0;
+}
+
+
+int
+virDomainActualNetDefValidate(const virDomainNetDef *net)
+{
+ /* Unlike virDomainNetDefValidate(), which is a static function
+ * called internally to this file, virDomainActualNetDefValidate()
+ * is a public function that can be called from a hypervisor after
+ * it has completely setup the NetDef for use by a domain,
+ * including possibly allocating a port from the network driver
+ * (which could change the effective/"actual" type of the NetDef,
+ * thus changing what should/shouldn't be allowed by validation).
+ *
+ * This function should contain validations not specific to a
+ * particular hypervisor (e.g. whether or not specifying bandwidth
+ * is allowed for a type of interface), but *not*
+ * hypervisor-specific things.
+ */
+ char macstr[VIR_MAC_STRING_BUFLEN];
+ virDomainNetType actualType = virDomainNetGetActualType(net);
+ const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net);
+ const virNetDevBandwidth *bandwidth = virDomainNetGetActualBandwidth(net);
+
+ virMacAddrFormat(&net->mac, macstr);
+
+ if (virDomainNetGetActualVlan(net)) {
+ /* vlan configuration via libvirt is only supported for PCI
+ * Passthrough SR-IOV devices (hostdev or macvtap passthru
+ * mode) and openvswitch bridges. Otherwise log an error and
+ * fail
+ */
+ if (!(actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV ||
+ (actualType == VIR_DOMAIN_NET_TYPE_DIRECT &&
+ virDomainNetGetActualDirectMode(net) == VIR_NETDEV_MACVLAN_MODE_PASSTHRU)
||
+ (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE &&
+ vport && vport->virtPortType ==
VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("interface %s - vlan tag not supported for this
connection type"),
+ macstr);
+ return -1;
+ }
+ }
+
+ /* bandwidth configuration via libvirt is not supported for
+ * hostdev network devices
+ */
+ if (bandwidth && actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("interface %s - bandwidth settings are not supported
"
+ "for hostdev interfaces"),
+ macstr);
+ return -1;
+ }
+
+ if (virDomainNetDefValidatePortOptions(macstr, actualType, vport,
+ virDomainNetGetActualPortOptionsIsolated(net))
< 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int
+virDomainNetDefValidate(const virDomainNetDef *net)
+{
+ char macstr[VIR_MAC_STRING_BUFLEN];
+
+ virMacAddrFormat(&net->mac, macstr);
+
+ if ((net->hostIP.nroutes || net->hostIP.nips) &&
+ net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Invalid attempt to set network interface "
+ "host-side IP route and/or address info on "
+ "interface of type '%s'. This is only supported
"
+ "on interfaces of type 'ethernet'"),
+ virDomainNetTypeToString(net->type));
+ return -1;
+ }
+ if (net->managed_tap == VIR_TRISTATE_BOOL_NO &&
+ net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("unmanaged target dev is not supported on "
+ "interfaces of type '%s'"),
+ virDomainNetTypeToString(net->type));
+ return -1;
+ }
+
+ if (net->teaming.type == VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT) {
+ if (!net->teaming.persistent) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("teaming persistent attribute must be set if teaming
type is 'transient'"));
+ return -1;
+ }
+ } else {
+ if (net->teaming.persistent) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("teaming persistent attribute not allowed if teaming
type is '%s'"),
+ virDomainNetTeamingTypeToString(net->teaming.type));
+ return -1;
+ }
+ }
+
+ if (virDomainNetDefValidatePortOptions(macstr, net->type,
net->virtPortProfile,
+ net->isolatedPort) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index e89cadab75..d38d2f4e06 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -49,3 +49,5 @@ int virDomainDefValidate(virDomainDefPtr def,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque);
+int virDomainActualNetDefValidate(const virDomainNetDef *net);
+int virDomainNetDefValidate(const virDomainNetDef *net);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3cbc336bad..d0e548b0a3 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -226,7 +226,6 @@ virDiskNameParse;
virDiskNameToBusDeviceIndex;
virDiskNameToIndex;
virDomainActualNetDefFree;
-virDomainActualNetDefValidate;
virDomainAudioTypeTypeFromString;
virDomainAudioTypeTypeToString;
virDomainBlockedReasonTypeFromString;
@@ -743,6 +742,7 @@ virDomainConfVMNWFilterTeardown;
# conf/domain_validate.h
+virDomainActualNetDefValidate;
virDomainDefValidate;
virDomainDeviceValidateAliasForHotplug;
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 3669b358f6..ab838b317c 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -35,6 +35,7 @@
#include "locking/domain_lock.h"
#include "xen_common.h"
#include "driver.h"
+#include "domain_validate.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 6af274cb1b..c2563ef872 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -55,6 +55,7 @@
#include "virnetdevtap.h"
#include "cpu/cpu.h"
#include "virutil.h"
+#include "domain_validate.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index b1295e71da..88d3890de7 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -58,6 +58,7 @@
#include "domain_cgroup.h"
#include "domain_driver.h"
#include "domain_nwfilter.h"
+#include "domain_validate.h"
#include "virinitctl.h"
#include "virnetdev.h"
#include "virnetdevtap.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 0f818e2ee0..937e9a3fc1 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -42,6 +42,7 @@
#include "domain_nwfilter.h"
#include "viralloc.h"
#include "domain_audit.h"
+#include "domain_validate.h"
#include "virerror.h"
#include "virlog.h"
#include "vircommand.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 766f76020c..bfb6e23942 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -48,6 +48,7 @@
#include "domain_capabilities.h"
#include "domain_driver.h"
#include "domain_event.h"
+#include "domain_validate.h"
#include "virtime.h"
#include "virnetdevopenvswitch.h"
#include "virstoragefile.h"
--
2.26.2
12:05 p.m.
New subject: [PATCH 08/12] domain_conf: move all DeviceDefValidateInternal() helpers to domain_validate
Moving all remaining static helpers of virDomainDeviceDefValidateInternal()
will allow the next patch to move the function itself, and
virDomainDeviceDefValidate(), to domain_validate.c.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 150 -------------------------------------
src/conf/domain_validate.c | 150 +++++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 6 ++
3 files changed, 156 insertions(+), 150 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a541e7bca6..ebe895948f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6022,156 +6022,6 @@ virDomainDefHasUSB(const virDomainDef *def)
}
-static int
-virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
-{
- if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
- switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) {
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
- if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("PCI host devices must use 'pci' or "
- "'unassigned' address type"));
- return -1;
- }
- break;
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
- if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("SCSI host device must use 'drive' "
- "address type"));
- return -1;
- }
- break;
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
- if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("SCSI_host host device must use 'pci'
"
- "or 'ccw' address type"));
- return -1;
- }
- break;
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
- if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
- hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("USB host device must use 'usb' address
type"));
- return -1;
- }
- break;
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
- case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
- break;
- }
- }
- return 0;
-}
-
-
-static int
-virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
- const virDomainDef *def)
-{
- if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
- if (!mem->nvdimmPath) {
- virReportError(VIR_ERR_XML_DETAIL, "%s",
- _("path is required for model 'nvdimm'"));
- return -1;
- }
-
- if (mem->discard == VIR_TRISTATE_BOOL_YES) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("discard is not supported for nvdimms"));
- return -1;
- }
-
- if (ARCH_IS_PPC64(def->os.arch) && mem->labelsize == 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("label size is required for NVDIMM device"));
- return -1;
- }
- }
-
- return 0;
-}
-
-
-static int
-virDomainVsockDefValidate(const virDomainVsockDef *vsock)
-{
- if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("guest CIDs must be >= 3"));
- return -1;
- }
-
- return 0;
-}
-
-static int
-virDomainInputDefValidate(const virDomainInputDef *input)
-{
- switch ((virDomainInputType) input->type) {
- case VIR_DOMAIN_INPUT_TYPE_MOUSE:
- case VIR_DOMAIN_INPUT_TYPE_TABLET:
- case VIR_DOMAIN_INPUT_TYPE_KBD:
- if (input->source.evdev) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("setting source evdev path only supported for
"
- "passthrough input devices"));
- return -1;
- }
- break;
-
- case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
- if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("only bus 'virtio' is supported for
'passthrough' "
- "input devices"));
- return -1;
- }
- break;
-
- case VIR_DOMAIN_INPUT_TYPE_LAST:
- default:
- virReportEnumRangeError(virDomainInputType, input->type);
- return -1;
- }
-
- return 0;
-}
-
-
-static int
-virDomainShmemDefValidate(const virDomainShmemDef *shmem)
-{
- if (strchr(shmem->name, '/')) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("shmem name cannot include '/' character"));
- return -1;
- }
-
- if (STREQ(shmem->name, ".")) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("shmem name cannot be equal to '.'"));
- return -1;
- }
-
- if (STREQ(shmem->name, "..")) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("shmem name cannot be equal to '..'"));
- return -1;
- }
-
- return 0;
-}
-
-
static int
virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
const virDomainDef *def)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 6ca4ebb0ea..ec955daf66 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1321,3 +1321,153 @@ virDomainNetDefValidate(const virDomainNetDef *net)
return 0;
}
+
+
+int
+virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
+{
+ if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
+ switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) {
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+ if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("PCI host devices must use 'pci' or "
+ "'unassigned' address type"));
+ return -1;
+ }
+ break;
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+ if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("SCSI host device must use 'drive' "
+ "address type"));
+ return -1;
+ }
+ break;
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+ if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("SCSI_host host device must use 'pci'
"
+ "or 'ccw' address type"));
+ return -1;
+ }
+ break;
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+ if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
+ hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("USB host device must use 'usb' address
type"));
+ return -1;
+ }
+ break;
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+ break;
+ }
+ }
+ return 0;
+}
+
+
+int
+virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
+ const virDomainDef *def)
+{
+ if (mem->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
+ if (!mem->nvdimmPath) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("path is required for model 'nvdimm'"));
+ return -1;
+ }
+
+ if (mem->discard == VIR_TRISTATE_BOOL_YES) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("discard is not supported for nvdimms"));
+ return -1;
+ }
+
+ if (ARCH_IS_PPC64(def->os.arch) && mem->labelsize == 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("label size is required for NVDIMM device"));
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+
+int
+virDomainVsockDefValidate(const virDomainVsockDef *vsock)
+{
+ if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("guest CIDs must be >= 3"));
+ return -1;
+ }
+
+ return 0;
+}
+
+int
+virDomainInputDefValidate(const virDomainInputDef *input)
+{
+ switch ((virDomainInputType) input->type) {
+ case VIR_DOMAIN_INPUT_TYPE_MOUSE:
+ case VIR_DOMAIN_INPUT_TYPE_TABLET:
+ case VIR_DOMAIN_INPUT_TYPE_KBD:
+ if (input->source.evdev) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("setting source evdev path only supported for
"
+ "passthrough input devices"));
+ return -1;
+ }
+ break;
+
+ case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
+ if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("only bus 'virtio' is supported for
'passthrough' "
+ "input devices"));
+ return -1;
+ }
+ break;
+
+ case VIR_DOMAIN_INPUT_TYPE_LAST:
+ default:
+ virReportEnumRangeError(virDomainInputType, input->type);
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int
+virDomainShmemDefValidate(const virDomainShmemDef *shmem)
+{
+ if (strchr(shmem->name, '/')) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("shmem name cannot include '/' character"));
+ return -1;
+ }
+
+ if (STREQ(shmem->name, ".")) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("shmem name cannot be equal to '.'"));
+ return -1;
+ }
+
+ if (STREQ(shmem->name, "..")) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("shmem name cannot be equal to '..'"));
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index d38d2f4e06..e04ecab065 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -51,3 +51,9 @@ int virDomainDefValidate(virDomainDefPtr def,
void *parseOpaque);
int virDomainActualNetDefValidate(const virDomainNetDef *net);
int virDomainNetDefValidate(const virDomainNetDef *net);
+int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev);
+int virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
+ const virDomainDef *def);
+int virDomainVsockDefValidate(const virDomainVsockDef *vsock);
+int virDomainInputDefValidate(const virDomainInputDef *input);
+int virDomainShmemDefValidate(const virDomainShmemDef *shmem);
--
2.26.2
12:05 p.m.
New subject: [PATCH 09/12] domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_conf.c | 88 --------------------------------------
src/conf/domain_conf.h | 6 +--
src/conf/domain_validate.c | 88 ++++++++++++++++++++++++++++++++++++++
src/conf/domain_validate.h | 5 +++
4 files changed, 94 insertions(+), 93 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ebe895948f..26c48ef38c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6022,94 +6022,6 @@ virDomainDefHasUSB(const virDomainDef *def)
}
-static int
-virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
- const virDomainDef *def)
-{
- switch ((virDomainDeviceType) dev->type) {
- case VIR_DOMAIN_DEVICE_DISK:
- return virDomainDiskDefValidate(def, dev->data.disk);
-
- case VIR_DOMAIN_DEVICE_REDIRDEV:
- return virDomainRedirdevDefValidate(def, dev->data.redirdev);
-
- case VIR_DOMAIN_DEVICE_NET:
- return virDomainNetDefValidate(dev->data.net);
-
- case VIR_DOMAIN_DEVICE_CONTROLLER:
- return virDomainControllerDefValidate(dev->data.controller);
-
- case VIR_DOMAIN_DEVICE_CHR:
- return virDomainChrDefValidate(dev->data.chr, def);
-
- case VIR_DOMAIN_DEVICE_SMARTCARD:
- return virDomainSmartcardDefValidate(dev->data.smartcard, def);
-
- case VIR_DOMAIN_DEVICE_RNG:
- return virDomainRNGDefValidate(dev->data.rng, def);
-
- case VIR_DOMAIN_DEVICE_HOSTDEV:
- return virDomainHostdevDefValidate(dev->data.hostdev);
-
- case VIR_DOMAIN_DEVICE_VIDEO:
- return virDomainVideoDefValidate(dev->data.video, def);
-
- case VIR_DOMAIN_DEVICE_MEMORY:
- return virDomainMemoryDefValidate(dev->data.memory, def);
-
- case VIR_DOMAIN_DEVICE_VSOCK:
- return virDomainVsockDefValidate(dev->data.vsock);
-
- case VIR_DOMAIN_DEVICE_INPUT:
- return virDomainInputDefValidate(dev->data.input);
-
- case VIR_DOMAIN_DEVICE_SHMEM:
- return virDomainShmemDefValidate(dev->data.shmem);
-
- case VIR_DOMAIN_DEVICE_AUDIO:
- /* TODO: validate? */
- case VIR_DOMAIN_DEVICE_LEASE:
- case VIR_DOMAIN_DEVICE_FS:
- case VIR_DOMAIN_DEVICE_SOUND:
- case VIR_DOMAIN_DEVICE_WATCHDOG:
- case VIR_DOMAIN_DEVICE_GRAPHICS:
- case VIR_DOMAIN_DEVICE_HUB:
- case VIR_DOMAIN_DEVICE_MEMBALLOON:
- case VIR_DOMAIN_DEVICE_NVRAM:
- case VIR_DOMAIN_DEVICE_TPM:
- case VIR_DOMAIN_DEVICE_PANIC:
- case VIR_DOMAIN_DEVICE_IOMMU:
- case VIR_DOMAIN_DEVICE_NONE:
- case VIR_DOMAIN_DEVICE_LAST:
- break;
- }
-
- return 0;
-}
-
-
-int
-virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
- const virDomainDef *def,
- unsigned int parseFlags,
- virDomainXMLOptionPtr xmlopt,
- void *parseOpaque)
-{
- /* validate configuration only in certain places */
- if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)
- return 0;
-
- if (xmlopt->config.deviceValidateCallback &&
- xmlopt->config.deviceValidateCallback(dev, def, xmlopt->config.priv,
parseOpaque))
- return -1;
-
- if (virDomainDeviceDefValidateInternal(dev, def) < 0)
- return -1;
-
- return 0;
-}
-
-
bool
virDomainDefLifecycleActionAllowed(virDomainLifecycle type,
virDomainLifecycleAction action)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e35c4206df..ce8ed48a04 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3122,11 +3122,7 @@ void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def);
void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def);
void virDomainShmemDefFree(virDomainShmemDefPtr def);
void virDomainDeviceDefFree(virDomainDeviceDefPtr def);
-int virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
- const virDomainDef *def,
- unsigned int parseFlags,
- virDomainXMLOptionPtr xmlopt,
- void *parseOpaque);
+
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainDeviceDef, virDomainDeviceDefFree);
virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
const virDomainDef *def,
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index ec955daf66..8acb7c1044 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1471,3 +1471,91 @@ virDomainShmemDefValidate(const virDomainShmemDef *shmem)
return 0;
}
+
+
+static int
+virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
+ const virDomainDef *def)
+{
+ switch ((virDomainDeviceType) dev->type) {
+ case VIR_DOMAIN_DEVICE_DISK:
+ return virDomainDiskDefValidate(def, dev->data.disk);
+
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
+ return virDomainRedirdevDefValidate(def, dev->data.redirdev);
+
+ case VIR_DOMAIN_DEVICE_NET:
+ return virDomainNetDefValidate(dev->data.net);
+
+ case VIR_DOMAIN_DEVICE_CONTROLLER:
+ return virDomainControllerDefValidate(dev->data.controller);
+
+ case VIR_DOMAIN_DEVICE_CHR:
+ return virDomainChrDefValidate(dev->data.chr, def);
+
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
+ return virDomainSmartcardDefValidate(dev->data.smartcard, def);
+
+ case VIR_DOMAIN_DEVICE_RNG:
+ return virDomainRNGDefValidate(dev->data.rng, def);
+
+ case VIR_DOMAIN_DEVICE_HOSTDEV:
+ return virDomainHostdevDefValidate(dev->data.hostdev);
+
+ case VIR_DOMAIN_DEVICE_VIDEO:
+ return virDomainVideoDefValidate(dev->data.video, def);
+
+ case VIR_DOMAIN_DEVICE_MEMORY:
+ return virDomainMemoryDefValidate(dev->data.memory, def);
+
+ case VIR_DOMAIN_DEVICE_VSOCK:
+ return virDomainVsockDefValidate(dev->data.vsock);
+
+ case VIR_DOMAIN_DEVICE_INPUT:
+ return virDomainInputDefValidate(dev->data.input);
+
+ case VIR_DOMAIN_DEVICE_SHMEM:
+ return virDomainShmemDefValidate(dev->data.shmem);
+
+ case VIR_DOMAIN_DEVICE_AUDIO:
+ /* TODO: validate? */
+ case VIR_DOMAIN_DEVICE_LEASE:
+ case VIR_DOMAIN_DEVICE_FS:
+ case VIR_DOMAIN_DEVICE_SOUND:
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
+ case VIR_DOMAIN_DEVICE_HUB:
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
+ case VIR_DOMAIN_DEVICE_NVRAM:
+ case VIR_DOMAIN_DEVICE_TPM:
+ case VIR_DOMAIN_DEVICE_PANIC:
+ case VIR_DOMAIN_DEVICE_IOMMU:
+ case VIR_DOMAIN_DEVICE_NONE:
+ case VIR_DOMAIN_DEVICE_LAST:
+ break;
+ }
+
+ return 0;
+}
+
+
+int
+virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
+ const virDomainDef *def,
+ unsigned int parseFlags,
+ virDomainXMLOptionPtr xmlopt,
+ void *parseOpaque)
+{
+ /* validate configuration only in certain places */
+ if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)
+ return 0;
+
+ if (xmlopt->config.deviceValidateCallback &&
+ xmlopt->config.deviceValidateCallback(dev, def, xmlopt->config.priv,
parseOpaque))
+ return -1;
+
+ if (virDomainDeviceDefValidateInternal(dev, def) < 0)
+ return -1;
+
+ return 0;
+}
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index e04ecab065..710515a6ff 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -57,3 +57,8 @@ int virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
int virDomainVsockDefValidate(const virDomainVsockDef *vsock);
int virDomainInputDefValidate(const virDomainInputDef *input);
int virDomainShmemDefValidate(const virDomainShmemDef *shmem);
+int virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
+ const virDomainDef *def,
+ unsigned int parseFlags,
+ virDomainXMLOptionPtr xmlopt,
+ void *parseOpaque);
--
2.26.2
12:05 p.m.
New subject: [PATCH 10/12] domain_validate.c: make virDomainDeviceDefValidateInternal() helpers static
After the move from the previous patch, these functions are now all
used in domain_validate.c and doesn't need to be public.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_validate.c | 27 ++++++++++++++-------------
src/conf/domain_validate.h | 20 --------------------
2 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 8acb7c1044..2a881f1f06 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -76,7 +76,7 @@ virDomainDefVideoValidate(const virDomainDef *def)
}
-int
+static int
virDomainVideoDefValidate(const virDomainVideoDef *video,
const virDomainDef *def)
{
@@ -229,7 +229,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr
*seclabels,
#define VENDOR_LEN 8
#define PRODUCT_LEN 16
-int
+static int
virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk)
{
@@ -446,7 +446,7 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def,
}
-int
+static int
virDomainRedirdevDefValidate(const virDomainDef *def,
const virDomainRedirdevDef *redirdev)
{
@@ -462,7 +462,7 @@ virDomainRedirdevDefValidate(const virDomainDef *def,
}
-int
+static int
virDomainChrDefValidate(const virDomainChrDef *chr,
const virDomainDef *def)
{
@@ -470,7 +470,7 @@ virDomainChrDefValidate(const virDomainChrDef *chr,
}
-int
+static int
virDomainRNGDefValidate(const virDomainRNGDef *rng,
const virDomainDef *def)
{
@@ -481,7 +481,7 @@ virDomainRNGDefValidate(const virDomainRNGDef *rng,
}
-int
+static int
virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
const virDomainDef *def)
{
@@ -520,7 +520,7 @@ virDomainDefTunablesValidate(const virDomainDef *def)
}
-int
+static int
virDomainControllerDefValidate(const virDomainControllerDef *controller)
{
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
@@ -1273,7 +1273,7 @@ virDomainActualNetDefValidate(const virDomainNetDef *net)
}
-int
+static int
virDomainNetDefValidate(const virDomainNetDef *net)
{
char macstr[VIR_MAC_STRING_BUFLEN];
@@ -1323,7 +1323,7 @@ virDomainNetDefValidate(const virDomainNetDef *net)
}
-int
+static int
virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
{
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
@@ -1374,7 +1374,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
}
-int
+static int
virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
const virDomainDef *def)
{
@@ -1402,7 +1402,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
}
-int
+static int
virDomainVsockDefValidate(const virDomainVsockDef *vsock)
{
if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) {
@@ -1414,7 +1414,8 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
return 0;
}
-int
+
+static int
virDomainInputDefValidate(const virDomainInputDef *input)
{
switch ((virDomainInputType) input->type) {
@@ -1448,7 +1449,7 @@ virDomainInputDefValidate(const virDomainInputDef *input)
}
-int
+static int
virDomainShmemDefValidate(const virDomainShmemDef *shmem)
{
if (strchr(shmem->name, '/')) {
diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index 710515a6ff..addffc3819 100644
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -25,23 +25,10 @@
#include "domain_conf.h"
#include "virconftypes.h"
-int virDomainVideoDefValidate(const virDomainVideoDef *video,
- const virDomainDef *def);
int virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels,
size_t nseclabels,
virSecurityLabelDefPtr *vmSeclabels,
size_t nvmSeclabels);
-int virDomainDiskDefValidate(const virDomainDef *def,
- const virDomainDiskDef *disk);
-int virDomainRedirdevDefValidate(const virDomainDef *def,
- const virDomainRedirdevDef *redirdev);
-int virDomainChrDefValidate(const virDomainChrDef *chr,
- const virDomainDef *def);
-int virDomainRNGDefValidate(const virDomainRNGDef *rng,
- const virDomainDef *def);
-int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
- const virDomainDef *def);
-int virDomainControllerDefValidate(const virDomainControllerDef *controller);
int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
unsigned int flags);
@@ -50,13 +37,6 @@ int virDomainDefValidate(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque);
int virDomainActualNetDefValidate(const virDomainNetDef *net);
-int virDomainNetDefValidate(const virDomainNetDef *net);
-int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev);
-int virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
- const virDomainDef *def);
-int virDomainVsockDefValidate(const virDomainVsockDef *vsock);
-int virDomainInputDefValidate(const virDomainInputDef *input);
-int virDomainShmemDefValidate(const virDomainShmemDef *shmem);
int virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
const virDomainDef *def,
unsigned int parseFlags,
--
2.26.2
12:05 p.m.
New subject: [PATCH 11/12] domain_validate.c: put IOMMU validation into a new function
All other validations from virDomainDefValidateInternal() are done
in their own functions. Take IOMMU validation out of the function
body and into its own function.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_validate.c | 41 ++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 2a881f1f06..4cc1d11647 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1042,6 +1042,31 @@ virDomainDefCputuneValidate(const virDomainDef *def)
#undef CPUTUNE_VALIDATE_QUOTA
+static int
+virDomainDefIOMMUValidate(const virDomainDef *def)
+{
+ if (!def->iommu)
+ return 0;
+
+ if (def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
+ def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_QEMU) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("IOMMU interrupt remapping requires split I/O APIC "
+ "(ioapic driver='qemu')"));
+ return -1;
+ }
+
+ if (def->iommu->eim == VIR_TRISTATE_SWITCH_ON &&
+ def->iommu->intremap != VIR_TRISTATE_SWITCH_ON) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("IOMMU eim requires interrupt remapping to be
enabled"));
+ return -1;
+ }
+
+ return 0;
+}
+
+
static int
virDomainDefValidateInternal(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt)
@@ -1058,22 +1083,8 @@ virDomainDefValidateInternal(const virDomainDef *def,
if (virDomainDefValidateAliases(def, NULL) < 0)
return -1;
- if (def->iommu &&
- def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
- def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_QEMU) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("IOMMU interrupt remapping requires split I/O APIC "
- "(ioapic driver='qemu')"));
- return -1;
- }
-
- if (def->iommu &&
- def->iommu->eim == VIR_TRISTATE_SWITCH_ON &&
- def->iommu->intremap != VIR_TRISTATE_SWITCH_ON) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("IOMMU eim requires interrupt remapping to be
enabled"));
+ if (virDomainDefIOMMUValidate(def) < 0)
return -1;
- }
if (virDomainDefLifecycleActionValidate(def) < 0)
return -1;
--
2.26.2
12:05 p.m.
New subject: [PATCH 12/12] domain_validate.c: use VIR_ERR_CONFIG_UNSUPPORTED in validate functions
Some functions in domain_validate.c are throwing VIR_ERR_XML_ERROR,
when in reality none of these errors are exclusive to XML parsing.
Change to VIR_ERR_CONFIG_UNSUPPORTED to be more adequate.
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
src/conf/domain_validate.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 4cc1d11647..4ae9f1e1b2 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -291,7 +291,7 @@ virDomainDiskDefValidate(const virDomainDef *def,
if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
/* NVMe namespaces start from 1 */
if (disk->src->nvme->namespc == 0) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("NVMe namespace can't be zero"));
return -1;
}
@@ -423,7 +423,7 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def,
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
if (!src_def->data.spiceport.channel) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Missing source channel attribute for char
device"));
return -1;
}
@@ -547,7 +547,7 @@ virDomainControllerDefValidate(const virDomainControllerDef
*controller)
if (opts->targetIndex != -1) {
if (opts->targetIndex < 0 || opts->targetIndex > 30) {
- virReportError(VIR_ERR_XML_ERROR,
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("PCI controller target index '%d' out of
"
"range - must be 0-30"),
opts->targetIndex);
@@ -556,7 +556,7 @@ virDomainControllerDefValidate(const virDomainControllerDef
*controller)
if ((controller->idx == 0 && opts->targetIndex != 0) ||
(controller->idx != 0 && opts->targetIndex == 0)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only the PCI controller with index 0 can "
"have target index 0, and vice versa"));
return -1;
@@ -797,7 +797,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
}
if (virHashLookup(data->aliases, alias)) {
- virReportError(VIR_ERR_XML_ERROR,
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("non unique alias detected: %s"),
alias);
return -1;
@@ -864,7 +864,7 @@ virDomainDeviceValidateAliasImpl(const virDomainDef *def,
goto cleanup;
if (virHashLookup(aliases, info->alias)) {
- virReportError(VIR_ERR_XML_ERROR,
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("non unique alias detected: %s"),
info->alias);
goto cleanup;
@@ -1050,7 +1050,7 @@ virDomainDefIOMMUValidate(const virDomainDef *def)
if (def->iommu->intremap == VIR_TRISTATE_SWITCH_ON &&
def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_QEMU) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("IOMMU interrupt remapping requires split I/O APIC "
"(ioapic driver='qemu')"));
return -1;
@@ -1058,7 +1058,7 @@ virDomainDefIOMMUValidate(const virDomainDef *def)
if (def->iommu->eim == VIR_TRISTATE_SWITCH_ON &&
def->iommu->intremap != VIR_TRISTATE_SWITCH_ON) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("IOMMU eim requires interrupt remapping to be
enabled"));
return -1;
}
@@ -1352,7 +1352,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("SCSI host device must use 'drive' "
"address type"));
return -1;
@@ -1362,7 +1362,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI
&&
hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("SCSI_host host device must use 'pci'
"
"or 'ccw' address type"));
return -1;
@@ -1371,7 +1371,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
if (hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE
&&
hostdev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("USB host device must use 'usb' address
type"));
return -1;
}
@@ -1417,7 +1417,7 @@ static int
virDomainVsockDefValidate(const virDomainVsockDef *vsock)
{
if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("guest CIDs must be >= 3"));
return -1;
}
@@ -1434,7 +1434,7 @@ virDomainInputDefValidate(const virDomainInputDef *input)
case VIR_DOMAIN_INPUT_TYPE_TABLET:
case VIR_DOMAIN_INPUT_TYPE_KBD:
if (input->source.evdev) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting source evdev path only supported for
"
"passthrough input devices"));
return -1;
@@ -1443,7 +1443,7 @@ virDomainInputDefValidate(const virDomainInputDef *input)
case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("only bus 'virtio' is supported for
'passthrough' "
"input devices"));
return -1;
@@ -1464,19 +1464,19 @@ static int
virDomainShmemDefValidate(const virDomainShmemDef *shmem)
{
if (strchr(shmem->name, '/')) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("shmem name cannot include '/' character"));
return -1;
}
if (STREQ(shmem->name, ".")) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("shmem name cannot be equal to '.'"));
return -1;
}
if (STREQ(shmem->name, "..")) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("shmem name cannot be equal to '..'"));
return -1;
}
--
2.26.2
4:18 a.m.
On 12/11/20 7:05 PM, Daniel Henrique Barboza wrote:
Hi,
This is a continuation of what we started in [1]. The changes
are all trivial, but done in parts to make the review less
annoying.
domain_conf.c is still a huge beast, but here we're putting it on
a diet, losing ~1k lines.
[1] https://www.redhat.com/archives/libvir-list/2020-December/msg00509.html
Daniel Henrique Barboza (12):
domain_conf: move duplicate check functions to domain_validate.c
domain_conf.c: rename virDomainDeviceInfoIterateInternal()
domain_conf: move address validation functions to domain_validate.c
domain_conf: move all virDomainDefValidateInternal() helpers to
domain_validate.c
domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
domain_validate.c: make local functions static
domain_conf: move net device validation to domain_validate.c
domain_conf: move all DeviceDefValidateInternal() helpers to
domain_validate
domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
domain_validate.c: make virDomainDeviceDefValidateInternal() helpers
static
domain_validate.c: put IOMMU validation into a new function
domain_validate.c: use VIR_ERR_CONFIG_UNSUPPORTED in validate
functions
src/conf/domain_conf.c | 1040 ++----------------------------------
src/conf/domain_conf.h | 58 +-
src/conf/domain_validate.c | 966 ++++++++++++++++++++++++++++++++-
src/conf/domain_validate.h | 31 +-
src/libvirt_private.syms | 9 +-
src/libxl/libxl_domain.c | 1 +
src/libxl/libxl_driver.c | 1 +
src/lxc/lxc_driver.c | 1 +
src/lxc/lxc_process.c | 1 +
src/qemu/qemu_domain.c | 1 +
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_process.c | 1 +
12 files changed, 1066 insertions(+), 1045 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Nice cleanup.
Michal
6:45 a.m.
On 12/14/20 7:18 AM, Michal Privoznik wrote:
On 12/11/20 7:05 PM, Daniel Henrique Barboza wrote:
> Hi,
>
> This is a continuation of what we started in [1]. The changes
> are all trivial, but done in parts to make the review less
> annoying.
>
> domain_conf.c is still a huge beast, but here we're putting it on
> a diet, losing ~1k lines.
>
>
> [1] https://www.redhat.com/archives/libvir-list/2020-December/msg00509.html
>
> Daniel Henrique Barboza (12):
> domain_conf: move duplicate check functions to domain_validate.c
> domain_conf.c: rename virDomainDeviceInfoIterateInternal()
> domain_conf: move address validation functions to domain_validate.c
> domain_conf: move all virDomainDefValidateInternal() helpers to
> domain_validate.c
> domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
> domain_validate.c: make local functions static
> domain_conf: move net device validation to domain_validate.c
> domain_conf: move all DeviceDefValidateInternal() helpers to
> domain_validate
> domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c
> domain_validate.c: make virDomainDeviceDefValidateInternal() helpers
> static
> domain_validate.c: put IOMMU validation into a new function
> domain_validate.c: use VIR_ERR_CONFIG_UNSUPPORTED in validate
> functions
>
> src/conf/domain_conf.c | 1040 ++----------------------------------
> src/conf/domain_conf.h | 58 +-
> src/conf/domain_validate.c | 966 ++++++++++++++++++++++++++++++++-
> src/conf/domain_validate.h | 31 +-
> src/libvirt_private.syms | 9 +-
> src/libxl/libxl_domain.c | 1 +
> src/libxl/libxl_driver.c | 1 +
> src/lxc/lxc_driver.c | 1 +
> src/lxc/lxc_process.c | 1 +
> src/qemu/qemu_domain.c | 1 +
> src/qemu/qemu_driver.c | 1 +
> src/qemu/qemu_process.c | 1 +
> 12 files changed, 1066 insertions(+), 1045 deletions(-)
>
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Nice cleanup.
Thanks! Pushed to master.
DHB
Michal
1421
days inactive
1424
days old
16 comments
2 participants
participants (2)
-
Daniel Henrique Barboza -
Michal Privoznik