From nobody Mon May 6 12:27:36 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 1532730737767846.8741743067718; Fri, 27 Jul 2018 15:32:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B31E37E60; Fri, 27 Jul 2018 22:32:14 +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 F2E0FC64BB; Fri, 27 Jul 2018 22:32:12 +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 4CE9F18037ED; Fri, 27 Jul 2018 22:32:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6RMW7m5031125 for ; Fri, 27 Jul 2018 18:32:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85A65308BDA9; Fri, 27 Jul 2018 22:32:07 +0000 (UTC) Received: from mx1.redhat.com (ext-mx20.extmail.prod.ext.phx2.redhat.com [10.5.110.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7DD11308BDA4 for ; Fri, 27 Jul 2018 22:32:05 +0000 (UTC) Received: from mail-it0-f54.google.com (mail-it0-f54.google.com [209.85.214.54]) (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 80408308624A for ; Fri, 27 Jul 2018 22:32:04 +0000 (UTC) Received: by mail-it0-f54.google.com with SMTP id v71-v6so9457274itb.3 for ; Fri, 27 Jul 2018 15:32:04 -0700 (PDT) Received: from localhost.net ([192.69.183.49]) by smtp.gmail.com with ESMTPSA id j199-v6sm1959876itb.43.2018.07.27.15.32.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Jul 2018 15:32:03 -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; bh=rdencdiwYfIi5V1LGaBce6pw/I5RM6zXs4mhevV6xmQ=; b=M9H7ncRmIjvbDgq9nNJroKh9wfpy+66gDFD/WXxRKF23NPNpoaZq6aRXgGfFYDfT/W +6KVjbNRjM1J3BaN82Vnb8b1Nl/gfMi8ZRSbgvVZPaab0hxeWSlt9CmHVQ4c7f198wXt O4bifqqTYGkZRzWdm/7s4FageCd21ExxoIqmJmNexo9TS01UujYdPq91oSzQv9Nhb8y0 J6bW+HsQx/BX6LOfNSeaClV4TqWGT6jT1ReCFPKyPbEKHmYyfgFi8Rv9PleB1MV41kOm gre0JEpUXtYQr3hGYHNsXgufGPrYhEWalXL0g25sXwkWNnAtfBARvVSMLVQc7erZQmwc 8xjg== 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; bh=rdencdiwYfIi5V1LGaBce6pw/I5RM6zXs4mhevV6xmQ=; b=ij7VjM26skDqqdLYmu0+apdC/d0WtQY3V/2os51KaP/Qg7tWfrL1lL4A7YTD4xCBIa hgX7QcfNuaBdlEKs1j9FpNz+7rpKzZZ8BVjdKBDj/shjOomCt6ZbNIzIUmh84gThUl3S 2d5iGbhV6Z0WHyvw25EJr3NTT/TpppF9zlkGDowQudJwjrOhG7m7JHu10khxQx850RQw vu4deSwAZeQexEJMwjg4TaytobmzVpT/E2wN8SDZ8WrAQK3AWn3hAJ8kLzANEHwJ+eUW Dfe96cMCAbX9tNjkZ7ql0f/ERA/gwKTLnPyF9cHQCw+Uw+T8Jx/eJeHy64Ak6GAYOnNV FA0A== X-Gm-Message-State: AOUpUlHX2gOTajLufjF/0BNpC+T1ED8KMhcCwZrzuJPvziX+nAXi7tf7 syaq9S4vY8Ieqh87EWbx1WWRp4IC X-Google-Smtp-Source: AAOMgpetTaWym7TH0eqTp00vcJ/vilkwmQfskb08+sL6pl1urC09ZbbSjpizrR6uW09hWbW1Qi4rZw== X-Received: by 2002:a24:44d7:: with SMTP id o206-v6mr7787565ita.66.1532730723646; Fri, 27 Jul 2018 15:32:03 -0700 (PDT) From: Steven Albertson To: libvir-list@redhat.com Date: Fri, 27 Jul 2018 07:26:58 -0400 Message-Id: <20180727112658.39788-1-sralbert42@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 27 Jul 2018 22:32:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 27 Jul 2018 22:32:04 +0000 (UTC) for IP:'209.85.214.54' DOMAIN:'mail-it0-f54.google.com' HELO:'mail-it0-f54.google.com' FROM:'sralbert42@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.223 * (DATE_IN_PAST_06_12, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.214.54 mail-it0-f54.google.com 209.85.214.54 mail-it0-f54.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.49 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-loop: libvir-list@redhat.com Cc: Steven Albertson Subject: [libvirt] [PATCH] Remove unnecessary 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 27 Jul 2018 22:32:15 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by Steven Albertson --- src/qemu/qemu_block.c | 15 +++++++-------- src/qemu/qemu_block.h | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 66e6301210..8081bced9d 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -339,8 +339,7 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, =20 =20 int -qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockNodeNamesDetect(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -354,13 +353,13 @@ qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)) return 0; =20 - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) return -1; =20 data =3D qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm)); blockstats =3D qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm), fa= lse); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !data || !blockstats) + if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || !data || !blocks= tats) goto cleanup; =20 if (!(disktable =3D qemuBlockNodeNameGetBackingChain(data, blockstats)= )) @@ -1689,14 +1688,14 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr= mon, * monitor internally. */ int -qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockStorageSourceDetachOneBlockdev(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virStorageSourcePtr src) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; int ret; =20 - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) return -1; =20 ret =3D qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodeform= at); @@ -1704,7 +1703,7 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriver= Ptr driver, if (ret =3D=3D 0) ret =3D qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->node= storage); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) return -1; =20 return ret; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index fd8984e60b..725ce936d5 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -47,8 +47,7 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namednod= esdata, virJSONValuePtr blockstats); =20 int -qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockNodeNamesDetect(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); =20 virHashTablePtr @@ -112,8 +111,7 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, qemuBlockStorageSourceAttachDataPtr d= ata); =20 int -qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockStorageSourceDetachOneBlockdev(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virStorageSourcePtr src); =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list