Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/42103 _apply issues_ Submitter: Maxime Coquelin Date: 2018-07-02 15:25:47 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... Hunk #1 succeeded at 1793 (offset -5 lines). Hunk #2 succeeded at 1888 (offset -5 lines). Checking patch drivers/net/virtio/virtio_pci.h... error: while searching for: uint8_t use_simple_rx; uint8_t use_inorder_rx; uint8_t use_inorder_tx; uint16_t port_id; uint8_t mac_addr[ETHER_ADDR_LEN]; uint32_t notify_off_multiplier; error: patch failed: drivers/net/virtio/virtio_pci.h:240 error: drivers/net/virtio/virtio_pci.h: patch does not apply Checking patch drivers/net/virtio/virtio_rxtx.c... Hunk #1 succeeded at 225 (offset -122 lines). error: while searching for: static inline void virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie, int offload) { if (offload) { if (cookie->ol_flags & PKT_TX_TCP_SEG) error: patch failed: drivers/net/virtio/virtio_rxtx.c:364 error: drivers/net/virtio/virtio_rxtx.c: patch does not apply *Repo: dpdk-next-eventdev Checking patch drivers/net/virtio/virtio_ethdev.c... Hunk #1 succeeded at 1793 (offset -5 lines). Hunk #2 succeeded at 1888 (offset -5 lines). Checking patch drivers/net/virtio/virtio_pci.h... error: while searching for: uint8_t use_simple_rx; uint8_t use_inorder_rx; uint8_t use_inorder_tx; uint16_t port_id; uint8_t mac_addr[ETHER_ADDR_LEN]; uint32_t notify_off_multiplier; error: patch failed: drivers/net/virtio/virtio_pci.h:240 error: drivers/net/virtio/virtio_pci.h: patch does not apply Checking patch drivers/net/virtio/virtio_rxtx.c... Hunk #1 succeeded at 225 (offset -122 lines). error: while searching for: static inline void virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie, int offload) { if (offload) { if (cookie->ol_flags & PKT_TX_TCP_SEG) error: patch failed: drivers/net/virtio/virtio_rxtx.c:364 error: drivers/net/virtio/virtio_rxtx.c: patch does not apply *Repo: dpdk-next-net Checking patch drivers/net/virtio/virtio_ethdev.c... error: while searching for: rte_pci_register(&rte_virtio_pmd); } /* * Configure virtio device * It returns 0 on success. error: patch failed: drivers/net/virtio/virtio_ethdev.c:1798 error: drivers/net/virtio/virtio_ethdev.c: patch does not apply Checking patch drivers/net/virtio/virtio_pci.h... error: while searching for: #define _VIRTIO_PCI_H_ #include #include #include error: patch failed: drivers/net/virtio/virtio_pci.h:6 error: drivers/net/virtio/virtio_pci.h: patch does not apply Checking patch drivers/net/virtio/virtio_rxtx.c... error: while searching for: } } static inline int tx_offload_enabled(struct virtio_hw *hw) -- } /* avoid write operation when necessary, to lessen cache issues */ #define ASSIGN_UNLESS_EQUAL(var, val) do { \ error: patch failed: drivers/net/virtio/virtio_rxtx.c:347 error: drivers/net/virtio/virtio_rxtx.c: patch does not apply *Repo: dpdk-next-crypto Checking patch drivers/net/virtio/virtio_ethdev.c... Hunk #1 succeeded at 1793 (offset -5 lines). Hunk #2 succeeded at 1888 (offset -5 lines). Checking patch drivers/net/virtio/virtio_pci.h... error: while searching for: uint8_t use_simple_rx; uint8_t use_inorder_rx; uint8_t use_inorder_tx; uint16_t port_id; uint8_t mac_addr[ETHER_ADDR_LEN]; uint32_t notify_off_multiplier; error: patch failed: drivers/net/virtio/virtio_pci.h:240 error: drivers/net/virtio/virtio_pci.h: patch does not apply Checking patch drivers/net/virtio/virtio_rxtx.c... Hunk #1 succeeded at 225 (offset -122 lines). error: while searching for: static inline void virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie, int offload) { if (offload) { if (cookie->ol_flags & PKT_TX_TCP_SEG) error: patch failed: drivers/net/virtio/virtio_rxtx.c:364 error: drivers/net/virtio/virtio_rxtx.c: patch does not apply *Repo: dpdk-next-virtio Checking patch drivers/net/virtio/virtio_ethdev.c... error: while searching for: rte_pci_register(&rte_virtio_pmd); } /* * Configure virtio device * It returns 0 on success. error: patch failed: drivers/net/virtio/virtio_ethdev.c:1798 error: drivers/net/virtio/virtio_ethdev.c: patch does not apply Checking patch drivers/net/virtio/virtio_pci.h... error: while searching for: #define _VIRTIO_PCI_H_ #include #include #include error: patch failed: drivers/net/virtio/virtio_pci.h:6 error: drivers/net/virtio/virtio_pci.h: patch does not apply Checking patch drivers/net/virtio/virtio_rxtx.c... error: while searching for: } } static inline int tx_offload_enabled(struct virtio_hw *hw) -- } /* avoid write operation when necessary, to lessen cache issues */ #define ASSIGN_UNLESS_EQUAL(var, val) do { \ error: patch failed: drivers/net/virtio/virtio_rxtx.c:347 error: drivers/net/virtio/virtio_rxtx.c: patch does not apply DPDK STV team