From nobody Tue Nov 26 04:31:56 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710194751; cv=none; d=zohomail.com; s=zohoarc; b=a6RGexQ/OfRLKvZaKuMpnM4yje+rIFytBuKRMfwMLUx+IE0+UPZsUWUrkmRdt0euCKS+JwRAtk7S3McxwOeXv/d80xfWvJfMeo8nAFd21WdllzAG6bSNtPR8QFHCRy7xkyMCinjbFg/uv9w7sGie3g0rQ0Y/k95dWu8JU2p4jkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710194751; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fy9ven1kWN6KIHr7K9n1SATScv4YMRbuKCUFVtbSpwk=; b=Rjww6qjvXWHTLGQOPkckLJ7sQASskUH8UJ+2nKoT/iW7iGPIEXyF0Zi2g+ebbqjeqKgUeTsZtc99JO1Yiz8OMkB+k9nEF7aArtBrXm0eHLVL5WaarqI2VXqbrYUI4NZHghRp4vnU+OFYX//HQCcHoHpw26qJbFnMDbMBUqe4+do= 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 1710194751020580.3891720430205; Mon, 11 Mar 2024 15:05:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjngO-0000GG-19; Mon, 11 Mar 2024 17:59:44 -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 1rjngM-0000FF-JU for qemu-devel@nongnu.org; Mon, 11 Mar 2024 17:59:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjngL-0003yn-0U for qemu-devel@nongnu.org; Mon, 11 Mar 2024 17:59:42 -0400 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-GXyH86IANMe3JBxfUUEzmA-1; Mon, 11 Mar 2024 17:59:36 -0400 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-690d3f5af86so4505126d6.0 for ; Mon, 11 Mar 2024 14:59:36 -0700 (PDT) Received: from x1n.. (cpe688f2e2cb7c3-cm688f2e2cb7c0.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id d6-20020a0ce446000000b00690cec16254sm1541932qvm.68.2024.03.11.14.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 14:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710194379; 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=fy9ven1kWN6KIHr7K9n1SATScv4YMRbuKCUFVtbSpwk=; b=UDRLLCI7nhQait1osffc1rclHkoSO7MZKtydZ4+APIukodC2t6y4KCjateQr/RvwE96knN E/O6UrFIWQcYK++PXW4Qi+iYJ7VMx+m4u7yuBCER7h9u2xDNQSTBCYDGj/FkNvWGvHtriV NVbVkCdJuvzDSkMRVBOAhi7xoThEkKw= X-MC-Unique: GXyH86IANMe3JBxfUUEzmA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710194376; x=1710799176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fy9ven1kWN6KIHr7K9n1SATScv4YMRbuKCUFVtbSpwk=; b=kDkdi9MsX6Lvyx0yqAkMLU60RldBKVEdzHoRIIKIupmPgh5yiQjccGeIqay+6Ihbv/ O9hQGA0IYGa3Rd6kCzmdco0ivReC7lK+eKfuuGUMWoWZsbDcSrhPhEl1qyzIVYFA0MQZ p13E7cfxVYdGPFLyn/UbcYALvAx4ygnK0jsp1nuE2aePI37ul3D+RE7QWuNwwSoRAi0s nLWCn6BxVksdydZDslHbSuZB4VX8toUfXa3S7/3qGrntH141G2nFtvwEG1wp6p+uu8/Q VGVwh53pk5PKj4WAlbcG5a1SiW2ltWT8jwqFm6iGsJTzj8hBp2ixdDopmOwHznZ2TiMz 5cuw== X-Gm-Message-State: AOJu0YwlJUBGNxDdS1qYYZ71C8HwUT+Ct/HEEsmYTM86uKfmINdOaOuJ 0AIGUEc1QJ/ol7mUqECiltBJ4ctfgJxPR1eabDYuHaamxRkOnkCv2E/tvR/cDfPFaI3Gbk/pmPQ jxF4Ra5xuYENYkro7Acd8/vRZQin6NWVgUg35XQrYZXR7iqUjeZbZyBReNuTgna56Tp8Gnxe9ad 7mRjQoGupj/dnjtEl1GmykzeHbwoiRRfbTlw== X-Received: by 2002:a0c:e141:0:b0:690:a71a:d381 with SMTP id c1-20020a0ce141000000b00690a71ad381mr7862214qvl.6.1710194376148; Mon, 11 Mar 2024 14:59:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJtZGA5BfIepUNIgay/2QytymBVXHAVshBpDfYFXh4F3Q1HqzsO/DJv6DO8nosaVPXVmuDdA== X-Received: by 2002:a0c:e141:0:b0:690:a71a:d381 with SMTP id c1-20020a0ce141000000b00690a71ad381mr7862192qvl.6.1710194375797; Mon, 11 Mar 2024 14:59:35 -0700 (PDT) From: peterx@redhat.com To: qemu-devel@nongnu.org, Peter Maydell Cc: Paolo Bonzini , peterx@redhat.com, Fabiano Rosas , David Hildenbrand , Prasad Pandit , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 06/34] migration: Remove SaveStateHandler and LoadStateHandler typedefs Date: Mon, 11 Mar 2024 17:58:57 -0400 Message-ID: <20240311215925.40618-7-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311215925.40618-1-peterx@redhat.com> References: <20240311215925.40618-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.029, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @redhat.com) X-ZM-MESSAGEID: 1710194751460100002 From: C=C3=A9dric Le Goater They are only used once. Reviewed-by: Fabiano Rosas Reviewed-by: Peter Xu Signed-off-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/r/20240304122844.1888308-8-clg@redhat.com Signed-off-by: Peter Xu --- include/migration/register.h | 4 ++-- include/qemu/typedefs.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/migration/register.h b/include/migration/register.h index 9ab1f79512..2e6a7d766e 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -18,7 +18,7 @@ =20 typedef struct SaveVMHandlers { /* This runs inside the BQL. */ - SaveStateHandler *save_state; + void (*save_state)(QEMUFile *f, void *opaque); =20 /* * save_prepare is called early, even before migration starts, and can= be @@ -71,7 +71,7 @@ typedef struct SaveVMHandlers { /* This calculate the exact remaining data to transfer */ void (*state_pending_exact)(void *opaque, uint64_t *must_precopy, uint64_t *can_postcopy); - LoadStateHandler *load_state; + int (*load_state)(QEMUFile *f, void *opaque, int version_id); int (*load_setup)(QEMUFile *f, void *opaque); int (*load_cleanup)(void *opaque); /* Called when postcopy migration wants to resume from failure */ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index a028dba4d0..50c277cf0b 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -151,8 +151,6 @@ typedef struct IRQState *qemu_irq; /* * Function types */ -typedef void SaveStateHandler(QEMUFile *f, void *opaque); -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef void (*qemu_irq_handler)(void *opaque, int n, int level); =20 #endif /* QEMU_TYPEDEFS_H */ --=20 2.44.0