Qemu feature set negotiation

Partial-bug: #1746578
Fix done in qemu. Reverting the workaround done in
dpdk vrouter.

Change-Id: I5c4e0a7c164818dde44829a070338cc3f87a0d6e

dpdk/vr_uvhost_msg.c

@@ -254,12 +254,7 @@ vr_uvmh_set_features(vr_uvh_client_t *vru_cl)
     if (dpdk_check_rx_mrgbuf_disable() == 1) {
         vif->vif_flags &= ~VIF_FLAG_MRG_RXBUF;
         vr_dpdk_set_vhost_send_func(vru_cl->vruc_idx, 0);
-    } else if ((!vru_cl->vruc_msg.u64) ||
-               (vru_cl->vruc_msg.u64 & (1ULL << VIRTIO_NET_F_MRG_RXBUF))) {
-       /* If features is 0, it's likely due to vrouter restart and VM's are
-        * already running.  In this case, make an assumption that VM was enabled
-        * with mergeable buffers earlier.
-        */
+    } else if ((vru_cl->vruc_msg.u64 & (1ULL << VIRTIO_NET_F_MRG_RXBUF))) {
         vif->vif_flags |= VIF_FLAG_MRG_RXBUF;
         vr_dpdk_set_vhost_send_func(vru_cl->vruc_idx, 1);
     } else {