[PATCH 0/3] hw/virtio: Constify VirtIOFeature

[PATCH 0/3] hw/virtio: Constify VirtIOFeature

[Philippe Mathieu-Daudé]

Trivial patches to keep VirtIOFeature arrays read-only
(better safe than sorry).

Philippe Mathieu-Daudé (3):
  hw/virtio: Pass virtio_feature_get_config_size() a const argument
  virtio-blk: Constify VirtIOFeature feature_sizes[]
  virtio-net: Constify VirtIOFeature feature_sizes[]

 include/hw/virtio/virtio.h | 2 +-
 hw/block/virtio-blk.c      | 2 +-
 hw/net/virtio-net.c        | 2 +-
 hw/virtio/virtio.c         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.26.3

[PATCH 1/3] hw/virtio: Pass virtio_feature_get_config_size() a const argument

[Philippe Mathieu-Daudé]

The VirtIOFeature structure isn't modified, mark it const.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 include/hw/virtio/virtio.h | 2 +-
 hw/virtio/virtio.c         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b7ece7a6a89..8bab9cfb750 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -43,7 +43,7 @@ typedef struct VirtIOFeature {
     size_t end;
 } VirtIOFeature;
 
-size_t virtio_feature_get_config_size(VirtIOFeature *features,
+size_t virtio_feature_get_config_size(const VirtIOFeature *features,
                                       uint64_t host_features);
 
 typedef struct VirtQueue VirtQueue;
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 9e13cb9e3ad..e02544b2df7 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2981,7 +2981,7 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
     return ret;
 }
 
-size_t virtio_feature_get_config_size(VirtIOFeature *feature_sizes,
+size_t virtio_feature_get_config_size(const VirtIOFeature *feature_sizes,
                                       uint64_t host_features)
 {
     size_t config_size = 0;
-- 
2.26.3

Re: [PATCH 1/3] hw/virtio: Pass virtio_feature_get_config_size() a const argument

[Jason Wang]

在 2021/5/11 下午6:41, Philippe Mathieu-Daudé 写道:
> The VirtIOFeature structure isn't modified, mark it const.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


Acked-by: Jason Wang <jasowang@redhat.com>


> ---
>   include/hw/virtio/virtio.h | 2 +-
>   hw/virtio/virtio.c         | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index b7ece7a6a89..8bab9cfb750 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -43,7 +43,7 @@ typedef struct VirtIOFeature {
>       size_t end;
>   } VirtIOFeature;
>   
> -size_t virtio_feature_get_config_size(VirtIOFeature *features,
> +size_t virtio_feature_get_config_size(const VirtIOFeature *features,
>                                         uint64_t host_features);
>   
>   typedef struct VirtQueue VirtQueue;
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 9e13cb9e3ad..e02544b2df7 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -2981,7 +2981,7 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
>       return ret;
>   }
>   
> -size_t virtio_feature_get_config_size(VirtIOFeature *feature_sizes,
> +size_t virtio_feature_get_config_size(const VirtIOFeature *feature_sizes,
>                                         uint64_t host_features)
>   {
>       size_t config_size = 0;

[PATCH 2/3] virtio-blk: Constify VirtIOFeature feature_sizes[]

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/block/virtio-blk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index d28979efb8d..f139cd7cc9c 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -40,7 +40,7 @@
  * Starting from the discard feature, we can use this array to properly
  * set the config size depending on the features enabled.
  */
-static VirtIOFeature feature_sizes[] = {
+static const VirtIOFeature feature_sizes[] = {
     {.flags = 1ULL << VIRTIO_BLK_F_DISCARD,
      .end = endof(struct virtio_blk_config, discard_sector_alignment)},
     {.flags = 1ULL << VIRTIO_BLK_F_WRITE_ZEROES,
-- 
2.26.3

Re: [PATCH 2/3] virtio-blk: Constify VirtIOFeature feature_sizes[]

[Jason Wang]

在 2021/5/11 下午6:41, Philippe Mathieu-Daudé 写道:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   hw/block/virtio-blk.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
> index d28979efb8d..f139cd7cc9c 100644
> --- a/hw/block/virtio-blk.c
> +++ b/hw/block/virtio-blk.c
> @@ -40,7 +40,7 @@
>    * Starting from the discard feature, we can use this array to properly
>    * set the config size depending on the features enabled.
>    */
> -static VirtIOFeature feature_sizes[] = {
> +static const VirtIOFeature feature_sizes[] = {
>       {.flags = 1ULL << VIRTIO_BLK_F_DISCARD,
>        .end = endof(struct virtio_blk_config, discard_sector_alignment)},
>       {.flags = 1ULL << VIRTIO_BLK_F_WRITE_ZEROES,


Acked-by: Jason Wang <jasowang@redhat.com>

[PATCH 3/3] virtio-net: Constify VirtIOFeature feature_sizes[]

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/net/virtio-net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 66b9ff45118..6b7e8dd04ef 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -89,7 +89,7 @@
                                          VIRTIO_NET_RSS_HASH_TYPE_TCP_EX | \
                                          VIRTIO_NET_RSS_HASH_TYPE_UDP_EX)
 
-static VirtIOFeature feature_sizes[] = {
+static const VirtIOFeature feature_sizes[] = {
     {.flags = 1ULL << VIRTIO_NET_F_MAC,
      .end = endof(struct virtio_net_config, mac)},
     {.flags = 1ULL << VIRTIO_NET_F_STATUS,
-- 
2.26.3

Re: [PATCH 3/3] virtio-net: Constify VirtIOFeature feature_sizes[]

[Jason Wang]

在 2021/5/11 下午6:41, Philippe Mathieu-Daudé 写道:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   hw/net/virtio-net.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 66b9ff45118..6b7e8dd04ef 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -89,7 +89,7 @@
>                                            VIRTIO_NET_RSS_HASH_TYPE_TCP_EX | \
>                                            VIRTIO_NET_RSS_HASH_TYPE_UDP_EX)
>   
> -static VirtIOFeature feature_sizes[] = {
> +static const VirtIOFeature feature_sizes[] = {
>       {.flags = 1ULL << VIRTIO_NET_F_MAC,
>        .end = endof(struct virtio_net_config, mac)},
>       {.flags = 1ULL << VIRTIO_NET_F_STATUS,


Acked-by: Jason Wang <jasowang@redhat.com>

Re: [PATCH 0/3] hw/virtio: Constify VirtIOFeature

[Richard Henderson]

On 5/11/21 5:41 AM, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (3):
>    hw/virtio: Pass virtio_feature_get_config_size() a const argument
>    virtio-blk: Constify VirtIOFeature feature_sizes[]
>    virtio-net: Constify VirtIOFeature feature_sizes[]

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 0/3] hw/virtio: Constify VirtIOFeature

[Stefano Garzarella]

On Tue, May 11, 2021 at 12:41:54PM +0200, Philippe Mathieu-Daudé wrote:
>Trivial patches to keep VirtIOFeature arrays read-only
>(better safe than sorry).
>
>Philippe Mathieu-Daudé (3):
>  hw/virtio: Pass virtio_feature_get_config_size() a const argument
>  virtio-blk: Constify VirtIOFeature feature_sizes[]
>  virtio-net: Constify VirtIOFeature feature_sizes[]
>
> include/hw/virtio/virtio.h | 2 +-
> hw/block/virtio-blk.c      | 2 +-
> hw/net/virtio-net.c        | 2 +-
> hw/virtio/virtio.c         | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Re: [PATCH 0/3] hw/virtio: Constify VirtIOFeature

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

On Tue, May 11, 2021 at 12:41:54PM +0200, Philippe Mathieu-Daudé wrote:
> Trivial patches to keep VirtIOFeature arrays read-only
> (better safe than sorry).
> 
> Philippe Mathieu-Daudé (3):
>   hw/virtio: Pass virtio_feature_get_config_size() a const argument
>   virtio-blk: Constify VirtIOFeature feature_sizes[]
>   virtio-net: Constify VirtIOFeature feature_sizes[]
> 
>  include/hw/virtio/virtio.h | 2 +-
>  hw/block/virtio-blk.c      | 2 +-
>  hw/net/virtio-net.c        | 2 +-
>  hw/virtio/virtio.c         | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> -- 
> 2.26.3
> 
> 

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

Re: [PATCH 0/3] hw/virtio: Constify VirtIOFeature

[Laurent Vivier]

Le 11/05/2021 à 12:41, Philippe Mathieu-Daudé a écrit :
> Trivial patches to keep VirtIOFeature arrays read-only
> (better safe than sorry).
> 
> Philippe Mathieu-Daudé (3):
>   hw/virtio: Pass virtio_feature_get_config_size() a const argument
>   virtio-blk: Constify VirtIOFeature feature_sizes[]
>   virtio-net: Constify VirtIOFeature feature_sizes[]
> 
>  include/hw/virtio/virtio.h | 2 +-
>  hw/block/virtio-blk.c      | 2 +-
>  hw/net/virtio-net.c        | 2 +-
>  hw/virtio/virtio.c         | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 

Series applied to my trivial-patches branch.

Thanks,
Laurent