From nobody Fri Nov 18 18:26:47 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NDQGv6Zwnz4d7vC; Fri, 18 Nov 2022 18:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NDQGv44DDz4JMp; Fri, 18 Nov 2022 18:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668796007; h=from:from: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; bh=gjXju7V90//X5g2oMVUI8yZ9lY675W1Ey0f7aAnpyIY=; b=egVPDfWNeBsIgyJLS+Z5k6YJA4vzZbhl36mXRI8Jxbh+1mjkTHi94gINm3XhZSjK/U27kf L5+1NHlCYUbyjwF2Y713/li37f5UrigKvMOIwGNxbDDGBEroJMDPhwkmpJ552K83KgZKHC 6VyjS6jy836Eab5W80aN5PPsWcBgB2MjD3diJ5b8/KD6xznAEUWERRreyrmlLM5Nra9Vd6 jk7ciCpbBAZBbL2SyNoJwExfk6atMkL8Qz3oOBEVNkcy9+xx80n9kyp38IBWbr/kSg9Sb5 nD+GSzSU8zHZSKA29pUlXRedDFEnZJiInrSVLfLZXr7tPmcWdxmxtPI38i07Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668796007; h=from:from: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; bh=gjXju7V90//X5g2oMVUI8yZ9lY675W1Ey0f7aAnpyIY=; b=Dw5oSyGXDbRprElryYPdxjFMV3/1plK/vD3KP03DkRGkDHrGvrdS0o4oOT4FhTT3itDmjL zxakk4p3zz82FGf47uiwj2jUPQPhRTGGVQOW/Z3zBe7d7i75TedT2RpDkZuLABlhbS8n5L nI83Cb3P1IqNxs7Nh/8Hyap8UCO0ReuTxjaEdyWiwpIgEkslYBlmcZmAqPAyw9KYCLGQSu uWPXpgx4AzJoneWWJa/zaZ9plVDBqjkXP/pWpX5/+79GxswJetN4HGJKzWiyw6mxHImyyk /E3jc7rkb2RDXsvSixlqMnwtrYjxVOLX+pNftH58LnexlEJJTVuGnyyBctvd3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668796007; a=rsa-sha256; cv=none; b=ovr5y4W9mPBbuKWcUnncK6NfeNMIn2gH//bdW4RNCNLTnv3XmsI4Ds491Fz7+kAIRB3Eom mYtSpGN7W3rPsBEO/1eCFVBRRA9UhyibadvDFITOTr4WNuGNLF3FVhpTGdsC76VbVdGt39 CNWG1KBT7ZIHcbzho5RoOB7J12Xm/GbQ7HWKw1EJuE9w9wDZRKqHZ8UnVQpFu1LBtLYjXT IWVYXnmua9wVDhGaVevBwB7c05uwcsNB3Zb06cbSFnx2VwO3Wd91uAvpdUF7UUs5lIrCKn 4+VjIwvfCZ/9FiGQvVNhtwgezbq2ND2B99xZV1KpJuwn6cOaUTMxfixqRvUtLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NDQGv0qpdzG72; Fri, 18 Nov 2022 18:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIIQl4c030532; Fri, 18 Nov 2022 18:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIQlLo030531; Fri, 18 Nov 2022 18:26:47 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:26:47 GMT Message-Id: <202211181826.2AIIQlLo030531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0cbc39d53d22 - main - vmm ppt: Remove unused vcpu arg from MSI setup handlers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cbc39d53d2270fa77255c663a0cfa5ed502ab0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0cbc39d53d2270fa77255c663a0cfa5ed502ab0a commit 0cbc39d53d2270fa77255c663a0cfa5ed502ab0a Author: John Baldwin AuthorDate: 2022-11-18 18:03:46 +0000 Commit: John Baldwin CommitDate: 2022-11-18 18:25:37 +0000 vmm ppt: Remove unused vcpu arg from MSI setup handlers. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37167 --- sys/amd64/vmm/io/ppt.c | 4 ++-- sys/amd64/vmm/io/ppt.h | 4 ++-- sys/amd64/vmm/vmm_dev.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 6621c0ba2996..edb65a3ac07b 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -544,7 +544,7 @@ pptintr(void *arg) } int -ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, +ppt_setup_msi(struct vm *vm, int bus, int slot, int func, uint64_t addr, uint64_t msg, int numvec) { int i, rid, flags; @@ -637,7 +637,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, } int -ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func, +ppt_setup_msix(struct vm *vm, int bus, int slot, int func, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control) { struct pptdev *ppt; diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h index e6339f57b8ad..e7833c2a73bb 100644 --- a/sys/amd64/vmm/io/ppt.h +++ b/sys/amd64/vmm/io/ppt.h @@ -36,9 +36,9 @@ int ppt_map_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); int ppt_unmap_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len); -int ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, +int ppt_setup_msi(struct vm *vm, int bus, int slot, int func, uint64_t addr, uint64_t msg, int numvec); -int ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func, +int ppt_setup_msix(struct vm *vm, int bus, int slot, int func, int idx, uint64_t addr, uint64_t msg, uint32_t vector_control); int ppt_disable_msix(struct vm *vm, int bus, int slot, int func); int ppt_assigned_devices(struct vm *vm); diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 2f487dbb132e..1d36e190c7a6 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -540,14 +540,14 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, } case VM_PPTDEV_MSI: pptmsi = (struct vm_pptdev_msi *)data; - error = ppt_setup_msi(sc->vm, pptmsi->vcpu, + error = ppt_setup_msi(sc->vm, pptmsi->bus, pptmsi->slot, pptmsi->func, pptmsi->addr, pptmsi->msg, pptmsi->numvec); break; case VM_PPTDEV_MSIX: pptmsix = (struct vm_pptdev_msix *)data; - error = ppt_setup_msix(sc->vm, pptmsix->vcpu, + error = ppt_setup_msix(sc->vm, pptmsix->bus, pptmsix->slot, pptmsix->func, pptmsix->idx, pptmsix->addr, pptmsix->msg,