Basic HRT startup for HVM, plus assorted cleanup

[palacios.git] / palacios / src / devices / vnet_nic.c

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index 0fdaaba..31c026d 100644 (file)
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -19,7 +19,7 @@
  */
 //backend device for Virtio NIC
 
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/lnx_virtio_pci.h>
@@ -28,7 +28,7 @@
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_ethernet.h>
 
-#ifndef CONFIG_DEBUG_VNET_NIC
+#ifndef V3_CONFIG_DEBUG_VNET_NIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -52,38 +52,36 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len,
     memcpy(pkt.header, buf, ETHERNET_HEADER_LEN);
     pkt.data = buf;
 
-#ifdef CONFIG_DEBUG_VNET_NIC
-    {
-       PrintDebug("VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", 
+    V3_Net_Print(2, "VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", 
                   pkt.size, pkt.src_id, pkt.src_type);
-       v3_hexdump(buf, len, NULL, 0);
+    if(net_debug >= 4){
+       v3_hexdump(buf, len, NULL, 0);
     }
-#endif
 
-    return v3_vnet_send_pkt(&pkt, NULL);;
+    return v3_vnet_send_pkt(&pkt, NULL);
 }
 
 
 /* send pkt to frontend device */
-static int virtio_input(struct v3_vm_info * info, 
+static int fnt_input(struct v3_vm_info * info, 
                        struct v3_vnet_pkt * pkt, 
                        void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    PrintDebug("VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", 
+    V3_Net_Print(2, "VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", 
                pkt->size, pkt->src_id, pkt->src_type, pkt->dst_id, pkt->dst_type);
        
     return vnetnic->net_ops.recv(pkt->data, pkt->size,
-                                vnetnic->net_ops.frontend_data);
+                                vnetnic->net_ops.config.frontend_data);
 }
 
-/* poll data from front-end */
-static void virtio_poll(struct v3_vm_info * info, 
-                       int budget,
-                       void * private_data){
+
+/* poll pkt from frontend device */
+static int fnt_poll(struct v3_vm_info * info,
+                       int quote, void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    vnetnic->net_ops.poll(info, budget, vnetnic->net_ops.frontend_data);
+    return vnetnic->net_ops.poll(quote, vnetnic->net_ops.config.frontend_data);
 }
 
 
@@ -101,8 +99,8 @@ static struct v3_device_ops dev_ops = {
 };
 
 static struct v3_vnet_dev_ops vnet_dev_ops = {
-    .input = virtio_input,
-    .poll = virtio_poll,
+    .input = fnt_input,
+    .poll = fnt_poll,
 };
 
 
@@ -113,12 +111,23 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
 
+    if (!frontend_cfg || !(v3_cfg_val(frontend_cfg, "tag"))) { 
+       PrintError(vm, VCORE_NONE, "No frontend config specified, or frontend has no tag\n");
+       return -1;
+    }
+
     vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state));
+
+    if (!vnetnic) {
+       PrintError(vm, VCORE_NONE, "Cannot allocate in init\n");
+       return -1;
+    }
+
     memset(vnetnic, 0, sizeof(struct vnet_nic_state));
 
     struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, vnetnic);
     if (dev == NULL) {
-       PrintError("Could not attach device %s\n", dev_id);
+       PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
        V3_Free(vnetnic);
        return -1;
     }
@@ -128,17 +137,19 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        
     if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), 
                           &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) {
-       PrintError("Could not connect %s to frontend %s\n", 
+       PrintError(vm, VCORE_NONE, "Could not connect %s to frontend %s\n", 
                   dev_id, v3_cfg_val(frontend_cfg, "tag"));
        v3_remove_device(dev);
        return -1;
     }
 
-    PrintDebug("Vnet-nic: Connect %s to frontend %s\n", 
-             dev_id, v3_cfg_val(frontend_cfg, "tag"));
+    PrintDebug(vm, VCORE_NONE, "Vnet-nic: Connect %s to frontend %s\n", 
+              dev_id, v3_cfg_val(frontend_cfg, "tag"));
 
-    if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.fnt_mac, &vnet_dev_ops, (void *)vnetnic)) == -1) {
-       PrintError("Vnet-nic device %s fails to registered to VNET\n", dev_id);
+    if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.config.fnt_mac, 
+                                      &vnet_dev_ops, vnetnic->net_ops.config.quote, 
+                                      vnetnic->net_ops.config.poll, (void *)vnetnic)) == -1) {
+       PrintError(vm, VCORE_NONE, "Vnet-nic device %s fails to registered to VNET\n", dev_id);
        
        v3_remove_device(dev);
        return 0;