X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_vnet.c;h=8d01d72dc6635db1d2b268e121276da20b80e6a9;hb=331eb3b042d3456e1eaf33eb9e32606774b715fb;hp=fe305c1f0e50ad97697e2b3defbe45e3fbd56288;hpb=b0b3857116addee47061617f8015381b4b29b666;p=palacios-OLD.git diff --git a/palacios/src/devices/lnx_virtio_vnet.c b/palacios/src/devices/lnx_virtio_vnet.c index fe305c1..8d01d72 100644 --- a/palacios/src/devices/lnx_virtio_vnet.c +++ b/palacios/src/devices/lnx_virtio_vnet.c @@ -75,7 +75,6 @@ struct vnet_ctrl_hdr { uint32_t num_cmds; } __attribute__((packed)); - struct vnet_virtio_pkt { uint32_t link_id; uint32_t pkt_size; @@ -136,7 +135,7 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * uint8_t status = 0; - PrintDebug("Descriptor Count=%d, index=%d, desc_idx=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE, desc_idx); + PrintDebug("VNET Bridge: CMD: Descriptor Count=%d, index=%d, desc_idx=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE, desc_idx); if (desc_cnt < 3) { PrintError("VNET Bridge cmd must include at least 3 descriptors (cnt=%d)\n", desc_cnt); @@ -166,7 +165,7 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * } // add route - PrintDebug("Adding VNET Route\n"); + PrintDebug("VNET Bridge: Adding VNET Route\n"); tmp_status = v3_vnet_add_route(*route); @@ -330,7 +329,6 @@ static int virtio_io_write(struct guest_info * core, uint16_t port, void * src, struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; int port_idx = port % vnet_state->io_range_size; - PrintDebug("VNET Bridge: VIRTIO VNET Write for port %d len=%d, value=%x\n", port, length, *(uint32_t *)src); PrintDebug("VNET Bridge: port idx=%d\n", port_idx); @@ -447,7 +445,7 @@ static int virtio_io_write(struct guest_info * core, uint16_t port, void * src, } -static int virtio_io_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * private_data) { +static int vnetbrg_io_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * private_data) { struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; int port_idx = port % vnet_state->io_range_size; @@ -613,6 +611,7 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { virtio_reset(vnet_state); + V3_Print("Registering Virtio device as vnet bridge\n"); v3_vnet_add_bridge(vm, vnet_pkt_input_cb, (void *)vnet_state); return 0;