Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1537477

Re: [PATCH 01/10] virtio_console: drop unused config fields

Show all headers | View raw

On 2016年12月06日 23:40, Michael S. Tsirkin wrote:
> struct ports_device includes a config field including the whole
> virtio_console_config, but only max_nr_ports in there is ever updated or
> used. The rest is unused and in fact does not even mirror the
> device config. Drop everything except max_nr_ports,
> saving some memory.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>   drivers/char/virtio_console.c | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)

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

>
> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
> index 5649234..8b00e79 100644
> --- a/drivers/char/virtio_console.c
> +++ b/drivers/char/virtio_console.c
> @@ -152,8 +152,8 @@ struct ports_device {
>   	spinlock_t c_ivq_lock;
>   	spinlock_t c_ovq_lock;
>   
> -	/* The current config space is stored here */
> -	struct virtio_console_config config;
> +	/* max. number of ports this device can hold */
> +	u32 max_nr_ports;
>   
>   	/* The virtio device we're associated with */
>   	struct virtio_device *vdev;
> @@ -1649,11 +1649,11 @@ static void handle_control_message(struct virtio_device *vdev,
>   			break;
>   		}
>   		if (virtio32_to_cpu(vdev, cpkt->id) >=
> -		    portdev->config.max_nr_ports) {
> +		    portdev->max_nr_ports) {
>   			dev_warn(&portdev->vdev->dev,
>   				"Request for adding port with "
>   				"out-of-bound id %u, max. supported id: %u\n",
> -				cpkt->id, portdev->config.max_nr_ports - 1);
> +				cpkt->id, portdev->max_nr_ports - 1);
>   			break;
>   		}
>   		add_port(portdev, virtio32_to_cpu(vdev, cpkt->id));
> @@ -1894,7 +1894,7 @@ static int init_vqs(struct ports_device *portdev)
>   	u32 i, j, nr_ports, nr_queues;
>   	int err;
>   
> -	nr_ports = portdev->config.max_nr_ports;
> +	nr_ports = portdev->max_nr_ports;
>   	nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;
>   
>   	vqs = kmalloc(nr_queues * sizeof(struct virtqueue *), GFP_KERNEL);
> @@ -2047,13 +2047,13 @@ static int virtcons_probe(struct virtio_device *vdev)
>   	}
>   
>   	multiport = false;
> -	portdev->config.max_nr_ports = 1;
> +	portdev->max_nr_ports = 1;
>   
>   	/* Don't test MULTIPORT at all if we're rproc: not a valid feature! */
>   	if (!is_rproc_serial(vdev) &&
>   	    virtio_cread_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT,
>   				 struct virtio_console_config, max_nr_ports,
> -				 &portdev->config.max_nr_ports) == 0) {
> +				 &portdev->max_nr_ports) == 0) {
>   		multiport = true;
>   	}
>   

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 00/10] virtio: sparse fixes "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
  [PATCH 07/10] vsock/virtio: add a missing __le annotation "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 07/10] vsock/virtio: add a missing __le annotation Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100
    Re: [PATCH 07/10] vsock/virtio: add a missing __le annotation Stefan Hajnoczi <stefanha@redhat.com> - 2016-12-07 15:20 +0100
  [PATCH 05/10] vhost: make interval tree static inline "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
  [PATCH 09/10] vsock/virtio: fix src/dst cid format "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 09/10] vsock/virtio: fix src/dst cid format Jason Wang <jasowang@redhat.com> - 2016-12-07 05:40 +0100
      Re: [PATCH 09/10] vsock/virtio: fix src/dst cid format "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-11 04:00 +0100
    Re: [PATCH 09/10] vsock/virtio: fix src/dst cid format Stefan Hajnoczi <stefanha@redhat.com> - 2016-12-07 15:10 +0100
  [PATCH 06/10] vhost: add missing __user annotations "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 06/10] vhost: add missing __user annotations Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100
  [PATCH 10/10] virtio: enable endian checks for sparse builds "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 10/10] virtio: enable endian checks for sparse builds Jason Wang <jasowang@redhat.com> - 2016-12-07 06:30 +0100
    Re: [PATCH 10/10] virtio: enable endian checks for sparse builds Johannes Berg <johannes@sipsolutions.net> - 2016-12-07 07:30 +0100
      Re: [PATCH 10/10] virtio: enable endian checks for sparse builds "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-07 14:30 +0100
    Re: [PATCH 10/10] virtio: enable endian checks for sparse builds Christoph Hellwig <hch@infradead.org> - 2016-12-07 08:40 +0100
    Re: [PATCH 10/10] virtio: enable endian checks for sparse builds Stefan Hajnoczi <stefanha@redhat.com> - 2016-12-07 15:20 +0100
  [PATCH 02/10] drm/virtio: fix endianness in primary_plane_update "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 02/10] drm/virtio: fix endianness in primary_plane_update Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100
  [PATCH 03/10] drm/virtio: fix lock context imbalance "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 03/10] drm/virtio: fix lock context imbalance Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100
  [PATCH 04/10] drm/virtio: annotate  virtio_gpu_queue_ctrl_buffer_locked "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 04/10] drm/virtio: annotate  virtio_gpu_queue_ctrl_buffer_locked Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100
  [PATCH 01/10] virtio_console: drop unused config fields "Michael S. Tsirkin" <mst@redhat.com> - 2016-12-06 16:50 +0100
    Re: [PATCH 01/10] virtio_console: drop unused config fields Jason Wang <jasowang@redhat.com> - 2016-12-07 05:20 +0100

csiph-web