Re: [libvirt] [PATCH v3 5/7] qemu: Add job for qemuDomain{Add|Del}TLSObjects

[Jiri Denemark]

On Fri, Mar 17, 2017 at 14:38:59 -0400, John Ferlan wrote:
> Add an asyncJob argument for add/delete TLS Objects. A future patch will
> add/delete TLS objects from a migration which may hae a job to join.

s/hae/have/ I guess.

> 
> Signed-off-by: John Ferlan 
> ---
>  src/qemu/qemu_hotplug.c | 24 
>  src/qemu/qemu_hotplug.h |  2 ++
>  2 files changed, 18 insertions(+), 8 deletions(-)

ACK

Jirka

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v3 5/7] qemu: Add job for qemuDomain{Add|Del}TLSObjects

[John Ferlan]

Add an asyncJob argument for add/delete TLS Objects. A future patch will
add/delete TLS objects from a migration which may hae a job to join.

Signed-off-by: John Ferlan 
---
 src/qemu/qemu_hotplug.c | 24 
 src/qemu/qemu_hotplug.h |  2 ++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index ddcbc5e..9adb04a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1531,6 +1531,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
 void
 qemuDomainDelTLSObjects(virQEMUDriverPtr driver,
 virDomainObjPtr vm,
+qemuDomainAsyncJob asyncJob,
 const char *secAlias,
 const char *tlsAlias)
 {
@@ -1542,7 +1543,8 @@ qemuDomainDelTLSObjects(virQEMUDriverPtr driver,
 
 orig_err = virSaveLastError();
 
-qemuDomainObjEnterMonitor(driver, vm);
+if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+goto cleanup;
 
 if (tlsAlias)
 ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias));
@@ -1552,6 +1554,7 @@ qemuDomainDelTLSObjects(virQEMUDriverPtr driver,
 
 ignore_value(qemuDomainObjExitMonitor(driver, vm));
 
+ cleanup:
 if (orig_err) {
 virSetError(orig_err);
 virFreeError(orig_err);
@@ -1562,6 +1565,7 @@ qemuDomainDelTLSObjects(virQEMUDriverPtr driver,
 int
 qemuDomainAddTLSObjects(virQEMUDriverPtr driver,
 virDomainObjPtr vm,
+qemuDomainAsyncJob asyncJob,
 const char *secAlias,
 virJSONValuePtr *secProps,
 const char *tlsAlias,
@@ -1574,7 +1578,8 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver,
 if (!tlsAlias && !secAlias)
 return 0;
 
-qemuDomainObjEnterMonitor(driver, vm);
+if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+return -1;
 
 if (secAlias) {
 rc = qemuMonitorAddObject(priv->mon, "secret",
@@ -1601,7 +1606,7 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver,
 virSetError(orig_err);
 virFreeError(orig_err);
 }
-qemuDomainDelTLSObjects(driver, vm, secAlias, tlsAlias);
+qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, tlsAlias);
 
 return -1;
 }
@@ -1682,8 +1687,8 @@ qemuDomainAddChardevTLSObjects(virConnectPtr conn,
 goto cleanup;
 dev->data.tcp.tlscreds = true;
 
-if (qemuDomainAddTLSObjects(driver, vm, *secAlias, ,
-*tlsAlias, ) < 0)
+if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
+*secAlias, , *tlsAlias, ) < 
0)
 goto cleanup;
 
 ret = 0;
@@ -1773,7 +1778,8 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn,
 virSetError(orig_err);
 virFreeError(orig_err);
 }
-qemuDomainDelTLSObjects(driver, vm, secAlias, tlsAlias);
+qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
+secAlias, tlsAlias);
 goto audit;
 }
 
@@ -2034,7 +2040,8 @@ int qemuDomainAttachChrDevice(virConnectPtr conn,
 virFreeError(orig_err);
 }
 
-qemuDomainDelTLSObjects(driver, vm, secAlias, tlsAlias);
+qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
+secAlias, tlsAlias);
 goto audit;
 }
 
@@ -2186,7 +2193,8 @@ qemuDomainAttachRNGDevice(virConnectPtr conn,
 virFreeError(orig_err);
 }
 
-qemuDomainDelTLSObjects(driver, vm, secAlias, tlsAlias);
+qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
+secAlias, tlsAlias);
 goto audit;
 }
 
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 73f2b1f..f06f232 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -36,11 +36,13 @@ int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
 
 void qemuDomainDelTLSObjects(virQEMUDriverPtr driver,
  virDomainObjPtr vm,
+ qemuDomainAsyncJob asyncJob,
  const char *secAlias,
  const char *tlsAlias);
 
 int qemuDomainAddTLSObjects(virQEMUDriverPtr driver,
 virDomainObjPtr vm,
+qemuDomainAsyncJob asyncJob,
 const char *secAlias,
 virJSONValuePtr *secProps,
 const char *tlsAlias,
-- 
2.9.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list