From patchwork Sat Mar 13 17:11:48 2021 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: 12136915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B841C433E0 for ; Sat, 13 Mar 2021 17:14:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0679864E5F for ; Sat, 13 Mar 2021 17:14:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0679864E5F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lL7qR-0007Ot-SC for qemu-devel@archiver.kernel.org; Sat, 13 Mar 2021 12:14:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lL7o3-0005Ds-Ez; Sat, 13 Mar 2021 12:12:03 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lL7o1-0001yp-Ly; Sat, 13 Mar 2021 12:12:03 -0500 Received: by mail-wr1-x42c.google.com with SMTP id l11so6478226wrp.7; Sat, 13 Mar 2021 09:11:59 -0800 (PST) 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=ILzbG17lCVPuLCHWvX7YzhIgO/cLMrw9CngCTsxuDAc=; b=lUy5NDNffUnQ2Q04PzbI+041CkFPR8eg8QiH5O43FgJeBDSXIyhVjZrb0wzZcP8R0K 055zhUsFofp/ALrQ6gOyb8MXHM9wANvLY/SKFhI3B+GVuwYce2RrzhggSf0NWyfUJklU h1cDbV8lbtCayOTdwU4Stj1FiryJsZEBZY1YOU9Sba7gFjTIlWfQMg8mxX7R9j+Dvkfd h9C1j2O3ciEQtLIPzkDWep2NbFDzSI0h6v3AR0SZJFuJ3OLJVZyI0+RYtgpVoYKrIBpF nNKENbAJo7lbEV8/rcLg1p2qRZ2tqvlzgAJjBga6nPuh3NPZt3xZbxy0l2THArLbqOoQ y4cQ== 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=ILzbG17lCVPuLCHWvX7YzhIgO/cLMrw9CngCTsxuDAc=; b=JQSPCRnFILZcnBTs3HdhU21qd7RXhgvbWXnAwxngtBrha2l6YIhDXTLBWtamd3HgeS cDTjEh/s6dKAAplmP8SnJ/Oja0lcCcs6FDFcnQ0xeIT7o/FhZePRZ3Zv+xYlhdCWXCFP SsKmIWFrxGokXRK5GEI31aeEV6uu1+PHAqSZLNFnKE5+cAeN9xf3IK+YyINVk76Asuun FK11hPqY9V2kfVpWgu6ufHSSWbNgI23q9O/tdEGe4wQlFpAF+GmurEpWQJWQ+4H1l0Zr N2JW3HxfCpzMN2QOBF2SHxOXXGw4hIOLIGFvFQwDR2k6YJLLkA5RrqjrKbsOqQJfzMVD NWtA== X-Gm-Message-State: AOAM530m6x7H6OCPF3nk93/i2c8q2ZYzTF+xAk/7TlWNbKJQMyfhyS1P WOhwcyYIcflfRTpqTMQQub2g3wDlAucCdQ== X-Google-Smtp-Source: ABdhPJzwDpXI4zMf8HmoqpSFJJiUVrFFMiCRdIqi7t0FR3MRD3pAe8bI+k5tKFEkqx5IpDwJX+cdIg== X-Received: by 2002:a5d:468e:: with SMTP id u14mr19873299wrq.359.1615655518314; Sat, 13 Mar 2021 09:11:58 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id i10sm12232500wrs.11.2021.03.13.09.11.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Mar 2021 09:11:57 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/arm: Constify VMStateDescription Date: Sat, 13 Mar 2021 18:11:48 +0100 Message-Id: <20210313171150.2122409-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210313171150.2122409-1-f4bug@amsat.org> References: <20210313171150.2122409-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rob Herring , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/highbank.c | 2 +- hw/arm/pxa2xx_pic.c | 2 +- hw/arm/spitz.c | 4 ++-- hw/arm/strongarm.c | 2 +- hw/arm/z2.c | 4 ++-- hw/dma/pxa2xx_dma.c | 4 ++-- hw/misc/mst_fpga.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index bf886268c57..5afdd28b35c 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -170,7 +170,7 @@ struct HighbankRegsState { uint32_t regs[NUM_REGS]; }; -static VMStateDescription vmstate_highbank_regs = { +static const VMStateDescription vmstate_highbank_regs = { .name = "highbank-regs", .version_id = 0, .minimum_version_id = 0, diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index cf6cb2a373a..ed032fed548 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -301,7 +301,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) return dev; } -static VMStateDescription vmstate_pxa2xx_pic_regs = { +static const VMStateDescription vmstate_pxa2xx_pic_regs = { .name = "pxa2xx_pic", .version_id = 0, .minimum_version_id = 0, diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 6b3bf9828bc..b45a929cbd9 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -1134,7 +1134,7 @@ static bool is_version_0(void *opaque, int version_id) return version_id == 0; } -static VMStateDescription vmstate_sl_nand_info = { +static const VMStateDescription vmstate_sl_nand_info = { .name = "sl-nand", .version_id = 0, .minimum_version_id = 0, @@ -1170,7 +1170,7 @@ static const TypeInfo sl_nand_info = { .class_init = sl_nand_class_init, }; -static VMStateDescription vmstate_spitz_kbd = { +static const VMStateDescription vmstate_spitz_kbd = { .name = "spitz-keyboard", .version_id = 1, .minimum_version_id = 0, diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index c7ca54bceaa..e3e3ea61634 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -207,7 +207,7 @@ static int strongarm_pic_post_load(void *opaque, int version_id) return 0; } -static VMStateDescription vmstate_strongarm_pic_regs = { +static const VMStateDescription vmstate_strongarm_pic_regs = { .name = "strongarm_pic", .version_id = 0, .minimum_version_id = 0, diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 5099bd83802..9c1e876207b 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -162,7 +162,7 @@ static void zipit_lcd_realize(SSIPeripheral *dev, Error **errp) z->pos = 0; } -static VMStateDescription vmstate_zipit_lcd_state = { +static const VMStateDescription vmstate_zipit_lcd_state = { .name = "zipit-lcd", .version_id = 2, .minimum_version_id = 2, @@ -268,7 +268,7 @@ static uint8_t aer915_recv(I2CSlave *slave) return retval; } -static VMStateDescription vmstate_aer915_state = { +static const VMStateDescription vmstate_aer915_state = { .name = "aer915", .version_id = 1, .minimum_version_id = 1, diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index b3707ff3de2..fa896f7edf7 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -525,7 +525,7 @@ static bool is_version_0(void *opaque, int version_id) return version_id == 0; } -static VMStateDescription vmstate_pxa2xx_dma_chan = { +static const VMStateDescription vmstate_pxa2xx_dma_chan = { .name = "pxa2xx_dma_chan", .version_id = 1, .minimum_version_id = 1, @@ -540,7 +540,7 @@ static VMStateDescription vmstate_pxa2xx_dma_chan = { }, }; -static VMStateDescription vmstate_pxa2xx_dma = { +static const VMStateDescription vmstate_pxa2xx_dma = { .name = "pxa2xx_dma", .version_id = 1, .minimum_version_id = 0, diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index edfc35d5f0f..2aaadfa9668 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -222,7 +222,7 @@ static void mst_fpga_init(Object *obj) sysbus_init_mmio(sbd, &s->iomem); } -static VMStateDescription vmstate_mst_fpga_regs = { +static const VMStateDescription vmstate_mst_fpga_regs = { .name = "mainstone_fpga", .version_id = 0, .minimum_version_id = 0, From patchwork Sat Mar 13 17:11:49 2021 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: 12136919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FD3FC433E0 for ; Sat, 13 Mar 2021 17:16:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8DBCA64E5F for ; Sat, 13 Mar 2021 17:16:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DBCA64E5F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lL7rz-0000Gu-LP for qemu-devel@archiver.kernel.org; Sat, 13 Mar 2021 12:16:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lL7o9-0005MY-7q; Sat, 13 Mar 2021 12:12:09 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lL7o5-00021T-OL; Sat, 13 Mar 2021 12:12:07 -0500 Received: by mail-wr1-x42f.google.com with SMTP id u16so6482939wrt.1; Sat, 13 Mar 2021 09:12:04 -0800 (PST) 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=fTjmvUCgdFImH7aw4aIzTGxRYZDde6/Y4SvB4OR8am0=; b=BL78WTeDobirZJ7acLUkg+admRKMb/OGyCNE6J6vwQT4Hb8TFg4CU30vOog3DCKB08 ezMuo+RanQBHGD7W5KW05KfYzmWwoN2s53R33IHXXaQUSMpjjavwBqUneae5xTrFKWYT 0Kii96BJ1UtMWfky/+VshdkXdEZn7gUnG1+Xr505MJUfKfb4k4Xc6LnVXSjX/X+pYtnD TYUDrBz26azs14ReGKhc/jIdSxr5ofUu2XmhiGxuUahPLYKdbAGSy8NKks41pdvjK/zA DjyUFJ2XPsFzRwQGmgTabU9mdi9NG2gjaTtFqepyGBgXq22CRQje1AlqN//koXcnJ5mc trcg== 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=fTjmvUCgdFImH7aw4aIzTGxRYZDde6/Y4SvB4OR8am0=; b=GXKY/RXEqg+u7ov9WOtxAFWiwOAxsol5HGVk9uBbIwktI/KnOr6ntPEYIlaNvTLudZ hOt4nIXslMw9ncO2FepCuWR11UQqSb4ma+1lp74BgL9WgpB+rrzawMpIXmiMX4C767Ek WI+pF98Yn+XMXMVT1TSDAFKYF0wkFnXc4VBFILHF0oS42/XZM8SeUpD/WOYWzJkzIm1n U0JhEhw607ID9C9wpPJFm3q3FNVbF9aw1K/O94eR3pnbDsvOMp9svCLpn4NbtjQl/cTh z7KEBqHSmHLh6sQH37lWB/IzEi9TQYtC8irIAkVpTfCfWDT+IlRMbdOMPRjrcwmT/78p uvfA== X-Gm-Message-State: AOAM532c6QAWsRpOVvkqg9kp1d/lzQqU8ZhyP/hHTJLJ5701prDoVtr2 BkKpjcZUqGS3KFEnxRUfjw4WsNMDzTp7LA== X-Google-Smtp-Source: ABdhPJyyi1IJSI/vleDp8IdKbMFyMgZWBDVUXTcs43LYNafQvWf2JJ9Y/3F1qZZ92IM2VoLtBYdP4Q== X-Received: by 2002:a5d:4fca:: with SMTP id h10mr20579102wrw.70.1615655523493; Sat, 13 Mar 2021 09:12:03 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id y205sm8459141wmc.18.2021.03.13.09.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Mar 2021 09:12:02 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/display/qxl: Constify VMStateDescription Date: Sat, 13 Mar 2021 18:11:49 +0100 Message-Id: <20210313171150.2122409-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210313171150.2122409-1-f4bug@amsat.org> References: <20210313171150.2122409-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rob Herring , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/display/qxl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 93907e82a33..2ba75637ec3 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2384,7 +2384,7 @@ static bool qxl_monitors_config_needed(void *opaque) } -static VMStateDescription qxl_memslot = { +static const VMStateDescription qxl_memslot = { .name = "qxl-memslot", .version_id = QXL_SAVE_VERSION, .minimum_version_id = QXL_SAVE_VERSION, @@ -2396,7 +2396,7 @@ static VMStateDescription qxl_memslot = { } }; -static VMStateDescription qxl_surface = { +static const VMStateDescription qxl_surface = { .name = "qxl-surface", .version_id = QXL_SAVE_VERSION, .minimum_version_id = QXL_SAVE_VERSION, @@ -2414,7 +2414,7 @@ static VMStateDescription qxl_surface = { } }; -static VMStateDescription qxl_vmstate_monitors_config = { +static const VMStateDescription qxl_vmstate_monitors_config = { .name = "qxl/monitors-config", .version_id = 1, .minimum_version_id = 1, @@ -2425,7 +2425,7 @@ static VMStateDescription qxl_vmstate_monitors_config = { }, }; -static VMStateDescription qxl_vmstate = { +static const VMStateDescription qxl_vmstate = { .name = "qxl", .version_id = QXL_SAVE_VERSION, .minimum_version_id = QXL_SAVE_VERSION, From patchwork Sat Mar 13 17:11:50 2021 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: 12136923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61ADDC433E0 for ; Sat, 13 Mar 2021 17:19:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ECAAA64EB7 for ; Sat, 13 Mar 2021 17:19:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECAAA64EB7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lL7vL-00039I-2M for qemu-devel@archiver.kernel.org; Sat, 13 Mar 2021 12:19:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lL7oC-0005Oo-5d; Sat, 13 Mar 2021 12:12:12 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lL7oA-00023a-OU; Sat, 13 Mar 2021 12:12:11 -0500 Received: by mail-wm1-x329.google.com with SMTP id l19so5590426wmh.1; Sat, 13 Mar 2021 09:12:09 -0800 (PST) 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=5dbGGreB+KCx7HwQpBslacsaletNg0zMJJsmt+JNjp4=; b=FgMdz9L9lddRk7JgJZfBg5ECP3K8vEfWeIkS9K0ION/aJYACja1SXmohGGkAD0dSEk vv5+S6SUMQ6+uNIymzPFipqCxYA8WyFh4Wb8tWNeDnj1irGNKx5zlrb244sYlS6gYeYo G0i2bQvbFMb7G+2ZmoeGv8rWNnevSYyaFExhDRUcLJQdN4qJeMRHzL0h0cM1vtHEwZNy piyMCOG8XUwQQg0X2nh3AYEbcIoVqoubhz6CeGCcwZ9HO8p0TD7oYIehvxvzI/b5BtAA 6S0qF95G0M1JvPIPFWyvr5kVn2Aq6PWQDFmhtHCIeIx5+ggXtrLddXVZGn6/5GmgkTm2 7Y8g== 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=5dbGGreB+KCx7HwQpBslacsaletNg0zMJJsmt+JNjp4=; b=MINTNwkx2WEYgSopQhTqAuVAq777GUjSFQdBXVb8elvdKe/g6Ak0nq4iC6Wk55i9fo MaAU7chfLtTCSKengZeMS+LaibKBEhlhRyxgfU0cqdR9jbGAqg3pm1RDzCpGItz9BayN u3yCVu2cIEI2fTdgw1uO8vNUhpC40Z/jvjbfTOgKtRPE2Er7jRA7Qjblk9HZ7BsARq+Q n2mGlsyOBRQRWSX3zLqfpm3P7oN6/qQXr6Q66NjTc7s6z1+xGYZ01QiIfrPBgZxJcuAa EQjqjfCRJuLal3WftSQxhziPFVYOQdji+c0HvP9OCPMzQ8M80KQitNvwcDRB1xohgGTd wz7g== X-Gm-Message-State: AOAM530RHkA0n04zcgUFR3+PojHwoS7jhCCFAGrOUdm0ZoWtTh26YSjw PUoj3vipk9Qz0hL+oCyAhSncAZFYVeFQ2A== X-Google-Smtp-Source: ABdhPJyCBOWddp9IlWH3WjqhQibz5XPPWsX5uxu+F7EzR2SzZEfLx1uo/oycKdCeDLUQ37LXq0vb7g== X-Received: by 2002:a7b:c396:: with SMTP id s22mr18320333wmj.38.1615655528577; Sat, 13 Mar 2021 09:12:08 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id u17sm4923221wmq.3.2021.03.13.09.12.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Mar 2021 09:12:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/3] hw/usb: Constify VMStateDescription Date: Sat, 13 Mar 2021 18:11:50 +0100 Message-Id: <20210313171150.2122409-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210313171150.2122409-1-f4bug@amsat.org> References: <20210313171150.2122409-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Rob Herring , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/usb/ccid-card-passthru.c | 2 +- hw/usb/dev-smartcard-reader.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index c1a90fcc7a5..7212d0d7fb5 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -374,7 +374,7 @@ static void passthru_realize(CCIDCardState *base, Error **errp) card->atr_length = sizeof(DEFAULT_ATR); } -static VMStateDescription passthru_vmstate = { +static const VMStateDescription passthru_vmstate = { .name = "ccid-card-passthru", .version_id = 1, .minimum_version_id = 1, diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 80109fa5516..b3845ccdc14 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1365,7 +1365,7 @@ static int ccid_pre_save(void *opaque) return 0; } -static VMStateDescription bulk_in_vmstate = { +static const VMStateDescription bulk_in_vmstate = { .name = "CCID BulkIn state", .version_id = 1, .minimum_version_id = 1, @@ -1377,7 +1377,7 @@ static VMStateDescription bulk_in_vmstate = { } }; -static VMStateDescription answer_vmstate = { +static const VMStateDescription answer_vmstate = { .name = "CCID Answer state", .version_id = 1, .minimum_version_id = 1, @@ -1388,7 +1388,7 @@ static VMStateDescription answer_vmstate = { } }; -static VMStateDescription usb_device_vmstate = { +static const VMStateDescription usb_device_vmstate = { .name = "usb_device", .version_id = 1, .minimum_version_id = 1, @@ -1400,7 +1400,7 @@ static VMStateDescription usb_device_vmstate = { } }; -static VMStateDescription ccid_vmstate = { +static const VMStateDescription ccid_vmstate = { .name = "usb-ccid", .version_id = 1, .minimum_version_id = 1,