Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vmxnet3: Move some definitions to header file
pvrdma setup requires vmxnet3 device on PCI function 0 and PVRDMA device on PCI function 1. pvrdma device needs to access vmxnet3 device object for several reasons: 1. Make sure PCI function 0 is vmxnet3. 2. To monitor vmxnet3 device state. 3. To configure node_guid accoring to vmxnet3 device's MAC address. To be able to access vmxnet3 device the definition of VMXNET3State is moved to a new header file. Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Reviewed-by: Dmitry Fleytman <dmitry.fleytman@gmail.com> Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
- Loading branch information
1 parent
2b05705
commit 317639a
Showing
2 changed files
with
134 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * QEMU VMWARE VMXNET3 paravirtual NIC | ||
| * | ||
| * Copyright (c) 2012 Ravello Systems LTD (http://ravellosystems.com) | ||
| * | ||
| * Developed by Daynix Computing LTD (http://www.daynix.com) | ||
| * | ||
| * Authors: | ||
| * Dmitry Fleytman <dmitry@daynix.com> | ||
| * Tamir Shomer <tamirs@daynix.com> | ||
| * Yan Vugenfirer <yan@daynix.com> | ||
| * | ||
| * This work is licensed under the terms of the GNU GPL, version 2. | ||
| * See the COPYING file in the top-level directory. | ||
| * | ||
| */ | ||
|
|
||
| #include "net/net.h" | ||
| #include "hw/net/vmxnet3.h" | ||
|
|
||
| #define TYPE_VMXNET3 "vmxnet3" | ||
| #define VMXNET3(obj) OBJECT_CHECK(VMXNET3State, (obj), TYPE_VMXNET3) | ||
|
|
||
| /* Device state and helper functions */ | ||
| #define VMXNET3_RX_RINGS_PER_QUEUE (2) | ||
|
|
||
| /* Cyclic ring abstraction */ | ||
| typedef struct { | ||
| hwaddr pa; | ||
| uint32_t size; | ||
| uint32_t cell_size; | ||
| uint32_t next; | ||
| uint8_t gen; | ||
| } Vmxnet3Ring; | ||
|
|
||
| typedef struct { | ||
| Vmxnet3Ring tx_ring; | ||
| Vmxnet3Ring comp_ring; | ||
|
|
||
| uint8_t intr_idx; | ||
| hwaddr tx_stats_pa; | ||
| struct UPT1_TxStats txq_stats; | ||
| } Vmxnet3TxqDescr; | ||
|
|
||
| typedef struct { | ||
| Vmxnet3Ring rx_ring[VMXNET3_RX_RINGS_PER_QUEUE]; | ||
| Vmxnet3Ring comp_ring; | ||
| uint8_t intr_idx; | ||
| hwaddr rx_stats_pa; | ||
| struct UPT1_RxStats rxq_stats; | ||
| } Vmxnet3RxqDescr; | ||
|
|
||
| typedef struct { | ||
| bool is_masked; | ||
| bool is_pending; | ||
| bool is_asserted; | ||
| } Vmxnet3IntState; | ||
|
|
||
| typedef struct { | ||
| PCIDevice parent_obj; | ||
| NICState *nic; | ||
| NICConf conf; | ||
| MemoryRegion bar0; | ||
| MemoryRegion bar1; | ||
| MemoryRegion msix_bar; | ||
|
|
||
| Vmxnet3RxqDescr rxq_descr[VMXNET3_DEVICE_MAX_RX_QUEUES]; | ||
| Vmxnet3TxqDescr txq_descr[VMXNET3_DEVICE_MAX_TX_QUEUES]; | ||
|
|
||
| /* Whether MSI-X support was installed successfully */ | ||
| bool msix_used; | ||
| hwaddr drv_shmem; | ||
| hwaddr temp_shared_guest_driver_memory; | ||
|
|
||
| uint8_t txq_num; | ||
|
|
||
| /* This boolean tells whether RX packet being indicated has to */ | ||
| /* be split into head and body chunks from different RX rings */ | ||
| bool rx_packets_compound; | ||
|
|
||
| bool rx_vlan_stripping; | ||
| bool lro_supported; | ||
|
|
||
| uint8_t rxq_num; | ||
|
|
||
| /* Network MTU */ | ||
| uint32_t mtu; | ||
|
|
||
| /* Maximum number of fragments for indicated TX packets */ | ||
| uint32_t max_tx_frags; | ||
|
|
||
| /* Maximum number of fragments for indicated RX packets */ | ||
| uint16_t max_rx_frags; | ||
|
|
||
| /* Index for events interrupt */ | ||
| uint8_t event_int_idx; | ||
|
|
||
| /* Whether automatic interrupts masking enabled */ | ||
| bool auto_int_masking; | ||
|
|
||
| bool peer_has_vhdr; | ||
|
|
||
| /* TX packets to QEMU interface */ | ||
| struct NetTxPkt *tx_pkt; | ||
| uint32_t offload_mode; | ||
| uint32_t cso_or_gso_size; | ||
| uint16_t tci; | ||
| bool needs_vlan; | ||
|
|
||
| struct NetRxPkt *rx_pkt; | ||
|
|
||
| bool tx_sop; | ||
| bool skip_current_tx_pkt; | ||
|
|
||
| uint32_t device_active; | ||
| uint32_t last_command; | ||
|
|
||
| uint32_t link_status_and_speed; | ||
|
|
||
| Vmxnet3IntState interrupt_states[VMXNET3_MAX_INTRS]; | ||
|
|
||
| uint32_t temp_mac; /* To store the low part first */ | ||
|
|
||
| MACAddr perm_mac; | ||
| uint32_t vlan_table[VMXNET3_VFT_SIZE]; | ||
| uint32_t rx_mode; | ||
| MACAddr *mcast_list; | ||
| uint32_t mcast_list_len; | ||
| uint32_t mcast_list_buff_size; /* needed for live migration. */ | ||
|
|
||
| /* Compatibility flags for migration */ | ||
| uint32_t compat_flags; | ||
| } VMXNET3State; |