From patchwork Fri Oct 19 05:20:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10648669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7211112B for ; Fri, 19 Oct 2018 05:22:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B761B28928 for ; Fri, 19 Oct 2018 05:22:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB99B28B3C; Fri, 19 Oct 2018 05:22:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 558E628928 for ; Fri, 19 Oct 2018 05:22:12 +0000 (UTC) Received: from localhost ([::1]:47052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDNEh-0004vo-Fz for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Oct 2018 01:22:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDNDE-0003lZ-TK for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDNDD-0000Fw-PE for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:40 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:37032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDNDD-0008WP-DD for qemu-devel@nongnu.org; Fri, 19 Oct 2018 01:20:39 -0400 Received: by mail-pl1-x643.google.com with SMTP id bh10-v6so1967509plb.4 for ; Thu, 18 Oct 2018 22:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xz2dLbRaxiMdxNLdrHB1BhxE8uIIvIpCIjvgHz6/NhQ=; b=kOJPHazNfwA96GNUYP7hqWsoPsk4cvlUkuisZ+qZVxe4TXHYWXTQCjhS7TGRWDL7RF kIOf8wjX+tY/MzvdqKc3retGRqQfVAiMqJstqdXz/A6TLPQQbQIu3ixfcGUxLssAsa4M IKlnXzXWldzRcs3MzBDb/qexDk+KkqPrZ1bpAP6ySwp1SQdGPMCfjG9opOEUKX0cOdpk y+iMUalPa8q0RWsgo37oS1kPuBYNSTxf+hQF7vf1S7RIaqB8anaS07/jhBwEmbMlUKrA VW2QxiumgaC7sXzuAf2/iMcg9iwOz9Cku4GQBJEJeMXjkOynxAkz3/bXgGbp4VnN30iD K/cw== 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; bh=Xz2dLbRaxiMdxNLdrHB1BhxE8uIIvIpCIjvgHz6/NhQ=; b=nQIoX1rR26Magyo2/E/Cq+KQ8CbzIxol9IgryaNXN6DshrzIhSdPUUXr696XKXiioM FhqWySuf5Gexz6C2SDsnbSqrTw0usGnrJSKFA7sYA9uqpsF0afD+WLFICZYD+VjuZuje sex+R7DmunL7vIOhq1A/2W13TOlvORdvCMFUWRSgrZc9lubfl1/BS9hLbokyEpoMWsS9 q3Xy1gox2diuH0OxIVkdT/Q9ptiF2VNdb/oH9v+FnjLcWCEK1/3TWdC12yNWv3RZtxdR MGTBhpSPuNh6HDiJjUmHSW88BBnq5ZIyKqJuXx3OhTcNfn8St9jOL2SmT7yMVcJZ4p05 zhBQ== X-Gm-Message-State: ABuFfohK7TCXG7fLc0W6Rq3V1YvdiNgkCPps/S2UXq4MIr5r8v3J2UKa NohYgzvhmoZOHBa+nJdKBLhlRywi X-Google-Smtp-Source: ACcGV61UQvTjQPy17j/tGhDsUD4fGN3rh/K02jJePW4A4NBYdUq7uWblIoYXGgCZDGbKiBn+BQtl1A== X-Received: by 2002:a17:902:59d2:: with SMTP id d18-v6mr697542plj.116.1539926432379; Thu, 18 Oct 2018 22:20:32 -0700 (PDT) Received: from localhost.localdomain.localdomain ([103.65.40.100]) by smtp.gmail.com with ESMTPSA id p1-v6sm25075191pff.128.2018.10.18.22.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 22:20:31 -0700 (PDT) From: Li Qiang To: alex.williamson@redhat.com Date: Thu, 18 Oct 2018 22:20:08 -0700 Message-Id: <1539926412-21831-4-git-send-email-liq3ea@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539926412-21831-1-git-send-email-liq3ea@gmail.com> References: <1539926412-21831-1-git-send-email-liq3ea@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 Subject: [Qemu-devel] [PATCH 3/7] vfio: drop TYPE_FOO MACRO in VMStateDescription 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: Li Qiang , philmd@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP As the vmstate structure names aren't related with the QOM type names. Per Peter's mail: -->https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02175.html Signed-off-by: Li Qiang --- hw/vfio/amd-xgbe.c | 2 +- hw/vfio/ap.c | 2 +- hw/vfio/calxeda-xgmac.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/platform.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c index ee64a3b..1b06c0f 100644 --- a/hw/vfio/amd-xgbe.c +++ b/hw/vfio/amd-xgbe.c @@ -26,7 +26,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp) } static const VMStateDescription vfio_platform_amd_xgbe_vmstate = { - .name = TYPE_VFIO_AMD_XGBE, + .name = "vfio-amd-xgbe", .unmigratable = 1, }; diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index b332395..35b01b3 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -147,7 +147,7 @@ static void vfio_ap_reset(DeviceState *dev) } static const VMStateDescription vfio_ap_vmstate = { - .name = TYPE_VFIO_AP_DEVICE, + .name = "vfio-ap", .unmigratable = 1, }; diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c index e7767c4..6cc608b 100644 --- a/hw/vfio/calxeda-xgmac.c +++ b/hw/vfio/calxeda-xgmac.c @@ -26,7 +26,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) } static const VMStateDescription vfio_platform_calxeda_xgmac_vmstate = { - .name = TYPE_VFIO_CALXEDA_XGMAC, + .name = "vfio-calxeda-xgmac", .unmigratable = 1, }; diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 9246729..4786d46 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -466,7 +466,7 @@ static Property vfio_ccw_properties[] = { }; static const VMStateDescription vfio_ccw_vmstate = { - .name = TYPE_VFIO_CCW, + .name = "vfio-ccw", .unmigratable = 1, }; diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 64c1af6..ba03dcd 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -697,7 +697,7 @@ out: } static const VMStateDescription vfio_platform_vmstate = { - .name = TYPE_VFIO_PLATFORM, + .name = "vfio-platform", .unmigratable = 1, };