File ipxe.8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3.patch of Package xen (Revision 9c85a36e5d114c8038b820a72e545168)

Currently displaying revision 9c85a36e5d114c8038b820a72e545168 , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Sat, 27 Jun 2020 20:43:32 +0100
Subject: 8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3

[golan] Add explicit type casts for nodnic_queue_pair_type

GCC 10 emits warnings for implicit conversions of enumerated types.

The flexboot_nodnic code defines nodnic_queue_pair_type with values
identical to those of ib_queue_pair_type, and implicitly casts between
them.  Add an explicit cast to fix the warning.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/drivers/infiniband/flexboot_nodnic.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/src/drivers/infiniband/flexboot_nodnic.c
+++ b/src/drivers/infiniband/flexboot_nodnic.c
@@ -328,25 +328,26 @@ static int flexboot_nodnic_create_qp ( struct ib_device *ibdev,
 			      struct ib_queue_pair *qp ) {
 	struct flexboot_nodnic *flexboot_nodnic = ib_get_drvdata ( ibdev );
 	struct flexboot_nodnic_port *port = &flexboot_nodnic->port[ibdev->port - 1];
 	struct flexboot_nodnic_queue_pair *flexboot_nodnic_qp;
 	mlx_status status = MLX_SUCCESS;
 
 	flexboot_nodnic_qp = (struct flexboot_nodnic_queue_pair *)zalloc(sizeof(*flexboot_nodnic_qp));
 	if ( flexboot_nodnic_qp == NULL ) {
 		status = MLX_OUT_OF_RESOURCES;
 		goto qp_alloc_err;
 	}
 
-	status = nodnic_port_create_qp(&port->port_priv, qp->type,
+	status = nodnic_port_create_qp(&port->port_priv,
+			(nodnic_queue_pair_type) qp->type,
 			qp->send.num_wqes * sizeof(struct nodnic_send_wqbb),
 			qp->send.num_wqes,
 			qp->recv.num_wqes * sizeof(struct nodnic_recv_wqe),
 			qp->recv.num_wqes,
 			&flexboot_nodnic_qp->nodnic_queue_pair);
 	MLX_FATAL_CHECK_STATUS(status, create_err,
 			"nodnic_port_create_qp failed");
 	ib_qp_set_drvdata ( qp, flexboot_nodnic_qp );
 	return status;
 create_err:
 	free(flexboot_nodnic_qp);
 qp_alloc_err:
@@ -369,25 +370,26 @@ static int flexboot_nodnic_modify_qp ( struct ib_device *ibdev __unused,
 /**
  * Destroy queue pair
  *
  * @v ibdev		Infiniband device
  * @v qp		Queue pair
  */
 static void flexboot_nodnic_destroy_qp ( struct ib_device *ibdev,
 				struct ib_queue_pair *qp ) {
 	struct flexboot_nodnic *flexboot_nodnic = ib_get_drvdata ( ibdev );
 	struct flexboot_nodnic_port *port = &flexboot_nodnic->port[ibdev->port - 1];
 	struct flexboot_nodnic_queue_pair *flexboot_nodnic_qp = ib_qp_get_drvdata ( qp );
 
-	nodnic_port_destroy_qp(&port->port_priv, qp->type,
+	nodnic_port_destroy_qp(&port->port_priv,
+			(nodnic_queue_pair_type) qp->type,
 			flexboot_nodnic_qp->nodnic_queue_pair);
 
 	free(flexboot_nodnic_qp);
 }
 
 /***************************************************************************
  *
  * Work request operations
  *
  ***************************************************************************
  */

Places

File ipxe.8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3.patch of Package xen (Revision 9c85a36e5d114c8038b820a72e545168)

Places