Commit 069097da authored by Halil Pasic's avatar Halil Pasic Committed by Cornelia Huck
Browse files

s390x: bump ADAPTER_ROUTES_MAX_GSI 



Let's increase ADAPTER_ROUTES_MAX_GSI to VIRTIO_QUEUE_MAX which is the
largest demand foreseeable at the moment. Let us add a compatibility
macro for the previous machines so client code can maintain backwards
migration compatibility

To not mess up migration compatibility for virtio-ccw
VIRTIO_CCW_QUEUE_MAX is left at it's current value, and will be dropped
when virtio-ccw is converted to use the capability of the flic
introduced by this patch.

Signed-off-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 0708afa7

hw/s390x/s390-virtio-ccw.c

+6 −1
Original line number Diff line number Diff line
@@ -336,7 +336,12 @@ static const TypeInfo ccw_machine_info = { 
    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_8 \

        HW_COMPAT_2_8

        HW_COMPAT_2_8 \

        {\

            .driver   = TYPE_S390_FLIC_COMMON,\

            .property = "adapter_routes_max_batch",\

            .value    = "64",\

        },



#define CCW_COMPAT_2_7 \

        HW_COMPAT_2_7

include/hw/s390x/s390_flic.h

+8 −2
Original line number Diff line number Diff line
@@ -17,8 +17,14 @@ 
#include "hw/s390x/adapter.h"

#include "hw/virtio/virtio.h"



#define ADAPTER_ROUTES_MAX_GSI 64

#define VIRTIO_CCW_QUEUE_MAX ADAPTER_ROUTES_MAX_GSI

/*

 * Reserve enough gsis to accommodate all virtio devices.

 * If any other user of adapter routes needs more of these,

 * we need to bump the value; but virtio looks like the

 * maximum right now.

 */

#define ADAPTER_ROUTES_MAX_GSI VIRTIO_QUEUE_MAX

#define VIRTIO_CCW_QUEUE_MAX 64



typedef struct AdapterRoutes {

    AdapterInfo adapter;