Re: [libvirt] [PATCH 08/11] qemu: Alter qemuDomainChgIOThread to take qemuMonitorIOThreadInfo

2018-10-19 Thread Michal Privoznik 
On 10/07/2018 03:00 PM, John Ferlan wrote:
> Rather than passing an iothread_id, let's pass a qemuMonitorIOThreadInfo
> structure so that a subsequent change to modify the iothread info can
> just generate and pass one.
> 
> Signed-off-by: John Ferlan 
> ---
>  src/qemu/qemu_driver.c | 26 +++---
>  1 file changed, 15 insertions(+), 11 deletions(-)

ACK

Michal

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

[libvirt] [PATCH 08/11] qemu: Alter qemuDomainChgIOThread to take qemuMonitorIOThreadInfo

2018-10-07 Thread John Ferlan 
Rather than passing an iothread_id, let's pass a qemuMonitorIOThreadInfo
structure so that a subsequent change to modify the iothread info can
just generate and pass one.

Signed-off-by: John Ferlan 
---
 src/qemu/qemu_driver.c | 26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ff466df4b7..c87a0db86d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6023,7 +6023,7 @@ typedef enum {
 static int
 qemuDomainChgIOThread(virQEMUDriverPtr driver,
   virDomainObjPtr vm,
-  unsigned int iothread_id,
+  qemuMonitorIOThreadInfo iothread,
   virDomainIOThreadAction action,
   unsigned int flags)
 {
@@ -6052,19 +6052,19 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
 
 switch (action) {
 case VIR_DOMAIN_IOTHREAD_ACTION_ADD:
-if (qemuDomainAddIOThreadCheck(def, iothread_id) < 0)
+if (qemuDomainAddIOThreadCheck(def, iothread.iothread_id) < 0)
 goto endjob;
 
-if (qemuDomainHotplugAddIOThread(driver, vm, iothread_id) < 0)
+if (qemuDomainHotplugAddIOThread(driver, vm, iothread.iothread_id) 
< 0)
 goto endjob;
 
 break;
 
 case VIR_DOMAIN_IOTHREAD_ACTION_DEL:
-if (qemuDomainDelIOThreadCheck(def, iothread_id) < 0)
+if (qemuDomainDelIOThreadCheck(def, iothread.iothread_id) < 0)
 goto endjob;
 
-if (qemuDomainHotplugDelIOThread(driver, vm, iothread_id) < 0)
+if (qemuDomainHotplugDelIOThread(driver, vm, iothread.iothread_id) 
< 0)
 goto endjob;
 
 break;
@@ -6077,19 +6077,19 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
 if (persistentDef) {
 switch (action) {
 case VIR_DOMAIN_IOTHREAD_ACTION_ADD:
-if (qemuDomainAddIOThreadCheck(persistentDef, iothread_id) < 0)
+if (qemuDomainAddIOThreadCheck(persistentDef, 
iothread.iothread_id) < 0)
 goto endjob;
 
-if (!virDomainIOThreadIDAdd(persistentDef, iothread_id))
+if (!virDomainIOThreadIDAdd(persistentDef, iothread.iothread_id))
 goto endjob;
 
 break;
 
 case VIR_DOMAIN_IOTHREAD_ACTION_DEL:
-if (qemuDomainDelIOThreadCheck(persistentDef, iothread_id) < 0)
+if (qemuDomainDelIOThreadCheck(persistentDef, 
iothread.iothread_id) < 0)
 goto endjob;
 
-virDomainIOThreadIDDel(persistentDef, iothread_id);
+virDomainIOThreadIDDel(persistentDef, iothread.iothread_id);
 
 break;
 }
@@ -6116,6 +6116,7 @@ qemuDomainAddIOThread(virDomainPtr dom,
 {
 virQEMUDriverPtr driver = dom->conn->privateData;
 virDomainObjPtr vm = NULL;
+qemuMonitorIOThreadInfo iothread = {0};
 int ret = -1;
 
 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -6133,7 +6134,8 @@ qemuDomainAddIOThread(virDomainPtr dom,
 if (virDomainAddIOThreadEnsureACL(dom->conn, vm->def, flags) < 0)
 goto cleanup;
 
-ret = qemuDomainChgIOThread(driver, vm, iothread_id,
+iothread.iothread_id = iothread_id;
+ret = qemuDomainChgIOThread(driver, vm, iothread,
 VIR_DOMAIN_IOTHREAD_ACTION_ADD, flags);
 
  cleanup:
@@ -6149,6 +6151,7 @@ qemuDomainDelIOThread(virDomainPtr dom,
 {
 virQEMUDriverPtr driver = dom->conn->privateData;
 virDomainObjPtr vm = NULL;
+qemuMonitorIOThreadInfo iothread = {0};
 int ret = -1;
 
 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -6166,7 +6169,8 @@ qemuDomainDelIOThread(virDomainPtr dom,
 if (virDomainDelIOThreadEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup;
 
-ret = qemuDomainChgIOThread(driver, vm, iothread_id,
+iothread.iothread_id = iothread_id;
+ret = qemuDomainChgIOThread(driver, vm, iothread,
 VIR_DOMAIN_IOTHREAD_ACTION_DEL, flags);
 
  cleanup:
-- 
2.17.1

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