From nobody Mon Feb 9 01:36:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497520264257893.8512548520973; Thu, 15 Jun 2017 02:51:04 -0700 (PDT) Received: from localhost ([::1]:52950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLRQc-0007Q6-6i for importer@patchew.org; Thu, 15 Jun 2017 05:51:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLRPk-0006ry-7Z for qemu-devel@nongnu.org; Thu, 15 Jun 2017 05:50:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLRPf-0003SE-BU for qemu-devel@nongnu.org; Thu, 15 Jun 2017 05:50:08 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:33752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLRPf-0003Rv-4y for qemu-devel@nongnu.org; Thu, 15 Jun 2017 05:50:03 -0400 Received: by mail-wr0-x243.google.com with SMTP id x23so2391438wrb.0 for ; Thu, 15 Jun 2017 02:50:01 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f199sm2768295wmd.33.2017.06.15.02.49.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 02:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=WeGCZxM28qI5KN3kBXRAHh6XvN6nu/HyeJ2uabS/kvw=; b=dubn7HHQllrjQKeBmVyP6aSEDizkwPAYf/V1VrqdeBm/QnuNdIC/a+qNG3/XDwrKvA qNbMA5PZAC0RVjOkdDQrcVoy5d9kc5+drPzDitd+CUFt0D4cNtGKNIVmcxUCXREh6lh+ witr/EKyze428iJDXTm7EMRdb1OcDTOiR9EfJqyAJmvtWar0O62SfRG0yXyOBkhOftVm SfIwxx7HBbhUOrUdsE5yh9xQvPbasGK7YWwMkMZ2jaMeiwXkorH3uII13AyHWe5uIrqB We7KZHQaTs9KV5suf+nKOcr9xXbn0V+5dtkraZabCK50awU6P6LcwoKhBYbCe6ol9igM x5rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=WeGCZxM28qI5KN3kBXRAHh6XvN6nu/HyeJ2uabS/kvw=; b=cV+n4Hz9fqRavAqLzUPUTlv4qbhCUn4+NC1VTCTLdfDJz+wFtI1u8ktCaI20Nzm1M5 AA5R2MDqEo4qbOkulMUvL5Hq8djIuuUbZ6pnAF74OfZgnk//spm8kM4vgCWSiGo/U5rO hv2V+WajvTUDo337tKtJlXe4gnhpxuGtix7+N6TFipPyCg2LWWm93HnJD06+28BGtZ8l bFAghNU/knC3wCNMupPOmfv02p1accTZLvPSQGEO9w/Ycmb+N3bxrmQFvod8zlK+neNj QtxMrg+km7Hf887Lvk/07m50vCwOq4m+Wp8SeYQ9rv2DD+1DtYfuU5cXVjHW67tRdgSm DJcA== X-Gm-Message-State: AKS2vOwm77d+9xg/HoXkAyKr9VWdiVRI3Dlqr2EmXKwF7BP6MMIOMKzh 8MLopXbEstZMgSdeano= X-Received: by 10.28.232.67 with SMTP id f64mr2934900wmh.54.1497520200134; Thu, 15 Jun 2017 02:50:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 11:49:57 +0200 Message-Id: <1497520197-56796-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As the simplest fix to un-confuse patchew, inline the type in struct VMStateDescription. As there are no users of LoadStateHandler anymore in e.g. function declarations, there isn't much advantage in defining it as a type. Signed-off-by: Paolo Bonzini --- include/migration/vmstate.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f3f3c2a..82d41fa 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -29,7 +29,6 @@ =20 #include "migration/qjson.h" =20 -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef struct VMStateInfo VMStateInfo; typedef struct VMStateDescription VMStateDescription; typedef struct VMStateField VMStateField; @@ -176,7 +175,7 @@ struct VMStateDescription { int minimum_version_id; int minimum_version_id_old; MigrationPriority priority; - LoadStateHandler *load_state_old; + int (*load_state_old)(QEMUFile *f, void *opaque, int version_id); int (*pre_load)(void *opaque); int (*post_load)(void *opaque, int version_id); void (*pre_save)(void *opaque); --=20 1.8.3.1