From nobody Sun May 19 01:26:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615655520; cv=none; d=zohomail.com; s=zohoarc; b=CG7/DPKEPbmbhke1r3r+hkXXgKUhPTI7n7yiwTbD1lMAz9emVjQpe8b0/5/lRU38M1Bj4Nm7TRC6mq5YUKLJ5JB0YzwzIa9utHCr+DfGs6vkfghNjwUaJtMYS/q754tVbVEE0Qm66dPFuugh23+RTzTK4oSjh178A1qNcdGQLqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615655520; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ILzbG17lCVPuLCHWvX7YzhIgO/cLMrw9CngCTsxuDAc=; b=UG/Q/rOQmPP7MKeWfmZZFEGx1r7aeDIfcMk1ZhDyjFrhtuYb7PDyfqRW/EpF046LfXSJyHOCa1DwE9rb0X8L9fEHdqUqcH6tugnf2vNz+NzjZcl5IScKNApYK8kdu+Nx7gcC0q8QxMdjkwEIJo4f6coRk74Tz2/3xCZ8vup87Bc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1615655520110912.412037019701; Sat, 13 Mar 2021 09:12:00 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id d15so6476166wrv.5 for ; Sat, 13 Mar 2021 09:11:59 -0800 (PST) Return-Path: Return-Path: 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) 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=SBDgDCslQ/2yeaWDPNKrfEvOsTUmnbEOJ5nfBq+lB1snjkjFicUVYoj++ZGd8l0upj P3YjqhNlvn3tmS2YouxrBvArkwX1bwzyP4lSQ1F84HjPNjSkC+GWrpa5HvP+B5fJ2tYe Dld1o8H8uCe+wr2PQt2zNwjVJZx1ICiiJi4BmBKUiROIiSyQBH7UIqgTcq4d73gwRucj mWWf9+7yZF1bFGo4U3PspE3kq2PtezPjnORKUMtjxQCjktLE5oFuVpfb33/2L6GPOmzX /1k56Qf/LTLkG6wOHOi+2nZl/M46X44kA57WJ/1LGaYWFO7b2LYG0IJ1iyJx1w6QrWnI kcBw== X-Gm-Message-State: AOAM531aghO+3UietRlLrG34o6BxxQz9BTGfuLhUUxooEyLIfpV2fp9P d2ogX68DMnBAb7CDQW8Mf/E= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrzej Zaborowski , Gerd Hoffmann , Peter Maydell , qemu-arm@nongnu.org, Rob Herring , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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]; }; =20 -static VMStateDescription vmstate_highbank_regs =3D { +static const VMStateDescription vmstate_highbank_regs =3D { .name =3D "highbank-regs", .version_id =3D 0, .minimum_version_id =3D 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; } =20 -static VMStateDescription vmstate_pxa2xx_pic_regs =3D { +static const VMStateDescription vmstate_pxa2xx_pic_regs =3D { .name =3D "pxa2xx_pic", .version_id =3D 0, .minimum_version_id =3D 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 =3D=3D 0; } =20 -static VMStateDescription vmstate_sl_nand_info =3D { +static const VMStateDescription vmstate_sl_nand_info =3D { .name =3D "sl-nand", .version_id =3D 0, .minimum_version_id =3D 0, @@ -1170,7 +1170,7 @@ static const TypeInfo sl_nand_info =3D { .class_init =3D sl_nand_class_init, }; =20 -static VMStateDescription vmstate_spitz_kbd =3D { +static const VMStateDescription vmstate_spitz_kbd =3D { .name =3D "spitz-keyboard", .version_id =3D 1, .minimum_version_id =3D 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 ve= rsion_id) return 0; } =20 -static VMStateDescription vmstate_strongarm_pic_regs =3D { +static const VMStateDescription vmstate_strongarm_pic_regs =3D { .name =3D "strongarm_pic", .version_id =3D 0, .minimum_version_id =3D 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 =3D 0; } =20 -static VMStateDescription vmstate_zipit_lcd_state =3D { +static const VMStateDescription vmstate_zipit_lcd_state =3D { .name =3D "zipit-lcd", .version_id =3D 2, .minimum_version_id =3D 2, @@ -268,7 +268,7 @@ static uint8_t aer915_recv(I2CSlave *slave) return retval; } =20 -static VMStateDescription vmstate_aer915_state =3D { +static const VMStateDescription vmstate_aer915_state =3D { .name =3D "aer915", .version_id =3D 1, .minimum_version_id =3D 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 =3D=3D 0; } =20 -static VMStateDescription vmstate_pxa2xx_dma_chan =3D { +static const VMStateDescription vmstate_pxa2xx_dma_chan =3D { .name =3D "pxa2xx_dma_chan", .version_id =3D 1, .minimum_version_id =3D 1, @@ -540,7 +540,7 @@ static VMStateDescription vmstate_pxa2xx_dma_chan =3D { }, }; =20 -static VMStateDescription vmstate_pxa2xx_dma =3D { +static const VMStateDescription vmstate_pxa2xx_dma =3D { .name =3D "pxa2xx_dma", .version_id =3D 1, .minimum_version_id =3D 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); } =20 -static VMStateDescription vmstate_mst_fpga_regs =3D { +static const VMStateDescription vmstate_mst_fpga_regs =3D { .name =3D "mainstone_fpga", .version_id =3D 0, .minimum_version_id =3D 0, --=20 2.26.2 From nobody Sun May 19 01:26:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615655525; cv=none; d=zohomail.com; s=zohoarc; b=kbylbRfLzhhSQSsYGM2/vqbkrGUg/tk2qKcP7gjwj6Jlv3EbmsAhkmKlXh2PCTfkhM2muqlVPUA/yX9R9i9jN7RgXKm8FwrIvKd+37XUpZU96mHGNwmrBGIr+GYWgr2RE0/PPHKgwh5ro85JJzqhgbxfp95Us8JILiKjteLGBac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615655525; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fTjmvUCgdFImH7aw4aIzTGxRYZDde6/Y4SvB4OR8am0=; b=O71oR3eX9tm4Td3DbPGVmc0fBD4kReCnNd/puLrThY79/Wt4VQQRDXvurJMQ6EXCeCsDBTHzCM0Ti8zknVhIuHTQ0MT7G5bxp2I0nTrsSnrO+lQ4u5a5EUL9nyeV+p/E87wc1ZWD3UFR31VEF9frAus1BRoG11eeeevYWWa/j0w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1615655525140370.6458179362279; Sat, 13 Mar 2021 09:12:05 -0800 (PST) Received: by mail-wr1-f44.google.com with SMTP id y16so6492328wrw.3 for ; Sat, 13 Mar 2021 09:12:04 -0800 (PST) Return-Path: Return-Path: 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) 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=WBDMvVKKGxc28GBx/xGwHY0IaQMnEidRUBfOzGqVoLnNOAMz7HbrSoesDQGRrRokRF RkNbFD9KqlQBDBvMwVoKeki/c8qZfBE7vG8aSQ2kgFi1PPOsuhwImGAMsEp+bjOxjbKV l+VvYFMd2SFNFJx90erYLTXgw5fkuWkjPGE5UGOuYTvhoegeTXu/Z4cPsxmVdRFlKLbd xb7YVyJY/qbgYY+JXdKJ8nLG+7+1x5quwLrelx+uyYyZEcgUvzCVdb7UROu7AiTzKRwj WO9ZbcCsN6T+CrTlxXXzbEmve/YCFn7mKs7RXxIcdUI9d5I8qH2fxjOYvlHG1w7FG5Wk HK1w== X-Gm-Message-State: AOAM5324cwWK2XogGylqFn/Cn7sVMstV0goDUZERx9Zk0GACwWMVcGbx 5WMZdngmelYHpLNfqU8o628= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrzej Zaborowski , Gerd Hoffmann , Peter Maydell , qemu-arm@nongnu.org, Rob Herring , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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) } =20 =20 -static VMStateDescription qxl_memslot =3D { +static const VMStateDescription qxl_memslot =3D { .name =3D "qxl-memslot", .version_id =3D QXL_SAVE_VERSION, .minimum_version_id =3D QXL_SAVE_VERSION, @@ -2396,7 +2396,7 @@ static VMStateDescription qxl_memslot =3D { } }; =20 -static VMStateDescription qxl_surface =3D { +static const VMStateDescription qxl_surface =3D { .name =3D "qxl-surface", .version_id =3D QXL_SAVE_VERSION, .minimum_version_id =3D QXL_SAVE_VERSION, @@ -2414,7 +2414,7 @@ static VMStateDescription qxl_surface =3D { } }; =20 -static VMStateDescription qxl_vmstate_monitors_config =3D { +static const VMStateDescription qxl_vmstate_monitors_config =3D { .name =3D "qxl/monitors-config", .version_id =3D 1, .minimum_version_id =3D 1, @@ -2425,7 +2425,7 @@ static VMStateDescription qxl_vmstate_monitors_config= =3D { }, }; =20 -static VMStateDescription qxl_vmstate =3D { +static const VMStateDescription qxl_vmstate =3D { .name =3D "qxl", .version_id =3D QXL_SAVE_VERSION, .minimum_version_id =3D QXL_SAVE_VERSION, --=20 2.26.2 From nobody Sun May 19 01:26:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615655530; cv=none; d=zohomail.com; s=zohoarc; b=gv1Hok8gTUmJBWppVewSoqaI01f+W2+geAZjRwwn6Xe8STZn7p92PqGXhkn8f/m4L30kvDb801g443cYb6jbmQtdet6zqjZLKrmHLppFw3j3c+C7IR2O2vudjZi5RPVOhVTeRd8PBXiwA8HtNRcA/uj4+8bQGuPaLGa3kS1h2cM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615655530; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5dbGGreB+KCx7HwQpBslacsaletNg0zMJJsmt+JNjp4=; b=XZqvEQYbqh/HBAmALAC7hznd2u2oF/iVK5xLnoKP+6rrv1XyIsYwVTwrJa5khhCJSFptEKtzp9CpM9n7Phl3im5uz+FF5JRQRYSNp24yXrCUTTrLrSfG5GArMEDdQZqJbsjvMxf2OuXReR7Ml3KaKC3OAWxIbItPlzfaQvvEXwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1615655530306155.0282060582948; Sat, 13 Mar 2021 09:12:10 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id r10-20020a05600c35cab029010c946c95easo16948442wmq.4 for ; Sat, 13 Mar 2021 09:12:09 -0800 (PST) Return-Path: Return-Path: 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) 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=eUy0OgSilOPaRSBoMRq8lxu0aH7EY7fzXscC/DE29B52ArUa8TEAWDM5rhjB4V+M50 vVaKADMVILCt+KBW8D1DKcvJq+pPmmO+Hp0VC70XUWeeBK/SNyzrUQoFGDK5ARqM8yty QHZS0X2jNH8Yop3X9SqzfjM01QyHGZZAxNW95zXboXoOcywvf7hbmVTbVdPu397PEYw0 uUXRCkbU6QP8UXPJlHVHWZBHFXPsoVSfsr73t5EFNaKWPWccTzhnvENeO3zrASdbTLyC slkFayTpvXfzF2LajlmlG7wHfxzvIL6cA3dcWEUHmicYuBiiALTVaHkDOuzL9vIMkS/6 s8mw== X-Gm-Message-State: AOAM530apua/7gssVRbxRRm3el6yuS47ylBg7lc/r81rrZnYbEbYg9ga 1fYZEXUTUEGFwMwKPqXj8zc= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrzej Zaborowski , Gerd Hoffmann , Peter Maydell , qemu-arm@nongnu.org, Rob Herring , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 =3D sizeof(DEFAULT_ATR); } =20 -static VMStateDescription passthru_vmstate =3D { +static const VMStateDescription passthru_vmstate =3D { .name =3D "ccid-card-passthru", .version_id =3D 1, .minimum_version_id =3D 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; } =20 -static VMStateDescription bulk_in_vmstate =3D { +static const VMStateDescription bulk_in_vmstate =3D { .name =3D "CCID BulkIn state", .version_id =3D 1, .minimum_version_id =3D 1, @@ -1377,7 +1377,7 @@ static VMStateDescription bulk_in_vmstate =3D { } }; =20 -static VMStateDescription answer_vmstate =3D { +static const VMStateDescription answer_vmstate =3D { .name =3D "CCID Answer state", .version_id =3D 1, .minimum_version_id =3D 1, @@ -1388,7 +1388,7 @@ static VMStateDescription answer_vmstate =3D { } }; =20 -static VMStateDescription usb_device_vmstate =3D { +static const VMStateDescription usb_device_vmstate =3D { .name =3D "usb_device", .version_id =3D 1, .minimum_version_id =3D 1, @@ -1400,7 +1400,7 @@ static VMStateDescription usb_device_vmstate =3D { } }; =20 -static VMStateDescription ccid_vmstate =3D { +static const VMStateDescription ccid_vmstate =3D { .name =3D "usb-ccid", .version_id =3D 1, .minimum_version_id =3D 1, --=20 2.26.2