The qemuDomainUpdateDeviceLive() accepts virDomainPtr as one of
its arguments, but use it only to get QEMU driver out of it.
Well, the only caller already done that and thus can pass it
instead of virDomainPtr.

This also makes it look like the rest of device hot(un-)plug
functions: qemuDomainAttachDeviceLive() and
qemuDomainUpdateDeviceLive().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_driver.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 523a83682c..48eb759531 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7070,10 +7070,9 @@ qemuDomainChangeMemoryLive(virQEMUDriver *driver G_GNUC_UNUSED,
 static int
 qemuDomainUpdateDeviceLive(virDomainObj *vm,
                            virDomainDeviceDef *dev,
-                           virDomainPtr dom,
+                           virQEMUDriver *driver,
                            bool force)
 {
-    virQEMUDriver *driver = dom->conn->privateData;
     virDomainDeviceDef oldDev = { .type = dev->type };
     int idx;
 
@@ -7939,7 +7938,7 @@ qemuDomainUpdateDeviceFlags(virDomainPtr dom,
     if (flags & VIR_DOMAIN_AFFECT_LIVE) {
         /* virDomainDefCompatibleDevice call is delayed until we know the
          * device we're going to update. */
-        if ((ret = qemuDomainUpdateDeviceLive(vm, dev_live, dom, force)) < 0)
+        if ((ret = qemuDomainUpdateDeviceLive(vm, dev_live, driver, force)) < 0)
             goto endjob;
 
         qemuDomainSaveStatus(vm);
-- 
2.39.2

On Fri, Apr 21, 2023 at 10:25 AM Michal Privoznik <mprivozn@redhat.com>
wrote:

> The qemuDomainUpdateDeviceLive() accepts virDomainPtr as one of
> its arguments, but use it only to get QEMU driver out of it.
> Well, the only caller already done that and thus can pass it
>

*does


> instead of virDomainPtr.
>
> This also makes it look like the rest of device hot(un-)plug
> functions: qemuDomainAttachDeviceLive() and
> qemuDomainUpdateDeviceLive().
>
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/qemu/qemu_driver.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>


Reviewed-by: Kristina Hanicova <khanicov@redhat.com>

Kristina