6:41 a.m.
Peter Krempa (2):
qemu: migration: Refactor hostdev validation in migration check
util: command: Deduplicate code in virCommandNewArgList
src/qemu/qemu_migration.c | 15 ++++-----------
src/util/vircommand.c | 10 +++-------
2 files changed, 7 insertions(+), 18 deletions(-)
--
2.3.5
6:41 a.m.
New subject: [libvirt] [PATCH 1/2] qemu: migration: Refactor hostdev validation in migration check
The hostdev check can error out right away.
---
src/qemu/qemu_migration.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9344382..1da687c 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1951,7 +1951,6 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
{
int nsnapshots;
int pauseReason;
- bool forbid;
size_t i;
if (vm) {
@@ -1995,22 +1994,16 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr
vm,
}
/* Migration with USB host devices is allowed, all other devices are
- * forbidden.
- */
- forbid = false;
+ * forbidden. */
for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = def->hostdevs[i];
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
- forbid = true;
- break;
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("domain has assigned non-USB host devices"));
+ return false;
}
}
- if (forbid) {
- virReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("domain has assigned non-USB host devices"));
- return false;
- }
if (def->cpu && def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
for (i = 0; i < def->cpu->nfeatures; i++) {
--
2.3.5
6:41 a.m.
New subject: [libvirt] [PATCH 2/2] util: command: Deduplicate code in virCommandNewArgList
virCommandNewArgList can use virCommandNewVAList.
---
src/util/vircommand.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 648f5ed..c41bd7f 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -919,17 +919,13 @@ virCommandNewArgs(const char *const*args)
virCommandPtr
virCommandNewArgList(const char *binary, ...)
{
- virCommandPtr cmd = virCommandNew(binary);
+ virCommandPtr cmd;
va_list list;
- const char *arg;
-
- if (!cmd || cmd->has_error)
- return cmd;
va_start(list, binary);
- while ((arg = va_arg(list, const char *)) != NULL)
- virCommandAddArg(cmd, arg);
+ cmd = virCommandNewVAList(binary, list);
va_end(list);
+
return cmd;
}
--
2.3.5
7:08 a.m.
On Wed, Apr 22, 2015 at 14:03:01 +0200, Martin Kletzander wrote:
On Wed, Apr 22, 2015 at 01:41:32PM +0200, Peter Krempa wrote:
>Peter Krempa (2):
> qemu: migration: Refactor hostdev validation in migration check
> util: command: Deduplicate code in virCommandNewArgList
>
ACK
Pushed; Thanks.
Peter
3533
days inactive
3533
days old
4 comments
2 participants
participants (2)
-
Martin Kletzander -
Peter Krempa