Re: [libvirt] [PATCHv2 40/62] qemu: process: Add lookup via QOM id to qemuProcessFindDomainDiskByAlias

2018-08-16 Thread Ján Tomko 

On Mon, Aug 13, 2018 at 06:00:14PM +0200, Peter Krempa wrote:

Allow looking up also via QOM id and rename the function accordingly.
Also add documentation of the specifics.

Signed-off-by: Peter Krempa 
---
src/qemu/qemu_driver.c  |  2 +-
src/qemu/qemu_process.c | 42 +++---
src/qemu/qemu_process.h |  5 +++--
3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f745a0392a..5dee701dc4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4727,7 +4727,7 @@ processBlockJobEvent(virQEMUDriverPtr driver,
goto endjob;
}

-if ((disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias)))
+if ((disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL)))
qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, type, 
status);

 endjob:
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3495733041..b713afa3a2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -350,28 +350,48 @@ qemuProcessHandleMonitorError(qemuMonitorPtr mon 
ATTRIBUTE_UNUSED,
}


+/**
+ * qemuProcessFindDomainDiskByAliasOrQOM:
+ * @vm: domain object to search for the disk
+ * @alias: -drive or -device alias of the disk
+ * @qomid: QOM tree device name
+ *
+ * Looks up a disk in the domain definition of @vm which either matches the
+ * -drive or -device alias used for the backend and frontend respectively or 
the
+ *  QOM name. If @alias is empty it's treated as NULL as it's a mandatory field
+ *  in some cases.
+ *
+ *  Returns a disk from @vm or NULL if it could not be found.


Three out of the last four lines are misaligned.

With the crasher fixup applied:

Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCHv2 40/62] qemu: process: Add lookup via QOM id to qemuProcessFindDomainDiskByAlias

2018-08-14 Thread Peter Krempa 
On Mon, Aug 13, 2018 at 18:00:14 +0200, Peter Krempa wrote:
> Allow looking up also via QOM id and rename the function accordingly.
> Also add documentation of the specifics.
> 
> Signed-off-by: Peter Krempa 
> ---
>  src/qemu/qemu_driver.c  |  2 +-
>  src/qemu/qemu_process.c | 42 +++---
>  src/qemu/qemu_process.h |  5 +++--
>  3 files changed, 35 insertions(+), 14 deletions(-)

[...]

> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 3495733041..b713afa3a2 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -350,28 +350,48 @@ qemuProcessHandleMonitorError(qemuMonitorPtr mon 
> ATTRIBUTE_UNUSED,

[...]

>  virDomainDiskDefPtr
> -qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm,
> - const char *alias)
> +qemuProcessFindDomainDiskByAliasOrQOM(virDomainObjPtr vm,
> +  const char *alias,
> +  const char *qomid)
>  {
>  size_t i;
> 
> -alias = qemuAliasDiskDriveSkipPrefix(alias);
> +if (*alias == '\0')
> +alias = NULL;

Some of the callers already do this and thus pass NULL here, so this
function would crash in that case. Consider this squashed in:

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 15e7c951b6..f6f494cad5 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -370,7 +370,8 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObjPtr vm,
 {
 size_t i;

-if (*alias == '\0')
+if (alias &&
+*alias == '\0')
 alias = NULL;

 if (alias)

> +
> +if (alias)
> +alias = qemuAliasDiskDriveSkipPrefix(alias);
> 


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCHv2 40/62] qemu: process: Add lookup via QOM id to qemuProcessFindDomainDiskByAlias

2018-08-13 Thread Peter Krempa 
Allow looking up also via QOM id and rename the function accordingly.
Also add documentation of the specifics.

Signed-off-by: Peter Krempa 
---
 src/qemu/qemu_driver.c  |  2 +-
 src/qemu/qemu_process.c | 42 +++---
 src/qemu/qemu_process.h |  5 +++--
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f745a0392a..5dee701dc4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4727,7 +4727,7 @@ processBlockJobEvent(virQEMUDriverPtr driver,
 goto endjob;
 }

-if ((disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias)))
+if ((disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL)))
 qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, type, 
status);

  endjob:
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3495733041..b713afa3a2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -350,28 +350,48 @@ qemuProcessHandleMonitorError(qemuMonitorPtr mon 
ATTRIBUTE_UNUSED,
 }


+/**
+ * qemuProcessFindDomainDiskByAliasOrQOM:
+ * @vm: domain object to search for the disk
+ * @alias: -drive or -device alias of the disk
+ * @qomid: QOM tree device name
+ *
+ * Looks up a disk in the domain definition of @vm which either matches the
+ * -drive or -device alias used for the backend and frontend respectively or 
the
+ *  QOM name. If @alias is empty it's treated as NULL as it's a mandatory field
+ *  in some cases.
+ *
+ *  Returns a disk from @vm or NULL if it could not be found.
+ */
 virDomainDiskDefPtr
-qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm,
- const char *alias)
+qemuProcessFindDomainDiskByAliasOrQOM(virDomainObjPtr vm,
+  const char *alias,
+  const char *qomid)
 {
 size_t i;

-alias = qemuAliasDiskDriveSkipPrefix(alias);
+if (*alias == '\0')
+alias = NULL;
+
+if (alias)
+alias = qemuAliasDiskDriveSkipPrefix(alias);

 for (i = 0; i < vm->def->ndisks; i++) {
-virDomainDiskDefPtr disk;
+virDomainDiskDefPtr disk = vm->def->disks[i];
+qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);

-disk = vm->def->disks[i];
-if (disk->info.alias != NULL && STREQ(disk->info.alias, alias))
+if ((disk->info.alias && STREQ_NULLABLE(disk->info.alias, alias)) ||
+(diskPriv->backendQomName && 
STREQ_NULLABLE(diskPriv->backendQomName, qomid)))
 return disk;
 }

 virReportError(VIR_ERR_INTERNAL_ERROR,
-   _("no disk found with alias %s"),
-   alias);
+   _("no disk found with alias '%s' or id '%s'"),
+   NULLSTR(alias), NULLSTR(qomid));
 return NULL;
 }

+
 static int
 qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm,
@@ -849,7 +869,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon 
ATTRIBUTE_UNUSED,
 virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);

 virObjectLock(vm);
-disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias);
+disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL);

 if (disk) {
 srcPath = virDomainDiskGetSource(disk);
@@ -912,7 +932,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon 
ATTRIBUTE_UNUSED,
 VIR_DEBUG("Block job for device %s (domain: %p,%s) type %d status %d",
   diskAlias, vm, vm->def->name, type, status);

-if (!(disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias)))
+if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL)))
 goto error;
 diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);

@@ -1050,7 +1070,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon 
ATTRIBUTE_UNUSED,
 virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);

 virObjectLock(vm);
-disk = qemuProcessFindDomainDiskByAlias(vm, devAlias);
+disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, NULL);

 if (disk) {
 event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, 
reason);
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 07ce3a9915..c2f7c2b5d2 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -187,8 +187,9 @@ bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver,
 int qemuProcessSetSchedParams(int id, pid_t pid, size_t nsp,
   virDomainThreadSchedParamPtr sp);

-virDomainDiskDefPtr qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm,
- const char *alias);
+virDomainDiskDefPtr qemuProcessFindDomainDiskByAliasOrQOM(virDomainObjPtr vm,
+  const char *alias,
+  const char *qomid);

 int