From nobody Mon Nov 17 22:44:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726661496; cv=none; d=zohomail.com; s=zohoarc; b=BW/ZQRSrbpIJ+zVEoUdB0YbNaoVhcHcPHlffd7XDQIVbgU8lnhUjaDMs+ZrzB3ziMCQBAImYepE1Emd8lOYnLPFTIwkEzECTrq2IPfwW4K2ahvEer3uyaIyTYCgvRMMBqnarHeAq7KjTpV7KNpzmD88i7p3z16OxJdmUo6mcKmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726661496; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L6FvinB64ChqoiH1YRZKtZr2bLXrxFni72IS/qefi3c=; b=Tjt0B8N91y6eYAKGMG7mSd96OKRdzZxL9OJWg49OxlsPgE3Yi58yBUucby3u2h1/AzH3nOHlgehxvz4cNctwTzxnyYgaJiz8G5aZUUBn1jLrS6U0THrh20DtNyDtZfT6PMyGZBHDOhqSAZH3Ng4cHefGd/DflHgyAqn9+Ntgvuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172666149606149.05592615103967; Wed, 18 Sep 2024 05:11:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqtWB-0004Dn-L0; Wed, 18 Sep 2024 08:10:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqtWA-0004DE-Ig for qemu-devel@nongnu.org; Wed, 18 Sep 2024 08:10:46 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqtW5-00069w-2q for qemu-devel@nongnu.org; Wed, 18 Sep 2024 08:10:46 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1sqtW0-006HZH-2X; Wed, 18 Sep 2024 12:10:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=L6FvinB64ChqoiH1YRZKtZr2bLXrxFni72IS/qefi3c=; b=Ow4hbxHqUZVoyuWO epctmHpXrGTyOwRQvKrmyaUxYQQyJ6UIBG2QkFxt2qoFzlB+iqSdpoZD9CbfouYXtmR5NruuE+gip E5m9UbVHf7D8AlfuHarTC106Xpob3GuuGN89k4/NZTgbM0S/i3HA+gcUcNB4es6BAePnUkZyRW+nr /CqMeKwHqhKD13hR/sRTq16PQV7TB7GPi/zdVvB0Top+Jq75IAd8MJKuTn2eeC5qHPFl9mBTh/nnE I6TFjVQY7lid8Xs+CwtEX5nSawyUPFdjqthjpuCgO9KwMg5DcdYs0Ty3Zylqlz8jeGZzJNw1QQ9TW CkH32q4HP7WvYXoJBQ==; From: dave@treblig.org To: mst@redhat.com, sgarzare@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH] vhost: Remove unused vhost_dev_{load|save}_inflight Date: Wed, 18 Sep 2024 13:10:34 +0100 Message-ID: <20240918121034.16417-1-dave@treblig.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @treblig.org) X-ZM-MESSAGEID: 1726661496987116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" vhost_dev_load_inflight and vhost_dev_save_inflight have been unused since they were added in 2019 by: 5ad204bf2a ("vhost-user: Support transferring inflight buffer between qemu = and backend") Remove them, and their helper vhost_dev_resize_inflight. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Igor Mammedov Reviewed-by: Stefano Garzarella Reviewed-by: Thomas Huth --- hw/virtio/vhost.c | 56 --------------------------------------- include/hw/virtio/vhost.h | 2 -- 2 files changed, 58 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 7c5ef81b55..76f9b2aaad 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1930,62 +1930,6 @@ void vhost_dev_free_inflight(struct vhost_inflight *= inflight) } } =20 -static int vhost_dev_resize_inflight(struct vhost_inflight *inflight, - uint64_t new_size) -{ - Error *err =3D NULL; - int fd =3D -1; - void *addr =3D qemu_memfd_alloc("vhost-inflight", new_size, - F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEA= L, - &fd, &err); - - if (err) { - error_report_err(err); - return -ENOMEM; - } - - vhost_dev_free_inflight(inflight); - inflight->offset =3D 0; - inflight->addr =3D addr; - inflight->fd =3D fd; - inflight->size =3D new_size; - - return 0; -} - -void vhost_dev_save_inflight(struct vhost_inflight *inflight, QEMUFile *f) -{ - if (inflight->addr) { - qemu_put_be64(f, inflight->size); - qemu_put_be16(f, inflight->queue_size); - qemu_put_buffer(f, inflight->addr, inflight->size); - } else { - qemu_put_be64(f, 0); - } -} - -int vhost_dev_load_inflight(struct vhost_inflight *inflight, QEMUFile *f) -{ - uint64_t size; - - size =3D qemu_get_be64(f); - if (!size) { - return 0; - } - - if (inflight->size !=3D size) { - int ret =3D vhost_dev_resize_inflight(inflight, size); - if (ret < 0) { - return ret; - } - } - inflight->queue_size =3D qemu_get_be16(f); - - qemu_get_buffer(f, inflight->addr, size); - - return 0; -} - int vhost_dev_prepare_inflight(struct vhost_dev *hdev, VirtIODevice *vdev) { int r; diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index c75be46c06..461c168c37 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -338,8 +338,6 @@ void vhost_virtqueue_stop(struct vhost_dev *dev, struct= VirtIODevice *vdev, =20 void vhost_dev_reset_inflight(struct vhost_inflight *inflight); void vhost_dev_free_inflight(struct vhost_inflight *inflight); -void vhost_dev_save_inflight(struct vhost_inflight *inflight, QEMUFile *f); -int vhost_dev_load_inflight(struct vhost_inflight *inflight, QEMUFile *f); int vhost_dev_prepare_inflight(struct vhost_dev *hdev, VirtIODevice *vdev); int vhost_dev_set_inflight(struct vhost_dev *dev, struct vhost_inflight *inflight); --=20 2.46.0