From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by dpdk.org (Postfix) with ESMTP id DB7A96AB7 for ; Sat, 14 Jun 2014 03:08:25 +0200 (CEST) Received: by mail-pb0-f45.google.com with SMTP id rr13so74755pbb.18 for ; Fri, 13 Jun 2014 18:08:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:user-agent:date:from:to:subject :references:mime-version:content-type:content-disposition; bh=t5eg1xaLU22IYupoweWGHZMn0x87Nj0urNHXDetnf6g=; b=KO+WY0oukGFU9uJlFdf0Q8t+yGVcRuNIE8XaEj6WanErowarnzfRP6/KgihHUIDoT/ SXAYLip174CMqx6Am0tOoMUjZoKRfEZQY+ZcmMQs360kD1XvuRw4VzTTDkkH1n9af5Zr tXmRi0CGBn/Ig+RG1+F5b9PcsNuF7N3vmCcuZSkO4uHCi1NBd3rN67ReKu6VWRXdlUtO 5ACrFtwRnASm10nrv3D+O2dwARhE0e6Q0Qvx9gIf6BwvYo5vqVDT37AfrVjLtBT/YOqe /s7Yf0Nt6gpuXnB2JWcgyZVOiN47P2IMVI7DcBogiS12+mffV6QSqibpYJ4zLz7vvWq9 IXtQ== X-Gm-Message-State: ALoCoQkFxNmfR8/7YI9nO6QpPTykR5+Ilfip9Qe4IxuSnFQToj+3XrLD5ftFo6qeRcIq2Gy8l82M X-Received: by 10.66.159.34 with SMTP id wz2mr7177231pab.96.1402708120858; Fri, 13 Jun 2014 18:08:40 -0700 (PDT) Received: from localhost (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51]) by mx.google.com with ESMTPSA id wp3sm5809515pbc.67.2014.06.13.18.08.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jun 2014 18:08:39 -0700 (PDT) Message-Id: <20140614010830.928330667@networkplumber.org> User-Agent: quilt/0.63-1 Date: Fri, 13 Jun 2014 18:06:19 -0700 From: Stephen Hemminger To: dev@dpdk.org References: <20140614010617.902738763@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=virtio-ds-msgs.patch Subject: [dpdk-dev] [PATCH 2/8] virtio: dont double space log messages X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 01:08:26 -0000 PMD_INIT_LOG macro already adds a newline, no need to double space. --- lib/librte_pmd_virtio/virtio_ethdev.c | 98 +++++++++++++++++----------------- lib/librte_pmd_virtio/virtio_rxtx.c | 28 ++++----- lib/librte_pmd_virtio/virtqueue.h | 4 - 3 files changed, 66 insertions(+), 64 deletions(-) --- a/lib/librte_pmd_virtio/virtio_ethdev.c 2014-06-13 17:49:30.555627706 -0700 +++ b/lib/librte_pmd_virtio/virtio_ethdev.c 2014-06-13 17:49:51.979666329 -0700 @@ -111,13 +111,13 @@ virtio_send_command(struct virtqueue *vq if (!vq->hw->cvq) { PMD_INIT_LOG(ERR, - "%s(): Control queue is not supported.\n", + "%s(): Control queue is not supported.", __func__); return -1; } PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx = %d, status = %d, " - "vq->hw->cvq = %p vq = %p\n", + "vq->hw->cvq = %p vq = %p", vq->vq_desc_head_idx, status, vq->hw->cvq, vq); if ((vq->vq_free_cnt < ((uint32_t)pkt_num + 2)) || (pkt_num < 1)) @@ -160,7 +160,7 @@ virtio_send_command(struct virtqueue *vq vq_update_avail_ring(vq, head); vq_update_avail_idx(vq); - PMD_INIT_LOG(DEBUG, "vq->vq_queue_index = %d\n", vq->vq_queue_index); + PMD_INIT_LOG(DEBUG, "vq->vq_queue_index = %d", vq->vq_queue_index); virtqueue_notify(vq); @@ -191,7 +191,7 @@ virtio_send_command(struct virtqueue *vq vq->vq_free_cnt++; } - PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d\nvq->vq_desc_head_idx=%d\n", + PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d\nvq->vq_desc_head_idx=%d", vq->vq_free_cnt, vq->vq_desc_head_idx); memcpy(&result, vq->virtio_net_hdr_mz->addr, @@ -219,7 +219,7 @@ virtio_set_multiple_queues(struct rte_et if (ret) { PMD_INIT_LOG(ERR, "Multiqueue configured but send command " - "failed, this is too late now...\n"); + "failed, this is too late now..."); return -EINVAL; } @@ -244,24 +244,24 @@ int virtio_dev_queue_setup(struct rte_et /* Write the virtqueue index to the Queue Select Field */ VIRTIO_WRITE_REG_2(hw, VIRTIO_PCI_QUEUE_SEL, vtpci_queue_idx); - PMD_INIT_LOG(DEBUG, "selecting queue: %d\n", vtpci_queue_idx); + PMD_INIT_LOG(DEBUG, "selecting queue: %d", vtpci_queue_idx); /* * Read the virtqueue size from the Queue Size field * Always power of 2 and if 0 virtqueue does not exist */ vq_size = VIRTIO_READ_REG_2(hw, VIRTIO_PCI_QUEUE_NUM); - PMD_INIT_LOG(DEBUG, "vq_size: %d nb_desc:%d\n", vq_size, nb_desc); + PMD_INIT_LOG(DEBUG, "vq_size: %d nb_desc:%d", vq_size, nb_desc); if (nb_desc == 0) nb_desc = vq_size; if (vq_size == 0) { - PMD_INIT_LOG(ERR, "%s: virtqueue does not exist\n", __func__); + PMD_INIT_LOG(ERR, "%s: virtqueue does not exist", __func__); return -EINVAL; } else if (!rte_is_power_of_2(vq_size)) { - PMD_INIT_LOG(ERR, "%s: virtqueue size is not powerof 2\n", __func__); + PMD_INIT_LOG(ERR, "%s: virtqueue size is not powerof 2", __func__); return -EINVAL; } else if (nb_desc != vq_size) { - PMD_INIT_LOG(ERR, "Warning: nb_desc(%d) is not equal to vq size (%d), fall to vq size\n", + PMD_INIT_LOG(ERR, "Warning: nb_desc(%d) is not equal to vq size (%d), fall to vq size", nb_desc, vq_size); nb_desc = vq_size; } @@ -287,7 +287,7 @@ int virtio_dev_queue_setup(struct rte_et memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name)); } if (vq == NULL) { - PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue\n", __func__); + PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue", __func__); return (-ENOMEM); } @@ -304,7 +304,7 @@ int virtio_dev_queue_setup(struct rte_et */ size = vring_size(vq_size, VIRTIO_PCI_VRING_ALIGN); vq->vq_ring_size = RTE_ALIGN_CEIL(size, VIRTIO_PCI_VRING_ALIGN); - PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d\n", size, vq->vq_ring_size); + PMD_INIT_LOG(DEBUG, "vring_size: %d, rounded_vring_size: %d", size, vq->vq_ring_size); mz = rte_memzone_reserve_aligned(vq_name, vq->vq_ring_size, socket_id, 0, VIRTIO_PCI_VRING_ALIGN); @@ -319,7 +319,7 @@ int virtio_dev_queue_setup(struct rte_et * Check if the allocated physical memory exceeds 16TB. */ if ((mz->phys_addr + vq->vq_ring_size - 1) >> (VIRTIO_PCI_QUEUE_ADDR_SHIFT + 32)) { - PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!\n"); + PMD_INIT_LOG(ERR, "vring address shouldn't be above 16TB!"); rte_free(vq); return -ENOMEM; } @@ -328,8 +328,8 @@ int virtio_dev_queue_setup(struct rte_et vq->mz = mz; vq->vq_ring_mem = mz->phys_addr; vq->vq_ring_virt_mem = mz->addr; - PMD_INIT_LOG(DEBUG, "vq->vq_ring_mem: 0x%"PRIx64"\n", (uint64_t)mz->phys_addr); - PMD_INIT_LOG(DEBUG, "vq->vq_ring_virt_mem: 0x%"PRIx64"\n", (uint64_t)mz->addr); + PMD_INIT_LOG(DEBUG, "vq->vq_ring_mem: 0x%"PRIx64"", (uint64_t)mz->phys_addr); + PMD_INIT_LOG(DEBUG, "vq->vq_ring_virt_mem: 0x%"PRIx64"", (uint64_t)mz->addr); vq->virtio_net_hdr_mz = NULL; vq->virtio_net_hdr_mem = (void *)NULL; @@ -390,7 +390,7 @@ virtio_dev_cq_queue_setup(struct rte_eth vtpci_queue_idx, nb_desc, socket_id, &vq); if (ret < 0) { - PMD_INIT_LOG(ERR, "control vq initialization failed\n"); + PMD_INIT_LOG(ERR, "control vq initialization failed"); return ret; } @@ -582,12 +582,12 @@ virtio_negotiate_features(struct virtio_ /* Prepare guest_features: feature that driver wants to support */ guest_features = VTNET_FEATURES & ~mask; - PMD_INIT_LOG(DEBUG, "guest_features before negotiate = %x\n", + PMD_INIT_LOG(DEBUG, "guest_features before negotiate = %x", guest_features); /* Read device(host) feature bits */ hw->host_features = VIRTIO_READ_REG_4(hw, VIRTIO_PCI_HOST_FEATURES); - PMD_INIT_LOG(DEBUG, "host_features before negotiate = %x\n", + PMD_INIT_LOG(DEBUG, "host_features before negotiate = %x", hw->host_features); /* @@ -595,7 +595,7 @@ virtio_negotiate_features(struct virtio_ * guest feature bits. */ hw->guest_features = vtpci_negotiate_features(hw, guest_features); - PMD_INIT_LOG(DEBUG, "features after negotiate = %x\n", + PMD_INIT_LOG(DEBUG, "features after negotiate = %x", hw->guest_features); } @@ -609,20 +609,20 @@ parse_sysfs_value(const char *filename, f = fopen(filename, "r"); if (f == NULL) { - PMD_INIT_LOG(ERR, "%s(): cannot open sysfs value %s\n", + PMD_INIT_LOG(ERR, "%s(): cannot open sysfs value %s", __func__, filename); return -1; } if (fgets(buf, sizeof(buf), f) == NULL) { - PMD_INIT_LOG(ERR, "%s(): cannot read sysfs value %s\n", + PMD_INIT_LOG(ERR, "%s(): cannot read sysfs value %s", __func__, filename); fclose(f); return -1; } *val = strtoul(buf, &end, 0); if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) { - PMD_INIT_LOG(ERR, "%s(): cannot parse sysfs value %s\n", + PMD_INIT_LOG(ERR, "%s(): cannot parse sysfs value %s", __func__, filename); fclose(f); return -1; @@ -652,7 +652,7 @@ static int get_uio_dev(struct rte_pci_ad dir = opendir(dirname); if (dir == NULL) { - PMD_INIT_LOG(ERR, "Cannot opendir %s\n", dirname); + PMD_INIT_LOG(ERR, "Cannot opendir %s", dirname); return -1; } } @@ -689,7 +689,7 @@ static int get_uio_dev(struct rte_pci_ad /* No uio resource found */ if (e == NULL) { - PMD_INIT_LOG(ERR, "Could not find uio resource\n"); + PMD_INIT_LOG(ERR, "Could not find uio resource"); return -1; } @@ -748,7 +748,7 @@ eth_virtio_dev_init(__rte_unused struct rte_snprintf(filename, sizeof(filename), "%s/portio/port0/size", dirname); if (parse_sysfs_value(filename, &size) < 0) { - PMD_INIT_LOG(ERR, "%s(): cannot parse size\n", + PMD_INIT_LOG(ERR, "%s(): cannot parse size", __func__); return -1; } @@ -757,14 +757,14 @@ eth_virtio_dev_init(__rte_unused struct rte_snprintf(filename, sizeof(filename), "%s/portio/port0/start", dirname); if (parse_sysfs_value(filename, &start) < 0) { - PMD_INIT_LOG(ERR, "%s(): cannot parse portio start\n", + PMD_INIT_LOG(ERR, "%s(): cannot parse portio start", __func__); return -1; } pci_dev->mem_resource[0].addr = (void *)(uintptr_t)start; pci_dev->mem_resource[0].len = (uint64_t)size; PMD_INIT_LOG(DEBUG, - "PCI Port IO found start=0x%lx with size=0x%lx\n", + "PCI Port IO found start=0x%lx with size=0x%lx", start, size); } #endif @@ -800,7 +800,7 @@ eth_virtio_dev_init(__rte_unused struct ether_addr_copy((struct ether_addr *) hw->mac_addr, ð_dev->data->mac_addrs[0]); PMD_INIT_LOG(DEBUG, - "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", + "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X", hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); @@ -811,7 +811,7 @@ eth_virtio_dev_init(__rte_unused struct offset_conf += sizeof(config->status); } else { PMD_INIT_LOG(DEBUG, - "VIRTIO_NET_F_STATUS is not supported\n"); + "VIRTIO_NET_F_STATUS is not supported"); config->status = 0; } @@ -819,7 +819,7 @@ eth_virtio_dev_init(__rte_unused struct offset_conf += sizeof(config->max_virtqueue_pairs); } else { PMD_INIT_LOG(DEBUG, - "VIRTIO_NET_F_MQ is not supported\n"); + "VIRTIO_NET_F_MQ is not supported"); config->max_virtqueue_pairs = 1; } @@ -836,11 +836,11 @@ eth_virtio_dev_init(__rte_unused struct config->max_virtqueue_pairs * 2, SOCKET_ID_ANY); - PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=%d\n", + PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=%d", config->max_virtqueue_pairs); - PMD_INIT_LOG(DEBUG, "config->status=%d\n", config->status); + PMD_INIT_LOG(DEBUG, "config->status=%d", config->status); PMD_INIT_LOG(DEBUG, - "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", + "PORT MAC: %02X:%02X:%02X:%02X:%02X:%02X", config->mac[0], config->mac[1], config->mac[2], config->mac[3], config->mac[4], config->mac[5]); @@ -852,7 +852,7 @@ eth_virtio_dev_init(__rte_unused struct eth_dev->data->nb_rx_queues = hw->max_rx_queues; eth_dev->data->nb_tx_queues = hw->max_tx_queues; - PMD_INIT_LOG(DEBUG, "hw->max_rx_queues=%d hw->max_tx_queues=%d\n", + PMD_INIT_LOG(DEBUG, "hw->max_rx_queues=%d hw->max_tx_queues=%d", hw->max_rx_queues, hw->max_tx_queues); PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x", eth_dev->data->port_id, pci_dev->id.vendor_id, @@ -934,10 +934,12 @@ virtio_dev_start(struct rte_eth_dev *dev offsetof(struct virtio_net_config, status), &status, sizeof(status)); if ((status & VIRTIO_NET_S_LINK_UP) == 0) { - PMD_INIT_LOG(ERR, "Port: %d Link is DOWN\n", dev->data->port_id); + PMD_INIT_LOG(ERR, "Port: %d Link is DOWN", + dev->data->port_id); return -EIO; } else { - PMD_INIT_LOG(DEBUG, "Port: %d Link is UP\n", dev->data->port_id); + PMD_INIT_LOG(DEBUG, "Port: %d Link is UP", + dev->data->port_id); } } vtpci_reinit_complete(hw); @@ -952,12 +954,12 @@ virtio_dev_start(struct rte_eth_dev *dev return -EINVAL; } - PMD_INIT_LOG(DEBUG, "nb_queues=%d\n", nb_queues); + PMD_INIT_LOG(DEBUG, "nb_queues=%d", nb_queues); for (i = 0; i < nb_queues; i++) virtqueue_notify(dev->data->rx_queues[i]); - PMD_INIT_LOG(DEBUG, "Notified backend at initialization\n"); + PMD_INIT_LOG(DEBUG, "Notified backend at initialization"); for (i = 0; i < dev->data->nb_rx_queues; i++) VIRTQUEUE_DUMP((struct virtqueue *)dev->data->rx_queues[i]); @@ -975,7 +977,7 @@ static void virtio_dev_free_mbufs(struct for (i = 0; i < dev->data->nb_rx_queues; i++) { PMD_INIT_LOG(DEBUG, - "Before freeing rxq[%d] used and unused buf\n", i); + "Before freeing rxq[%d] used and unused buf", i); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->rx_queues[i]); while ((buf = (struct rte_mbuf *)virtqueue_detatch_unused( @@ -984,15 +986,15 @@ static void virtio_dev_free_mbufs(struct mbuf_num++; } - PMD_INIT_LOG(DEBUG, "free %d mbufs\n", mbuf_num); + PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num); PMD_INIT_LOG(DEBUG, - "After freeing rxq[%d] used and unused buf\n", i); + "After freeing rxq[%d] used and unused buf", i); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->rx_queues[i]); } for (i = 0; i < dev->data->nb_tx_queues; i++) { PMD_INIT_LOG(DEBUG, - "Before freeing txq[%d] used and unused bufs\n", + "Before freeing txq[%d] used and unused bufs", i); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->tx_queues[i]); @@ -1003,9 +1005,9 @@ static void virtio_dev_free_mbufs(struct mbuf_num++; } - PMD_INIT_LOG(DEBUG, "free %d mbufs\n", mbuf_num); - PMD_INIT_LOG(DEBUG, "After freeing txq[%d] used and " - "unused buf\n", i); + PMD_INIT_LOG(DEBUG, "free %d mbufs", mbuf_num); + PMD_INIT_LOG(DEBUG, + "After freeing txq[%d] used and unused buf", i); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->tx_queues[i]); } } @@ -1037,17 +1039,17 @@ virtio_dev_link_update(struct rte_eth_de link.link_duplex = FULL_DUPLEX; link.link_speed = SPEED_10G; if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) { - PMD_INIT_LOG(DEBUG, "Get link status from hw\n"); + PMD_INIT_LOG(DEBUG, "Get link status from hw"); vtpci_read_dev_config(hw, offsetof(struct virtio_net_config, status), &status, sizeof(status)); if ((status & VIRTIO_NET_S_LINK_UP) == 0) { link.link_status = 0; - PMD_INIT_LOG(DEBUG, "Port %d is down\n", + PMD_INIT_LOG(DEBUG, "Port %d is down", dev->data->port_id); } else { link.link_status = 1; - PMD_INIT_LOG(DEBUG, "Port %d is up\n", + PMD_INIT_LOG(DEBUG, "Port %d is up", dev->data->port_id); } } else { --- a/lib/librte_pmd_virtio/virtio_rxtx.c 2014-06-13 17:49:30.555627706 -0700 +++ b/lib/librte_pmd_virtio/virtio_rxtx.c 2014-06-13 17:51:46.851876291 -0700 @@ -105,13 +105,13 @@ virtio_dev_vring_start(struct rte_eth_de rte_snprintf(vq_name, sizeof(vq_name), "port_%d_rx_vq", dev->data->port_id); - PMD_INIT_LOG(DEBUG, "vq name: %s\n", vq->vq_name); + PMD_INIT_LOG(DEBUG, "vq name: %s", vq->vq_name); /* Only rx virtqueue needs mbufs to be allocated at initialization */ if (queue_type == VTNET_RQ) { if (vq->mpool == NULL) rte_exit(EXIT_FAILURE, - "Cannot allocate initial mbufs for rx virtqueue\n"); + "Cannot allocate initial mbufs for rx virtqueue"); /* Allocate blank mbufs for the each rx descriptor */ nbufs = 0; @@ -135,7 +135,7 @@ virtio_dev_vring_start(struct rte_eth_de vq_update_avail_idx(vq); - PMD_INIT_LOG(DEBUG, "Allocated %d bufs\n", nbufs); + PMD_INIT_LOG(DEBUG, "Allocated %d bufs", nbufs); VIRTIO_WRITE_REG_2(vq->hw, VIRTIO_PCI_QUEUE_SEL, vq->vq_queue_index); @@ -207,7 +207,7 @@ virtio_dev_rx_queue_setup(struct rte_eth ret = virtio_dev_queue_setup(dev, VTNET_RQ, queue_idx, vtpci_queue_idx, nb_desc, socket_id, &vq); if (ret < 0) { - PMD_INIT_LOG(ERR, "tvq initialization failed\n"); + PMD_INIT_LOG(ERR, "tvq initialization failed"); return ret; } @@ -240,7 +240,7 @@ virtio_dev_tx_queue_setup(struct rte_eth ret = virtio_dev_queue_setup(dev, VTNET_TQ, queue_idx, vtpci_queue_idx, nb_desc, socket_id, &vq); if (ret < 0) { - PMD_INIT_LOG(ERR, "rvq initialization failed\n"); + PMD_INIT_LOG(ERR, "rvq initialization failed"); return ret; } @@ -290,15 +290,15 @@ virtio_recv_pkts(void *rx_queue, struct return 0; num = virtqueue_dequeue_burst_rx(rxvq, rcv_pkts, len, num); - PMD_RX_LOG(DEBUG, "used:%d dequeue:%d\n", nb_used, num); + PMD_RX_LOG(DEBUG, "used:%d dequeue:%d", nb_used, num); for (i = 0; i < num ; i++) { rxm = rcv_pkts[i]; - PMD_RX_LOG(DEBUG, "packet len:%d\n", len[i]); + PMD_RX_LOG(DEBUG, "packet len:%d", len[i]); if (unlikely(len[i] < (uint32_t)hw->vtnet_hdr_size + ETHER_HDR_LEN)) { - PMD_RX_LOG(ERR, "Packet drop\n"); + PMD_RX_LOG(ERR, "Packet drop"); nb_enqueued++; virtio_discard_rxbuf(rxvq, rxm); rxvq->errors++; @@ -342,7 +342,7 @@ virtio_recv_pkts(void *rx_queue, struct if (likely(nb_enqueued)) { if (unlikely(virtqueue_kick_prepare(rxvq))) { virtqueue_notify(rxvq); - PMD_RX_LOG(DEBUG, "Notified\n"); + PMD_RX_LOG(DEBUG, "Notified"); } } @@ -383,17 +383,17 @@ virtio_xmit_pkts(void *tx_queue, struct error = virtqueue_enqueue_xmit(txvq, txm); if (unlikely(error)) { if (error == ENOSPC) - PMD_TX_LOG(ERR, "virtqueue_enqueue Free count = 0\n"); + PMD_TX_LOG(ERR, "virtqueue_enqueue Free count = 0"); else if (error == EMSGSIZE) - PMD_TX_LOG(ERR, "virtqueue_enqueue Free count < 1\n"); + PMD_TX_LOG(ERR, "virtqueue_enqueue Free count < 1"); else - PMD_TX_LOG(ERR, "virtqueue_enqueue error: %d\n", error); + PMD_TX_LOG(ERR, "virtqueue_enqueue error: %d", error); break; } nb_tx++; txvq->bytes += txm->pkt.data_len; } else { - PMD_TX_LOG(ERR, "No free tx descriptors to transmit\n"); + PMD_TX_LOG(ERR, "No free tx descriptors to transmit"); break; } } @@ -403,7 +403,7 @@ virtio_xmit_pkts(void *tx_queue, struct if (unlikely(virtqueue_kick_prepare(txvq))) { virtqueue_notify(txvq); - PMD_TX_LOG(DEBUG, "Notified backend after xmit\n"); + PMD_TX_LOG(DEBUG, "Notified backend after xmit"); } return nb_tx; --- a/lib/librte_pmd_virtio/virtqueue.h 2014-06-13 17:49:30.555627706 -0700 +++ b/lib/librte_pmd_virtio/virtqueue.h 2014-06-13 17:51:51.475884843 -0700 @@ -393,7 +393,7 @@ virtqueue_dequeue_burst_rx(struct virtqu cookie = (struct rte_mbuf *)vq->vq_descx[desc_idx].cookie; if (unlikely(cookie == NULL)) { - PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u\n", + PMD_DRV_LOG(ERR, "vring descriptor with no mbuf cookie at %u", vq->vq_used_cons_idx); break; } @@ -432,7 +432,7 @@ virtqueue_dequeue_pkt_tx(struct virtqueu PMD_INIT_LOG(DEBUG, \ "VQ: %s - size=%d; free=%d; used=%d; desc_head_idx=%d;" \ " avail.idx=%d; used_cons_idx=%d; used.idx=%d;" \ - " avail.flags=0x%x; used.flags=0x%x\n", \ + " avail.flags=0x%x; used.flags=0x%x", \ (vq)->vq_name, (vq)->vq_nentries, (vq)->vq_free_cnt, nused, \ (vq)->vq_desc_head_idx, (vq)->vq_ring.avail->idx, \ (vq)->vq_used_cons_idx, (vq)->vq_ring.used->idx, \