From patchwork Tue Jun 13 18:30:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 775401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wnJKx1tBSz9ryv for ; Wed, 14 Jun 2017 04:33:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IuWYYo/M"; dkim-atps=neutral Received: from localhost ([::1]:44685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKqck-000208-V6 for incoming@patchwork.ozlabs.org; Tue, 13 Jun 2017 14:33:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKqaW-0000m7-Hr for qemu-devel@nongnu.org; Tue, 13 Jun 2017 14:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKqaU-0006Q4-Ko for qemu-devel@nongnu.org; Tue, 13 Jun 2017 14:30:48 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKqaU-0006Pp-G6 for qemu-devel@nongnu.org; Tue, 13 Jun 2017 14:30:46 -0400 Received: by mail-qt0-x243.google.com with SMTP id w1so36635883qtg.0 for ; Tue, 13 Jun 2017 11:30:46 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=LpZtdPKSRIpfzJYbzY2pueXezvveCm8czg0djY+8bVw=; b=IuWYYo/MHs2xGklZHqjd+l2j6GkVvEiKylao+UhR9Vc3oMVidYjcBMEkm+U7HPh8A1 PPhFgbfPBtGGZhNideQ633WTEvKkO52vGTuZaidgDm58maetoiaDjuYxDSOzOpmOj+1z Ee85z2ZNz8V4Vf0+iMiI5kd3SiP6eisdk6HBpxqpV+xg1rfI1OWNAdAnWnno+67rLO2M EPSiKGtBNCWq+rCVd0GFyTCLtrE5jU7L5WAY7sK9tWxDzu20OIxdACFq0IVwSfeNlovd kMD+xCQtZYZTbWWpAVeKRK1dvPOt/wARplvK3IpCuFtDneiF2+Prq3Sdg8JilM21ovlU g+7A== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=LpZtdPKSRIpfzJYbzY2pueXezvveCm8czg0djY+8bVw=; b=iQgbLHB1/gNWGQjHTU0o+1aY32Sw1gLVYamh70qieCEpvcOSl3SSvCGCO+fb/VYioM ROIM1WEZRsbO57n3cNjPx8JdaYt/a1j0rYuHAPTJFCNh9OAzPYYznX+3BQqDKzMD49Oy bbnmjXGK1WIKLT/XioHipfK410eXWetuYcMNDrwkgfF3ci7Tqz1pcxQX0VyvURZztfLs Uz3Y8vOzX8rLc5uIyTpwdphDT93lV329IOdIHu/eyreAD5A2620djThbebCFiAaF5P7b sL+y+thUP+b0IiIfyuQcdWe9O4XCNv4QLdq25mpDnpsGzo6e1W5z6JLsxj8Jmcv6RoUq ACGQ== X-Gm-Message-State: AKS2vOwahiOE4Xi09/XyKwptz7gC9R8DAwaBEQ9P3cFyo3s2D3CD3HVT ygCywMCtu6ATMaZ4YkI= X-Received: by 10.55.3.139 with SMTP id 133mr1656819qkd.65.1497378645789; Tue, 13 Jun 2017 11:30:45 -0700 (PDT) Received: from localhost.localdomain ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id r74sm2231067qka.40.2017.06.13.11.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 11:30:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Date: Tue, 13 Jun 2017 15:30:25 -0300 Message-Id: <20170613183025.5145-3-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170613183025.5145-1-f4bug@amsat.org> References: <20170613183025.5145-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 2/2] migration: remove duplicate typedef 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: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" $ make docker-run-test-quick@centos6 In file included from hw/net/vmxnet3.c:30: include/migration/register.h:18: error: redefinition of typedef ‘LoadStateHandler’ include/migration/vmstate.h:32: note: previous declaration of ‘LoadStateHandler’ was here make: *** [hw/net/vmxnet3.o] Error 1 tests/docker/Makefile.include:118: recipe for target 'docker-run' failed Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Fam Zheng --- include/migration/vmstate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f3f3c2af4d..342027def8 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -28,8 +28,8 @@ #define QEMU_VMSTATE_H #include "migration/qjson.h" +#include "migration/register.h" -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef struct VMStateInfo VMStateInfo; typedef struct VMStateDescription VMStateDescription; typedef struct VMStateField VMStateField;