From nobody Sun May 19 15:29:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@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 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636206126; cv=none; d=zohomail.com; s=zohoarc; b=CRyXhj+c7t1ErfOtnZPDxzumI3Hj6VpjrmVQi3Aw9CQM67g3gnfJPGdmA4OIs8GyLC3Vi/yWiWoDGfh9Cxk3hLU1/+7vsNJ82d0QnoOFBgao3M8kRKIe30hEkUHzgvYDw4Sv+n+PYU9nj1FqyfUegh0PNDTcnkt6EqSsRcGDiIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636206126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=hpWCid9UewSIDZKy89GAH4fSn0++vdwnA69NZMo4eVM=; b=XijbdaycRPNZJp2niaV95VbYmhYEOfgAVrHjO3QM/u9WVuf6dXFsm57QG5yg9BwRkm5344JeBnupH0x/FLXzZ4wKihouXbwv2JE5aPezi6PMahAhddcsBEdvHSKKI/VVWWwjVA94ab9GtaIzmQYnxfF8W2DDylGYEcfYVuXiQH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 163620612678068.45313874435601; Sat, 6 Nov 2021 06:42:06 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-wfktuVUFNYKIucjiKEpEHw-1; Sat, 06 Nov 2021 09:42:03 -0400 Received: by mail-wm1-f70.google.com with SMTP id o18-20020a05600c511200b00332fa17a02eso4155162wms.5 for ; Sat, 06 Nov 2021 06:42:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id y7sm10501445wrw.55.2021.11.06.06.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 06:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636206125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hpWCid9UewSIDZKy89GAH4fSn0++vdwnA69NZMo4eVM=; b=GRj5Dju1ARLGEIKdvzcTlOaXecQwq6jdaFFcTP9QhJzSQ9lPFhDYoYIrniL7UAFvAKdfdC Gsd+z/piY65QmZZe9IxIHmeqaNuVPXYNMLwR2zxj0Z/3rIripYbRkDPmmJZKbvTRhvEcKw T7k0nmwUvZlXaaGI/vtATaDy942pfKI= X-MC-Unique: wfktuVUFNYKIucjiKEpEHw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hpWCid9UewSIDZKy89GAH4fSn0++vdwnA69NZMo4eVM=; b=DzRD5+lZ2ZQbVf3s8BHelHWOWWmC04tGo/1hCkRf8TkVOK5sGyexvACz8IoyXrlMgp GJR1OH+UmkthvKIP3cvDM9t5vpclZrgFVWClCw7DPEBfDN4XfrxfbUVh4YozjkUtogiZ kQMEV+e7N0fWhDNvkLLbclE1xCrNgeBIe6tPyknGqeUWj3btYIaxbNWuLOiBwBEEx2hZ hqwddGmx6s3tpWuw2Siy98J9FVrHkSLZN8pGU0PebatGm8T0yqjvvSHupkkFqc+64nV6 nYcXsIJF3up8JEXWY3m46+UH1ESNxyE/wlFI1+fU5uPAZEQMqq2XDl2XFZwXr3MKFNUy NFKQ== X-Gm-Message-State: AOAM5302+tM3oF1GEBLS4AMZfi0Q1E0BKnMu8n3YRnwRFLKhBYsh15U1 i4m+Iy4r+6uqndrozwqejLM8sQeJvws7xlWMdltfR+YZYuyPeIVkD0mojw8iVOHHriDIVMvdPn+ 4uy+brNgrvJ/N0Q== X-Received: by 2002:adf:e84d:: with SMTP id d13mr63791240wrn.72.1636206122328; Sat, 06 Nov 2021 06:42:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtgZ05o2NU4IXT31/WvAFgNpzJL3hkeuTy9EPekPYKqpE4PwH/QSUXeNl4HOZXSQTlP9G8Ww== X-Received: by 2002:adf:e84d:: with SMTP id d13mr63791213wrn.72.1636206122173; Sat, 06 Nov 2021 06:42:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jon Doron , qemu-trivial@nongnu.org, Roman Kagan , Vladimir Sementsov-Ogievskiy , Paolo Bonzini , "Maciej S . Szmigiero" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/1] hw/hyperv/vmbus: Remove unused vmbus_load/save_req() Date: Sat, 6 Nov 2021 14:41:55 +0100 Message-Id: <20211106134155.582312-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211106134155.582312-1-philmd@redhat.com> References: <20211106134155.582312-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636206128459100001 vmbus_save_req() and vmbus_load_req() are not used. Remove them to avoid maintaining dead code. This partially reverts commit 4dd8a7064b8a6527f99a62be11 ("vmbus: add infrastructure to save/load vmbus requests"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Maciej S. Szmigiero --- include/hw/hyperv/vmbus.h | 3 -- hw/hyperv/vmbus.c | 59 --------------------------------------- 2 files changed, 62 deletions(-) diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h index f98bea3888d..8ea660dd8e6 100644 --- a/include/hw/hyperv/vmbus.h +++ b/include/hw/hyperv/vmbus.h @@ -223,7 +223,4 @@ int vmbus_map_sgl(VMBusChanReq *req, DMADirection dir, = struct iovec *iov, void vmbus_unmap_sgl(VMBusChanReq *req, DMADirection dir, struct iovec *io= v, unsigned iov_cnt, size_t accessed); =20 -void vmbus_save_req(QEMUFile *f, VMBusChanReq *req); -void *vmbus_load_req(QEMUFile *f, VMBusDevice *dev, uint32_t size); - #endif diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index dbce3b35fba..78c19caf5f7 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -1311,65 +1311,6 @@ static const VMStateDescription vmstate_vmbus_chan_r= eq =3D { } }; =20 -void vmbus_save_req(QEMUFile *f, VMBusChanReq *req) -{ - VMBusChanReqSave req_save; - - req_save.chan_idx =3D req->chan->subchan_idx; - req_save.pkt_type =3D req->pkt_type; - req_save.msglen =3D req->msglen; - req_save.msg =3D req->msg; - req_save.transaction_id =3D req->transaction_id; - req_save.need_comp =3D req->need_comp; - req_save.num =3D req->sgl.nsg; - req_save.sgl =3D g_memdup(req->sgl.sg, - req_save.num * sizeof(ScatterGatherEntry)); - - vmstate_save_state(f, &vmstate_vmbus_chan_req, &req_save, NULL); - - g_free(req_save.sgl); -} - -void *vmbus_load_req(QEMUFile *f, VMBusDevice *dev, uint32_t size) -{ - VMBusChanReqSave req_save; - VMBusChanReq *req =3D NULL; - VMBusChannel *chan =3D NULL; - uint32_t i; - - vmstate_load_state(f, &vmstate_vmbus_chan_req, &req_save, 0); - - if (req_save.chan_idx >=3D dev->num_channels) { - error_report("%s: %u(chan_idx) > %u(num_channels)", __func__, - req_save.chan_idx, dev->num_channels); - goto out; - } - chan =3D &dev->channels[req_save.chan_idx]; - - if (vmbus_channel_reserve(chan, 0, req_save.msglen)) { - goto out; - } - - req =3D vmbus_alloc_req(chan, size, req_save.pkt_type, req_save.msglen, - req_save.transaction_id, req_save.need_comp); - if (req_save.msglen) { - memcpy(req->msg, req_save.msg, req_save.msglen); - } - - for (i =3D 0; i < req_save.num; i++) { - qemu_sglist_add(&req->sgl, req_save.sgl[i].base, req_save.sgl[i].l= en); - } - -out: - if (req_save.msglen) { - g_free(req_save.msg); - } - if (req_save.num) { - g_free(req_save.sgl); - } - return req; -} - static void channel_event_cb(EventNotifier *e) { VMBusChannel *chan =3D container_of(e, VMBusChannel, notifier); --=20 2.31.1