From nobody Sun May 19 00:17:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607095813; cv=none; d=zohomail.com; s=zohoarc; b=QCst3HAxe+jW42x6MW/5JeKGmIEacVu8ctp5JEUkcxiewIzKyhHMOrbq91Pm0o/5rhmvCyBRW8dZIBUDRmUM62s4El54D808PGW5Di3SSSb4IUf1fZwaQfk3RMLPf3dq+BSDdhF24PqGEct5ysDKx0qT3LNMiDPkPp45ZknAOQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607095813; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=B15D6nlCTN191YFV6pXMOWMAYb2ZoXqXLVPS1ux9Y6o=; b=X/uJhaSUUCZMg1RvMgyzvj4cXLeAkdpN8ZOm3ggRB5uhb4nmqdJIR7uwq/VGnvyWrfHkcBm5sNo3O5XMgteknLIhNJNFvpTMOYbdw4UNF0ba8QoFKDobzs7bFUP1Eu+6GXT08cZMFx5CZmGeMU+MuUwbbLSRqpjZRPT3KRz4Qkc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1607095812862896.1030749697018; Fri, 4 Dec 2020 07:30:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-DMVkuVQfPuKXuXBSsCWaeA-1; Fri, 04 Dec 2020 10:30:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C39A1100F349; Fri, 4 Dec 2020 15:30:02 +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 7072B10016F5; Fri, 4 Dec 2020 15:30:01 +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 55E41180954D; Fri, 4 Dec 2020 15:30:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B4FTwpW000876 for ; Fri, 4 Dec 2020 10:29:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8EBA660864; Fri, 4 Dec 2020 15:29:58 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EBAB60861 for ; Fri, 4 Dec 2020 15:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607095811; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=B15D6nlCTN191YFV6pXMOWMAYb2ZoXqXLVPS1ux9Y6o=; b=AhFbqVx2EjBXocS7K0AYDMob/Ef1jQ4f2ayY/419ps0RgKgdWG3JaveedYEUlsNqUFwCPl bVvRgTOcK97aSYrULwXw4Tf9dEIgvErzeMQ1fx1tMIAmevDXyjzqaQXreEPN+h+jZaCA0Z Dw394W5dosztSSXJlkrAx0qgWoW+aVs= X-MC-Unique: DMVkuVQfPuKXuXBSsCWaeA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] qemu: Drop @qemuCaps argument from qemuDomainDefValidateMemoryHotplug() Date: Fri, 4 Dec 2020 16:29:51 +0100 Message-Id: <0fc7b87de8e0a996f4a7a062fd9ccec5ebe44025.1607095791.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" After previous cleanup the @qemuCaps argument in qemuDomainDefValidateMemoryHotplug() is unused and thus doesn't need to be passed. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e705e8d8d5..5b58ccbf0e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8532,7 +8532,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDom= ainMemoryDef *mem, /** * qemuDomainDefValidateMemoryHotplug: * @def: domain definition - * @qemuCaps: qemu capabilities object * @mem: definition of memory device that is to be added to @def with hotp= lug, * NULL in case of regular VM startup * @@ -8544,7 +8543,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDom= ainMemoryDef *mem, */ int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, - virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, const virDomainMemoryDef *mem) { unsigned int nmems =3D def->nmems; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 010bae285d..9e870ff1e2 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -795,7 +795,6 @@ int qemuDomainAdjustMaxMemLockHostdev(virDomainObjPtr v= m, virDomainHostdevDefPtr hostdev); =20 int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, - virQEMUCapsPtr qemuCaps, const virDomainMemoryDef *mem); =20 bool qemuDomainSupportsNewVcpuHotplug(virDomainObjPtr vm); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 29a30c6812..9b93f256e8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2399,7 +2399,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuDomainMemoryDeviceAlignSize(vm->def, mem) < 0) goto cleanup; =20 - if (qemuDomainDefValidateMemoryHotplug(vm->def, priv->qemuCaps, mem) <= 0) + if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0) goto cleanup; =20 if (qemuDomainAssignMemoryDeviceSlot(vm->def, mem) < 0) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8ceea022d7..52d15defed 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1156,7 +1156,7 @@ qemuValidateDomainDef(const virDomainDef *def, if (qemuValidateDomainDefCpu(driver, def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidateMemoryHotplug(def, qemuCaps, NULL) < 0) + if (qemuDomainDefValidateMemoryHotplug(def, NULL) < 0) return -1; =20 if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0) --=20 2.26.2