Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/42100

_apply issues_

Submitter: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: 2018-07-02 15:25:44
DPDK git baseline:
	Repo:dpdk-master, CommitID: 05e0eee0001cb19671eb7e8d3dd68680a695fea2
	Repo:dpdk-next-eventdev, CommitID: 9131a10a60bdbf8cd19e0158c6e01648a1d25e23
	Repo:dpdk-next-net, CommitID: e5647516deae231db94b5488a6c3d48310ab619c
	Repo:dpdk-next-crypto, CommitID: e4eb7ecc21bc161489d095f96e7769a1406fdaa4
	Repo:dpdk-next-virtio, CommitID: 9b954f9c455a76304601deb88e2df1549dc9e09a

*Repo: dpdk-master
Checking patch drivers/net/virtio/virtio_ethdev.c...
error: while searching for:
		eth_dev->rx_pkt_burst = &virtio_recv_pkts;
	}

	if (hw->use_simple_tx) {
		PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
--
	} else if (hw->use_inorder_tx) {
		PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
			eth_dev->data->port_id);
		eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;

error: patch failed: drivers/net/virtio/virtio_ethdev.c:1336
error: drivers/net/virtio/virtio_ethdev.c: patch does not apply
Checking patch drivers/net/virtio/virtio_pci.h...
error: while searching for:
	uint8_t	    use_msix;
	uint8_t     modern;
	uint8_t     use_simple_rx;
	uint8_t     use_simple_tx;
	uint8_t     use_inorder_rx;
	uint8_t     use_inorder_tx;
	uint16_t    port_id;

error: patch failed: drivers/net/virtio/virtio_pci.h:238
error: drivers/net/virtio/virtio_pci.h: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx.c...
Hunk #1 succeeded at 498 (offset -210 lines).
error: while searching for:
	uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
	struct virtio_hw *hw = dev->data->dev_private;
	struct virtqueue *vq = hw->vqs[vtpci_queue_idx];
	uint16_t mid_idx = vq->vq_nentries >> 1;
	struct virtnet_tx *txvq = &vq->txq;
--
	}

	VIRTQUEUE_DUMP(vq);


error: patch failed: drivers/net/virtio/virtio_rxtx.c:746
error: drivers/net/virtio/virtio_rxtx.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.c...
Checking patch drivers/net/virtio/virtio_rxtx_simple.h...
Checking patch drivers/net/virtio/virtio_user_ethdev.c...
error: while searching for:
	hw->use_msix = 1;
	hw->modern   = 0;
	hw->use_simple_rx = 0;
	hw->use_simple_tx = 0;
	hw->use_inorder_rx = 0;
	hw->use_inorder_tx = 0;
	hw->virtio_user_dev = dev;

error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:436
error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply
*Repo: dpdk-next-eventdev
Checking patch drivers/net/virtio/virtio_ethdev.c...
error: while searching for:
		eth_dev->rx_pkt_burst = &virtio_recv_pkts;
	}

	if (hw->use_simple_tx) {
		PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
--
	} else if (hw->use_inorder_tx) {
		PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
			eth_dev->data->port_id);
		eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;

error: patch failed: drivers/net/virtio/virtio_ethdev.c:1336
error: drivers/net/virtio/virtio_ethdev.c: patch does not apply
Checking patch drivers/net/virtio/virtio_pci.h...
error: while searching for:
	uint8_t	    use_msix;
	uint8_t     modern;
	uint8_t     use_simple_rx;
	uint8_t     use_simple_tx;
	uint8_t     use_inorder_rx;
	uint8_t     use_inorder_tx;
	uint16_t    port_id;

error: patch failed: drivers/net/virtio/virtio_pci.h:238
error: drivers/net/virtio/virtio_pci.h: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx.c...
Hunk #1 succeeded at 498 (offset -210 lines).
error: while searching for:
	uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
	struct virtio_hw *hw = dev->data->dev_private;
	struct virtqueue *vq = hw->vqs[vtpci_queue_idx];
	uint16_t mid_idx = vq->vq_nentries >> 1;
	struct virtnet_tx *txvq = &vq->txq;
--
	}

	VIRTQUEUE_DUMP(vq);


error: patch failed: drivers/net/virtio/virtio_rxtx.c:746
error: drivers/net/virtio/virtio_rxtx.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.c...
Checking patch drivers/net/virtio/virtio_rxtx_simple.h...
Checking patch drivers/net/virtio/virtio_user_ethdev.c...
error: while searching for:
	hw->use_msix = 1;
	hw->modern   = 0;
	hw->use_simple_rx = 0;
	hw->use_simple_tx = 0;
	hw->use_inorder_rx = 0;
	hw->use_inorder_tx = 0;
	hw->virtio_user_dev = dev;

error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:436
error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply
*Repo: dpdk-next-net
Checking patch drivers/net/virtio/virtio_ethdev.c...
error: while searching for:
		eth_dev->rx_pkt_burst = &virtio_recv_pkts;
	}

	if (hw->use_simple_tx) {
		PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
--
	} else if (hw->use_inorder_tx) {
		PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
			eth_dev->data->port_id);
		eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;

error: patch failed: drivers/net/virtio/virtio_ethdev.c:1336
error: drivers/net/virtio/virtio_ethdev.c: patch does not apply
Checking patch drivers/net/virtio/virtio_pci.h...
error: while searching for:
	uint8_t	    use_msix;
	uint8_t     modern;
	uint8_t     use_simple_rx;
	uint8_t     use_simple_tx;
	uint8_t     use_inorder_rx;
	uint8_t     use_inorder_tx;
	uint16_t    port_id;

error: patch failed: drivers/net/virtio/virtio_pci.h:238
error: drivers/net/virtio/virtio_pci.h: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx.c...
error: while searching for:

	PMD_INIT_FUNC_TRACE();

	/* cannot use simple rxtx funcs with multisegs or offloads */
	if (dev->data->dev_conf.txmode.offloads)
--

	if (nb_desc == 0 || nb_desc > vq->vq_nentries)
		nb_desc = vq->vq_nentries;
	vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc);

error: patch failed: drivers/net/virtio/virtio_rxtx.c:708
error: drivers/net/virtio/virtio_rxtx.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.c...
error: while searching for:
#pragma GCC diagnostic ignored "-Wcast-qual"
#endif

uint16_t
virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts,
--

int __attribute__((cold))
virtio_rxq_vec_setup(struct virtnet_rx *rxq)
{

error: patch failed: drivers/net/virtio/virtio_rxtx_simple.c:27
error: drivers/net/virtio/virtio_rxtx_simple.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.h...
error: while searching for:
	vq_update_avail_idx(vq);
}

#define VIRTIO_TX_FREE_THRESH 32
#define VIRTIO_TX_MAX_FREE_BUF_SZ 32
--
	vq->vq_free_cnt += (VIRTIO_TX_FREE_NR << 1);
}

#endif /* _VIRTIO_RXTX_SIMPLE_H_ */

error: patch failed: drivers/net/virtio/virtio_rxtx_simple.h:55
error: drivers/net/virtio/virtio_rxtx_simple.h: patch does not apply
Checking patch drivers/net/virtio/virtio_user_ethdev.c...
error: while searching for:
	hw->use_msix = 1;
	hw->modern   = 0;
	hw->use_simple_rx = 0;
	hw->use_simple_tx = 0;
	hw->use_inorder_rx = 0;
	hw->use_inorder_tx = 0;
	hw->virtio_user_dev = dev;

error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:436
error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply
*Repo: dpdk-next-crypto
Checking patch drivers/net/virtio/virtio_ethdev.c...
error: while searching for:
		eth_dev->rx_pkt_burst = &virtio_recv_pkts;
	}

	if (hw->use_simple_tx) {
		PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
--
	} else if (hw->use_inorder_tx) {
		PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
			eth_dev->data->port_id);
		eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;

error: patch failed: drivers/net/virtio/virtio_ethdev.c:1336
error: drivers/net/virtio/virtio_ethdev.c: patch does not apply
Checking patch drivers/net/virtio/virtio_pci.h...
error: while searching for:
	uint8_t	    use_msix;
	uint8_t     modern;
	uint8_t     use_simple_rx;
	uint8_t     use_simple_tx;
	uint8_t     use_inorder_rx;
	uint8_t     use_inorder_tx;
	uint16_t    port_id;

error: patch failed: drivers/net/virtio/virtio_pci.h:238
error: drivers/net/virtio/virtio_pci.h: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx.c...
Hunk #1 succeeded at 498 (offset -210 lines).
error: while searching for:
	uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
	struct virtio_hw *hw = dev->data->dev_private;
	struct virtqueue *vq = hw->vqs[vtpci_queue_idx];
	uint16_t mid_idx = vq->vq_nentries >> 1;
	struct virtnet_tx *txvq = &vq->txq;
--
	}

	VIRTQUEUE_DUMP(vq);


error: patch failed: drivers/net/virtio/virtio_rxtx.c:746
error: drivers/net/virtio/virtio_rxtx.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.c...
Checking patch drivers/net/virtio/virtio_rxtx_simple.h...
Checking patch drivers/net/virtio/virtio_user_ethdev.c...
error: while searching for:
	hw->use_msix = 1;
	hw->modern   = 0;
	hw->use_simple_rx = 0;
	hw->use_simple_tx = 0;
	hw->use_inorder_rx = 0;
	hw->use_inorder_tx = 0;
	hw->virtio_user_dev = dev;

error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:436
error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply
*Repo: dpdk-next-virtio
Checking patch drivers/net/virtio/virtio_ethdev.c...
error: while searching for:
		eth_dev->rx_pkt_burst = &virtio_recv_pkts;
	}

	if (hw->use_simple_tx) {
		PMD_INIT_LOG(INFO, "virtio: using simple Tx path on port %u",
--
	} else if (hw->use_inorder_tx) {
		PMD_INIT_LOG(INFO, "virtio: using inorder Tx path on port %u",
			eth_dev->data->port_id);
		eth_dev->tx_pkt_burst = virtio_xmit_pkts_inorder;

error: patch failed: drivers/net/virtio/virtio_ethdev.c:1336
error: drivers/net/virtio/virtio_ethdev.c: patch does not apply
Checking patch drivers/net/virtio/virtio_pci.h...
error: while searching for:
	uint8_t	    use_msix;
	uint8_t     modern;
	uint8_t     use_simple_rx;
	uint8_t     use_simple_tx;
	uint8_t     use_inorder_rx;
	uint8_t     use_inorder_tx;
	uint16_t    port_id;

error: patch failed: drivers/net/virtio/virtio_pci.h:238
error: drivers/net/virtio/virtio_pci.h: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx.c...
error: while searching for:

	PMD_INIT_FUNC_TRACE();

	/* cannot use simple rxtx funcs with multisegs or offloads */
	if (dev->data->dev_conf.txmode.offloads)
--

	if (nb_desc == 0 || nb_desc > vq->vq_nentries)
		nb_desc = vq->vq_nentries;
	vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc);

error: patch failed: drivers/net/virtio/virtio_rxtx.c:708
error: drivers/net/virtio/virtio_rxtx.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.c...
error: while searching for:
#pragma GCC diagnostic ignored "-Wcast-qual"
#endif

uint16_t
virtio_xmit_pkts_simple(void *tx_queue, struct rte_mbuf **tx_pkts,
--

int __attribute__((cold))
virtio_rxq_vec_setup(struct virtnet_rx *rxq)
{

error: patch failed: drivers/net/virtio/virtio_rxtx_simple.c:27
error: drivers/net/virtio/virtio_rxtx_simple.c: patch does not apply
Checking patch drivers/net/virtio/virtio_rxtx_simple.h...
error: while searching for:
	vq_update_avail_idx(vq);
}

#define VIRTIO_TX_FREE_THRESH 32
#define VIRTIO_TX_MAX_FREE_BUF_SZ 32
--
	vq->vq_free_cnt += (VIRTIO_TX_FREE_NR << 1);
}

#endif /* _VIRTIO_RXTX_SIMPLE_H_ */

error: patch failed: drivers/net/virtio/virtio_rxtx_simple.h:55
error: drivers/net/virtio/virtio_rxtx_simple.h: patch does not apply
Checking patch drivers/net/virtio/virtio_user_ethdev.c...
error: while searching for:
	hw->use_msix = 1;
	hw->modern   = 0;
	hw->use_simple_rx = 0;
	hw->use_simple_tx = 0;
	hw->use_inorder_rx = 0;
	hw->use_inorder_tx = 0;
	hw->virtio_user_dev = dev;

error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:436
error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply

DPDK STV team