From nobody Thu Apr 25 15:06:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553388144451632.3467472252815; Sat, 23 Mar 2019 17:42:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B7A3C057E7F; Sun, 24 Mar 2019 00:42:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEC4B5D9CC; Sun, 24 Mar 2019 00:42:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B911D1803384; Sun, 24 Mar 2019 00:42:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2O0gFss011216 for ; Sat, 23 Mar 2019 20:42:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E84F5D71E; Sun, 24 Mar 2019 00:42:15 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 062565D70A for ; Sun, 24 Mar 2019 00:42:12 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91F4530821BE for ; Sun, 24 Mar 2019 00:42:11 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id t21so3956561pfe.2 for ; Sat, 23 Mar 2019 17:42:11 -0700 (PDT) Received: from localhost.localdomain (wsip-98-191-116-234.ph.ph.cox.net. [98.191.116.234]) by smtp.gmail.com with ESMTPSA id y2sm10099446pfm.47.2019.03.23.17.42.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 17:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SzXroSajqs4+scnMT0JfbXviePOi6LOqtdNXIR/MLFA=; b=TJEdGBVqXU5VLaqUb/CvQnrLqp78PWpogRASETzKIXO8mejLLIf/Izfj1LRvVjEMqd rX9pJtbiJeDoNIZRSWLS/kZNkbk2YrC9PXhVPPGOlgVbjFCXRufIpFxNdOomaqyuqGpp pk8WOSy8LfChaIBm+yGahH06N/hMHtQl0I2lkz7VZw0wCmW80r8b1Hqu0t0H+505V0Cs IFwOLUtmKM4ugQIYaXl5wRll3lQ8EUQYrdNVEpVnFfq07y56hVtQzzOcZr4fML7XLGwd DyqSwlx9WYsaWTjn44HhRfvxwb5qdi7EHn2Wt/GTtm6db5yxLgugL3ve5FbdtTm1ZObL JsIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SzXroSajqs4+scnMT0JfbXviePOi6LOqtdNXIR/MLFA=; b=rU2A+lwb12dkAbS9Z2zej4By94RiXtVbYbioMnTNj0MQjisiTZwsVSN7KKHF1RT3dH VP5xF/l+C+EnvWclm4ukFt3YAN53Lr7dyE2ya22DaaimBl+Zs0jfk/wCtQPrgUUocaEV N7lejLOb3XdSVswvwX+fS0SeMVm6eaCe3l3IOzh28UZJp2NhgmtaAaLW5DecHG2zupz6 HMsqMGVLrw2Lx91deZaAASkOWPzJH8qIdpO6FTowttTkN5CfEsNz2gImyYY4GitbBpaJ RjmZH5BFwfyieJjAzWXV9StNGRntl0H/SskuEQhBvnHegZTpESrnUCsxgsSR7MFcfy0Q c0Cw== X-Gm-Message-State: APjAAAWcdEXtUPWZG2csGV9PqHMth3/NRx8GtxE0v9Te8GTo5uwoIdpQ /WNGMKsw8u0wkfyaExk9TetlmRt0 X-Google-Smtp-Source: APXvYqykk3Ji0/kCpdrLVmM0yH//Ijx0BaXE0ubZRX1DGU5g1wq3k5gPk8lvHOfvxbD6l4JjOiL5tQ== X-Received: by 2002:a17:902:266:: with SMTP id 93mr17808750plc.161.1553388130860; Sat, 23 Mar 2019 17:42:10 -0700 (PDT) From: Suyang Chen To: libvir-list@redhat.com Date: Sat, 23 Mar 2019 18:41:32 -0600 Message-Id: <20190324004132.118974-1-dawson0xff@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sun, 24 Mar 2019 00:42:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sun, 24 Mar 2019 00:42:11 +0000 (UTC) for IP:'209.85.210.170' DOMAIN:'mail-pf1-f170.google.com' HELO:'mail-pf1-f170.google.com' FROM:'dawson0xff@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.11 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS) 209.85.210.170 mail-pf1-f170.google.com 209.85.210.170 mail-pf1-f170.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Suyang Chen Subject: [libvirt] [PATCH] qemu_hotplug: Remove virQEMUDriverPtr arguments X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 24 Mar 2019 00:42:23 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Since commit 2e6ecba1bcac, the pointer to the qemu driver is saved in domain object's private data and hence does not have to be passed as yet another parameter if domain object is already one of them. This just changed qemuDomainChangeDiskLive and qemuDomainChangeEjectableMedia functions Signed-off-by: Suyang Chen --- src/qemu/qemu_driver.c | 5 ++--- src/qemu/qemu_hotplug.c | 29 ++++++++++++++--------------- src/qemu/qemu_hotplug.h | 3 +-- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b27c6ce98e..5d064030e9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8100,7 +8100,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, static int qemuDomainChangeDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev, - virQEMUDriverPtr driver, bool force) { virDomainDiskDefPtr disk =3D dev->data.disk; @@ -8136,7 +8135,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, goto cleanup; } =20 - if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, + if (qemuDomainChangeEjectableMedia(vm, orig_disk, dev->data.disk->src, force) < 0) goto cleanup; =20 @@ -8165,7 +8164,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, switch ((virDomainDeviceType)dev->type) { case VIR_DOMAIN_DEVICE_DISK: qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL); - ret =3D qemuDomainChangeDiskLive(vm, dev, driver, force); + ret =3D qemuDomainChangeDiskLive(vm, dev, force); break; =20 case VIR_DOMAIN_DEVICE_GRAPHICS: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 41d60277d1..4bcec0e982 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -844,14 +844,13 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, * Returns 0 on success, -1 on error and reports libvirt error */ int -qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuDomainChangeEjectableMedia(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr newsrc, bool force) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); virStorageSourcePtr oldsrc =3D disk->src; bool sharedAdded =3D false; int ret =3D -1; @@ -862,27 +861,27 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr drive= r, if (virDomainDiskTranslateSourcePool(disk) < 0) goto cleanup; =20 - if (qemuAddSharedDisk(driver, disk, vm->def->name) < 0) + if (qemuAddSharedDisk(priv->driver, disk, vm->def->name) < 0) goto cleanup; =20 sharedAdded =3D true; =20 - if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0) + if (qemuDomainDetermineDiskChain(priv->driver, vm, disk, NULL, true) <= 0) goto cleanup; =20 if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto cleanup; =20 - if (qemuHotplugPrepareDiskSourceAccess(driver, vm, newsrc, false) < 0) + if (qemuHotplugPrepareDiskSourceAccess(priv->driver, vm, newsrc, false= ) < 0) goto cleanup; =20 - if (qemuHotplugAttachManagedPR(driver, vm, newsrc, QEMU_ASYNC_JOB_NONE= ) < 0) + if (qemuHotplugAttachManagedPR(priv->driver, vm, newsrc, QEMU_ASYNC_JO= B_NONE) < 0) goto cleanup; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) - rc =3D qemuDomainChangeMediaBlockdev(driver, vm, disk, oldsrc, new= src, force); + rc =3D qemuDomainChangeMediaBlockdev(priv->driver, vm, disk, oldsr= c, newsrc, force); else - rc =3D qemuDomainChangeMediaLegacy(driver, vm, disk, newsrc, force= ); + rc =3D qemuDomainChangeMediaLegacy(priv->driver, vm, disk, newsrc,= force); =20 virDomainAuditDisk(vm, oldsrc, newsrc, "update", rc >=3D 0); =20 @@ -891,8 +890,8 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, =20 /* remove the old source from shared device list */ disk->src =3D oldsrc; - ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)); - ignore_value(qemuHotplugPrepareDiskSourceAccess(driver, vm, oldsrc, tr= ue)); + ignore_value(qemuRemoveSharedDisk(priv->driver, disk, vm->def->name)); + ignore_value(qemuHotplugPrepareDiskSourceAccess(priv->driver, vm, olds= rc, true)); =20 /* media was changed, so we can remove the old media definition now */ virObjectUnref(oldsrc); @@ -905,13 +904,13 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr drive= r, /* undo changes to the new disk */ if (ret < 0) { if (sharedAdded) - ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name)= ); + ignore_value(qemuRemoveSharedDisk(priv->driver, disk, vm->def-= >name)); =20 - ignore_value(qemuHotplugPrepareDiskSourceAccess(driver, vm, newsrc= , true)); + ignore_value(qemuHotplugPrepareDiskSourceAccess(priv->driver, vm, = newsrc, true)); } =20 /* remove PR manager object if unneeded */ - ignore_value(qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NON= E)); + ignore_value(qemuHotplugRemoveManagedPR(priv->driver, vm, QEMU_ASYNC_J= OB_NONE)); =20 /* revert old image do the disk definition */ if (oldsrc) @@ -1315,7 +1314,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr drive= r, if ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM || disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) && (orig_disk =3D virDomainDiskFindByBusAndDst(vm->def, disk->bus, di= sk->dst))) { - if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, + if (qemuDomainChangeEjectableMedia(vm, orig_disk, disk->src, false) < 0) return -1; =20 diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 7ac03b7810..a60df36f74 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -26,8 +26,7 @@ # include "qemu_domain.h" # include "domain_conf.h" =20 -int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuDomainChangeEjectableMedia(virDomainObjPtr vm, virDomainDiskDefPtr disk, virStorageSourcePtr newsrc, bool force); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list