Re: [PATCH-for-8.0 03/10] hw/virtio: Constify qmp_virtio_feature_map_t[]

[Philippe Mathieu-Daudé]

On 13/12/22 01:02, Richard Henderson wrote:
> On 12/12/22 17:05, Philippe Mathieu-Daudé wrote:
> > @@ -161,7 +161,7 @@ static qmp_virtio_feature_map_t 
> > vhost_user_protocol_map[] = {
> >   };
> >   /* virtio device configuration statuses */
> > -static qmp_virtio_feature_map_t virtio_config_status_map[] = {
> > +static const qmp_virtio_feature_map_t virtio_config_status_map[] = {
> >       FEATURE_ENTRY(VIRTIO_CONFIG_S_DRIVER_OK, \
> >               "VIRTIO_CONFIG_S_DRIVER_OK: Driver setup and ready"),
> >       FEATURE_ENTRY(VIRTIO_CONFIG_S_FEATURES_OK, \
> > @@ -179,7 +179,7 @@ static qmp_virtio_feature_map_t 
> > virtio_config_status_map[] = {
> >   };
> >   /* virtio-blk features mapping */
> > -qmp_virtio_feature_map_t virtio_blk_feature_map[] = {
> > +const qmp_virtio_feature_map_t virtio_blk_feature_map[] = {
> >       FEATURE_ENTRY(VIRTIO_BLK_F_SIZE_MAX, \
> >               "VIRTIO_BLK_F_SIZE_MAX: Max segment size is size_max"),
> >       FEATURE_ENTRY(VIRTIO_BLK_F_SEG_MAX, \
>
> It appears all of the ones not marked static can be?

It seems some are not static to avoid "declared static but not used"
warnings due to how they are conditionally used with the
CONFIG_VIRTIO_xxx guards in qmp_decode_features():

    /* device features */
    switch (device_id) {
#ifdef CONFIG_VIRTIO_SERIAL
    case VIRTIO_ID_CONSOLE:
        features->dev_features =
            CONVERT_FEATURES(strList, virtio_serial_feature_map, 0, 
bitmap);
        break;
#endif
#ifdef CONFIG_VIRTIO_BLK
    case VIRTIO_ID_BLOCK:
        features->dev_features =
            CONVERT_FEATURES(strList, virtio_blk_feature_map, 0, bitmap);
        break;
#endif
#ifdef CONFIG_VIRTIO_GPU
    case VIRTIO_ID_GPU:
        features->dev_features =
            CONVERT_FEATURES(strList, virtio_gpu_feature_map, 0, bitmap);
        break;
#endif

> Otherwise you should have needed to adjust some header file as well.

OK I'll guard them with the corresponding #ifdef'ry.