From nobody Mon Feb 9 09:09:16 2026 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=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 216.205.24.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=1630667235; cv=none; d=zohomail.com; s=zohoarc; b=ZkuZNzHJlLViiu+SPpfcBzIZYLcAvXZfDpLUFlypZG8GI3EIiauaQ+BWBA2OqggIkBg+t7pHjsTXnmIAOhWZ0qd8sX08YUQlK2k36ZjKoQuGCCwezZlaLcbavyMqmybhjr0ZIoP0rTpCyClo86sExxzOqkRnSSZgZHl+5qNSEfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630667235; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=K59TWFNfhgS3efbWdzQjx6xmDgV9ebFReZvuleU1Sck=; b=HWkeeUDCyb6wyNjy/DqCD2/k2eT5omWQ5GDQBSgs5Ug9JfXFsGK9dPvmEzVsuOobEEAf2oSO9qukBWO+n5rhDa6pmtdAK1B4jHlFpcgouQezsPvSc4ZgYrGVtwuxrAzjaiw02CgT62jN3cO9B9y2DR+XnsIw/JNehIE2v3LWLvc= 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=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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1630667235734725.9631957753126; Fri, 3 Sep 2021 04:07:15 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-601-sXNFsGCUMgmm1F-gEAKw3g-1; Fri, 03 Sep 2021 07:07:13 -0400 Received: by mail-wm1-f69.google.com with SMTP id w25-20020a1cf6190000b0290252505ddd56so1770461wmc.3 for ; Fri, 03 Sep 2021 04:07:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id j207sm4380948wmj.40.2021.09.03.04.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667234; 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=K59TWFNfhgS3efbWdzQjx6xmDgV9ebFReZvuleU1Sck=; b=VI1FlFkQ40Pp4Hhjgab4vXQWuxpOBXuoLGuzYlLwXcnCEL0c2btDLpBmhaKkxlilSQFL6I dc7Si49tFDYV8GsH8GBrMMYWCvRSEe9L0il+kjZb/UId7z5Fn0yWp8jbC9rXHtjWtUNmUo LxxhUgChahHe1a8nWcsE8Epgq0Eqswg= X-MC-Unique: sXNFsGCUMgmm1F-gEAKw3g-1 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=K59TWFNfhgS3efbWdzQjx6xmDgV9ebFReZvuleU1Sck=; b=U7PtaVsZgkKbrBMKrO89lnqQUJWl/OwyOY6VgEFuneYpleRB6tFAwMJj3q3EvEnTsZ K6Bco3SZjSf9rbvi9no9Uj0YOXengQvHxvtfKJphkWfPYDSxJw9Ob/7EeIZYbPFBCoHw mkKhmb7Gt964rtHTJESnIOMVLI11H4IqXtePlPfQCA74QeeaaB+AiM2YpJgyOF/q43AL nsUXd0SyYYG/R1n2Kg/722HD0Uq7MYtpeTiCB9g8cSj3/THITf8VUrXEiQsebAGflw3g 8Ysw25hWkEtrs2Y1Oyerri2V+8467shUyz0ASa9MVdnvj4b1SluoVSWddZTW71q5x5ij MdGQ== X-Gm-Message-State: AOAM530kAVKKeRsZODQ//ra0QJbv/+nP///evVoFkpT6057GKxxQMZhJ eHbGaWV2fWTyPkBeHdh2T5o7nauVWB5jfgqg8IDljp4g6gWuxyEX3UOaBZoHfHKBFLCMEF/5BjB fZgJlpyytWwN6Dw== X-Received: by 2002:adf:d0c3:: with SMTP id z3mr3510227wrh.108.1630667232048; Fri, 03 Sep 2021 04:07:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuQzt1zQyOoV195AnoVvGJcFGlsPxFtDdDER46/qDKajNyUtQpmHaCMGAGB07QiI3cNCdLCA== X-Received: by 2002:adf:d0c3:: with SMTP id z3mr3510188wrh.108.1630667231886; Fri, 03 Sep 2021 04:07:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Igor Mammedov , Laurent Vivier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Roth , Zhang Chen , Shannon Zhao , Richard Henderson , Alex Williamson , Eduardo Habkost , Markus Armbruster , Eric Blake , Stefan Weil , John Snow , Mahmoud Mandour , Li Zhijian , Marcel Apfelbaum , qemu-block@nongnu.org, Helge Deller , "Michael S. Tsirkin" , David Gibson , Peter Xu , "Gonglei (Arei)" , Gerd Hoffmann , Fam Zheng , Jason Wang , Vladimir Sementsov-Ogievskiy , Christian Schoenebeck , Kevin Wolf , Yuval Shaia , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Thomas Huth , Laurent Vivier , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, David Hildenbrand Subject: [PATCH 01/28] hw/hyperv/vmbus: Remove unused vmbus_load/save_req() Date: Fri, 3 Sep 2021 13:06:35 +0200 Message-Id: <20210903110702.588291-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903110702.588291-1-philmd@redhat.com> References: <20210903110702.588291-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: 1630667237325100001 vmbus_save_req() and vmbus_load_req() are not used. Remove them to avoid maintaining dead code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 c9887d5a7bc..18d3c3b9240 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