Vmxnet3 VMStatification
cover Vmxnet3 VMStatification
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This patchset converts most of vmxnet3 to VMState; the
only bit remaining is the msix section (which is what I'm actually interested in cleaning up since it's one of the last few users of register_savevm - but it'll have to wait).
Note a migration test with this on completes, but isn't passing traffic; but neither is a world without this change.
Dave
Dr. David Alan Gilbert (2):
vmxnet3: Convert ring values to uint32_t's
vmxnet3: VMStatify rx/tx q_descr and int_state
hw/net/vmxnet3.c | 284 +++++++++++++++++++------------------------------------ 1 file changed, 96 insertions(+), 188 deletions(-)
Signature · 1 line
2.9.3
PATCH 1/2 vmxnet3: Convert ring values to uint32_t's
From: "Dr. David Alan Gilbert" <[email protected]>
The index's in the Vmxnet3Ring were migrated as 32bit ints yet are declared as size_t's. They appear to be derived from 32bit values loaded from guest memory, so actually store them as that.
--- hw/net/vmxnet3.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/net/vmxnet3.c +6 -6
@@ -141,17 +141,17 @@ typedef struct VMXNET3Class {/* Cyclic ring abstraction */ typedef struct {hwaddr pa; -size_t size; -size_t cell_size; -size_t next; +uint32_t size; +uint32_t cell_size; +uint32_t next;uint8_t gen; }Vmxnet3Ring ;static inline void vmxnet3_ring_init (PCIDevice *d,Vmxnet3Ring *ring,hwaddr pa, -size_t size, -size_t cell_size, +uint32_t size, +uint32_t cell_size,bool zero_region) { ring->pa = pa;
@@ -166,7 +166,7 @@ static inline void vmxnet3_ring_init(PCIDevice *d, }#define VMXNET3_RING_DUMP (macro, ring_name, ridx, r) \ - macro("%s#%d: base %" PRIx64 " size %zu cell_size %zu gen %d next %zu", \ + macro("%s#%d: base %" PRIx64 " size %u cell_size %u gen %d next %u", \ (ring_name), (ridx), \ (r)->pa, (r)->size, (r)->cell_size, (r)->gen, (r)->next)
Signature · 1 line
2.9.3
PATCH 2/2 vmxnet3: VMStatify rx/tx q_descr and int_state
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared as size_t but written as 32bit.
--- hw/net/vmxnet3.c | 272 ++++++++++++++++++------------------------------------- 1 file changed, 90 insertions(+), 182 deletions(-)
hw/net/vmxnet3.c +90 -182
@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {
@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)
@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , -0 , int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),VMSTATE_END_OF_LIST () },
Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.
Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Dave
Quoted 315 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- hw/net/vmxnet3.c | 272 ++++++++++++++++++------------------------------------- 1 file changed, 90 insertions(+), 182 deletions(-)hw/net/vmxnet3.c +90
-182@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , -0 , int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),VMSTATE_END_OF_LIST () },Signature · 1 line
2.9.3
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Dmitry Fleytman
Acked-byRe: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
Quoted 6 lines · Dr. David Alan Gilbert
Quoted 2 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Quoted 8 lines
Quoted 5 lines
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Quoted 320 lines
Dave
Quoted 315 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
hw/net/vmxnet3.c| 272 ++++++++++++++++++-------------------------------------1 file changed, 90 insertions(+), 182 deletions(-)hw/net/vmxnet3.c +90
-182@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , -0 , int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),VMSTATE_END_OF_LIST () },Signature · 1 line
2.9.3--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [Qemu-devel] [PATCH 1/2] vmxnet3: Convert ring values to uint32_t's
In reply to Dr. David Alan Gilbert (git)Quoted 53 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
The index's in the Vmxnet3Ring were migrated as 32bit ints yet are declared as size_t's. They appear to be derived from 32bit values loaded from guest memory, so actually store them as that.
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
hw/net/vmxnet3.c| 12 ++++++------1 file changed, 6 insertions(+), 6 deletions(-)hw/net/vmxnet3.c +6
-6@@ -141,17 +141,17 @@ typedef struct VMXNET3Class {/* Cyclic ring abstraction */ typedef struct {hwaddr pa; -size_t size; -size_t cell_size; -size_t next; +uint32_t size; +uint32_t cell_size; +uint32_t next;uint8_t gen; }Vmxnet3Ring ;static inline void vmxnet3_ring_init (PCIDevice *d,Vmxnet3Ring *ring,hwaddr pa, -size_t size, -size_t cell_size, +uint32_t size, +uint32_t cell_size,bool zero_region) { ring->pa = pa;@@ -166,7 +166,7 @@ static inline void vmxnet3_ring_init(PCIDevice *d, }#define VMXNET3_RING_DUMP (macro, ring_name, ridx, r) \ - macro("%s#%d: base %" PRIx64 " size %zu cell_size %zu gen %d next %zu", \ + macro("%s#%d: base %" PRIx64 " size %u cell_size %u gen %d next %u", \ (ring_name), (ridx), \ (r)->pa, (r)->size, (r)->cell_size, (r)->gen, (r)->next)Signature · 1 line
2.9.3
Re: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
In reply to Dmitry FleytmanQuoted 12 lines · * Dmitry Fleytman ([email protected]) wrote:
Quoted 12 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.
Quoted 6 lines
Quoted 2 lines
Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Acked-by Dmitry Fleytman <[email protected]>
Any reason for Acked-by rather than Reviewed-by ?
Are you going to pull those?
Dave
Quoted 313 lines
Quoted 313 lines
Dave
Quoted 309 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
hw/net/vmxnet3.c| 272 ++++++++++++++++++-------------------------------------1 file changed, 90 insertions(+), 182 deletions(-)hw/net/vmxnet3.c +90
-182@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , - 0, int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),
Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
hw/net/vmxnet3.c +0
-0VMSTATE_END_OF_LIST () },Signature · 1 line
2.9.3--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Dmitry Fleytman
Reviewed-byRe: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
Quoted 21 lines · Dr. David Alan Gilbert
Quoted 17 lines · * Dmitry Fleytman ([email protected] <mailto:[email protected]>) wrote:
Quoted 14 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Quoted 4 lines
Quoted 1 line
Acked-by Dmitry Fleytman <[email protected]>Any reason for Acked-by rather than Reviewed-by ?
Are you going to pull those?
Hi,
There is no specific reason, the patch is OK as for me.
Jason, would you pick up this patch?
~Dmitry
Quoted 327 lines
Dave
Quoted 313 lines
Quoted 313 lines
Dave
Quoted 309 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
hw/net/vmxnet3.c| 272 ++++++++++++++++++-------------------------------------1 file changed, 90 insertions(+), 182 deletions(-)hw/net/vmxnet3.c +90
-182@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , - 0, int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
hw/net/vmxnet3.c +0
-0VMSTATE_END_OF_LIST () },Signature · 1 line
2.9.3--
Dr. David Alan Gilbert / [email protected] / Manchester, UK--
Dr. David Alan Gilbert / [email protected] <mailto:[email protected]> / Manchester, UK
Re: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
Quoted 26 lines · * Dmitry Fleytman ([email protected]) wrote:
Quoted 21 lines · Dr. David Alan Gilbert
Quoted 17 lines · * Dmitry Fleytman ([email protected] <mailto:[email protected]>) wrote:
Quoted 14 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Quoted 4 lines
Quoted 1 line
Acked-by Dmitry Fleytman <[email protected]>Any reason for Acked-by rather than Reviewed-by ?
Are you going to pull those?
Quoted 6 lines
Hi,
There is no specific reason, the patch is OK as for me.
Reviewed-by Dmitry Fleytman <[email protected]>Jason, would you pick up this patch?
Hi Jason,
Did you see ^^^^
Dave
Quoted 330 lines
~Dmitry
Quoted 327 lines
Dave
Quoted 313 lines
Quoted 313 lines
Dave
Quoted 309 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>---
hw/net/vmxnet3.c| 272 ++++++++++++++++++-------------------------------------1 file changed, 90 insertions(+), 182 deletions(-)hw/net/vmxnet3.c +90
-182@@ -2403,155 +2403,87 @@ static const VMStateDescription vmxstate_vmxnet3_mcast_list = { } }; -static void vmxnet3_get_ring_from_file (QEMUFile *f,Vmxnet3Ring *r) -{ - r->pa =qemu_get_be64 (f); - r->size =qemu_get_be32 (f); - r->cell_size =qemu_get_be32 (f); - r->next =qemu_get_be32 (f); - r->gen =qemu_get_byte (f); -} - -static void vmxnet3_put_ring_to_file (QEMUFile *f,Vmxnet3Ring *r) -{ -qemu_put_be64 (f, r->pa); -qemu_put_be32 (f, r->size); -qemu_put_be32 (f, r->cell_size); -qemu_put_be32 (f, r->next); -qemu_put_byte (f, r->gen); -} - -static void vmxnet3_get_tx_stats_from_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ - tx_stat->TSOPktsTxOK =qemu_get_be64 (f); - tx_stat->TSOBytesTxOK =qemu_get_be64 (f); - tx_stat->ucastPktsTxOK =qemu_get_be64 (f); - tx_stat->ucastBytesTxOK =qemu_get_be64 (f); - tx_stat->mcastPktsTxOK =qemu_get_be64 (f); - tx_stat->mcastBytesTxOK =qemu_get_be64 (f); - tx_stat->bcastPktsTxOK =qemu_get_be64 (f); - tx_stat->bcastBytesTxOK =qemu_get_be64 (f); - tx_stat->pktsTxError =qemu_get_be64 (f); - tx_stat->pktsTxDiscard =qemu_get_be64 (f); -} - -static void vmxnet3_put_tx_stats_to_file (QEMUFile *f, -struct UPT1_TxStats *tx_stat) -{ -qemu_put_be64 (f, tx_stat->TSOPktsTxOK); -qemu_put_be64 (f, tx_stat->TSOBytesTxOK); -qemu_put_be64 (f, tx_stat->ucastPktsTxOK); -qemu_put_be64 (f, tx_stat->ucastBytesTxOK); -qemu_put_be64 (f, tx_stat->mcastPktsTxOK); -qemu_put_be64 (f, tx_stat->mcastBytesTxOK); -qemu_put_be64 (f, tx_stat->bcastPktsTxOK); -qemu_put_be64 (f, tx_stat->bcastBytesTxOK); -qemu_put_be64 (f, tx_stat->pktsTxError); -qemu_put_be64 (f, tx_stat->pktsTxDiscard); -} - -static int vmxnet3_get_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_get_ring_from_file (f, &r->tx_ring); -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->tx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_tx_stats_from_file (f, &r->txq_stats); - -return 0 ; -} - -static int vmxnet3_put_txq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3TxqDescr *r = pv; - -vmxnet3_put_ring_to_file (f, &r->tx_ring); -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->tx_stats_pa); -vmxnet3_put_tx_stats_to_file (f, &r->txq_stats); - -return 0 ; -} - -static const VMStateInfo txq_descr_info = { - .name ="txq_descr" , - .get = vmxnet3_get_txq_descr, - .put = vmxnet3_put_txq_descr +static const VMStateDescription vmstate_vmxnet3_ring = { + .name ="vmxnet3-ring" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT64 (pa, Vmxnet3Ring), +VMSTATE_UINT32 (size, Vmxnet3Ring), +VMSTATE_UINT32 (cell_size, Vmxnet3Ring), +VMSTATE_UINT32 (next, Vmxnet3Ring), +VMSTATE_UINT8 (gen, Vmxnet3Ring), +VMSTATE_END_OF_LIST () + } }; -static void vmxnet3_get_rx_stats_from_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ - rx_stat->LROPktsRxOK =qemu_get_be64 (f); - rx_stat->LROBytesRxOK =qemu_get_be64 (f); - rx_stat->ucastPktsRxOK =qemu_get_be64 (f); - rx_stat->ucastBytesRxOK =qemu_get_be64 (f); - rx_stat->mcastPktsRxOK =qemu_get_be64 (f); - rx_stat->mcastBytesRxOK =qemu_get_be64 (f); - rx_stat->bcastPktsRxOK =qemu_get_be64 (f); - rx_stat->bcastBytesRxOK =qemu_get_be64 (f); - rx_stat->pktsRxOutOfBuf =qemu_get_be64 (f); - rx_stat->pktsRxError =qemu_get_be64 (f); -} - -static void vmxnet3_put_rx_stats_to_file (QEMUFile *f, -struct UPT1_RxStats *rx_stat) -{ -qemu_put_be64 (f, rx_stat->LROPktsRxOK); -qemu_put_be64 (f, rx_stat->LROBytesRxOK); -qemu_put_be64 (f, rx_stat->ucastPktsRxOK); -qemu_put_be64 (f, rx_stat->ucastBytesRxOK); -qemu_put_be64 (f, rx_stat->mcastPktsRxOK); -qemu_put_be64 (f, rx_stat->mcastBytesRxOK); -qemu_put_be64 (f, rx_stat->bcastPktsRxOK); -qemu_put_be64 (f, rx_stat->bcastBytesRxOK); -qemu_put_be64 (f, rx_stat->pktsRxOutOfBuf); -qemu_put_be64 (f, rx_stat->pktsRxError); -} - -static int vmxnet3_get_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_get_ring_from_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_tx_stats = { + .name ="vmxnet3-tx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(TSOPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(TSOBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(ucastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(mcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastPktsTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(bcastBytesTxOK, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxError, struct UPT1_TxStats), + VMSTATE_UINT64(pktsTxDiscard, struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_get_ring_from_file (f, &r->comp_ring); - r->intr_idx =qemu_get_byte (f); - r->rx_stats_pa =qemu_get_be64 (f); - -vmxnet3_get_rx_stats_from_file (f, &r->rxq_stats); - -return 0 ; -} - -static int vmxnet3_put_rxq_descr (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3RxqDescr *r = pv; -int i; - -for (i =0 ; i <VMXNET3_RX_RINGS_PER_QUEUE ; i++) { -vmxnet3_put_ring_to_file (f, &r->rx_ring[i]); +static const VMStateDescription vmstate_vmxnet3_txq_descr = { + .name ="vmxnet3-txq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT (tx_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3TxqDescr), +VMSTATE_UINT64 (tx_stats_pa, Vmxnet3TxqDescr), +VMSTATE_STRUCT (txq_stats, Vmxnet3TxqDescr,0 , vmstate_vmxnet3_tx_stats, + struct UPT1_TxStats), +VMSTATE_END_OF_LIST () } +}; -vmxnet3_put_ring_to_file (f, &r->comp_ring); -qemu_put_byte (f, r->intr_idx); -qemu_put_be64 (f, r->rx_stats_pa); -vmxnet3_put_rx_stats_to_file (f, &r->rxq_stats); +static const VMStateDescription vmstate_vmxnet3_rx_stats = { + .name ="vmxnet3-rx-stats" , + .version_id =0 , + .fields = (VMStateField []) { + VMSTATE_UINT64(LROPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(LROBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(ucastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(mcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastPktsRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(bcastBytesRxOK, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxOutOfBuf, struct UPT1_RxStats), + VMSTATE_UINT64(pktsRxError, struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +}; -return 0 ; -} +static const VMStateDescription vmstate_vmxnet3_rxq_descr = { + .name ="vmxnet3-rxq-descr" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_STRUCT_ARRAY (rx_ring, Vmxnet3RxqDescr, +VMXNET3_RX_RINGS_PER_QUEUE ,0 , + vmstate_vmxnet3_ring, Vmxnet3Ring), +VMSTATE_STRUCT (comp_ring, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_ring, + Vmxnet3Ring), +VMSTATE_UINT8 (intr_idx, Vmxnet3RxqDescr), +VMSTATE_UINT64 (rx_stats_pa, Vmxnet3RxqDescr), +VMSTATE_STRUCT (rxq_stats, Vmxnet3RxqDescr,0 , vmstate_vmxnet3_rx_stats, + struct UPT1_RxStats), +VMSTATE_END_OF_LIST () + } +};static int vmxnet3_post_load (void *opaque,int version_id) {@@ -2577,40 +2509,15 @@ static int vmxnet3_post_load(void *opaque, int version_id)return 0 ; } -static const VMStateInfo rxq_descr_info = { - .name ="rxq_descr" , - .get = vmxnet3_get_rxq_descr, - .put = vmxnet3_put_rxq_descr -}; - -static int vmxnet3_get_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field) -{ -Vmxnet3IntState *r = pv; - - r->is_masked =qemu_get_byte (f); - r->is_pending =qemu_get_byte (f); - r->is_asserted =qemu_get_byte (f); - -return 0 ; -} - -static int vmxnet3_put_int_state (QEMUFile *f,void *pv,size_t size, -VMStateField *field,QJSON *vmdesc) -{ -Vmxnet3IntState *r = pv; - -qemu_put_byte (f, r->is_masked); -qemu_put_byte (f, r->is_pending); -qemu_put_byte (f, r->is_asserted); - -return 0 ; -} - -static const VMStateInfo int_state_info = { - .name ="int_state" , - .get = vmxnet3_get_int_state, - .put = vmxnet3_put_int_state +static const VMStateDescription vmstate_vmxnet3_int_state = { + .name ="vmxnet3-int-state" , + .version_id =0 , + .fields = (VMStateField []) { +VMSTATE_BOOL (is_masked, Vmxnet3IntState), +VMSTATE_BOOL (is_pending, Vmxnet3IntState), +VMSTATE_BOOL (is_asserted, Vmxnet3IntState), +VMSTATE_END_OF_LIST () + } };static bool vmxnet3_vmstate_need_pcie_device (void *opaque)@@ -2667,14 +2574,15 @@ static const VMStateDescription vmstate_vmxnet3 = {VMSTATE_UINT64 (drv_shmem, VMXNET3State),VMSTATE_UINT64 (temp_shared_guest_driver_memory, VMXNET3State), -VMSTATE_ARRAY (txq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , txq_descr_info, +VMSTATE_STRUCT_ARRAY (txq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_TX_QUEUES ,0 , vmstate_vmxnet3_txq_descr, Vmxnet3TxqDescr), -VMSTATE_ARRAY (rxq_descr, VMXNET3State, -VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , rxq_descr_info, +VMSTATE_STRUCT_ARRAY (rxq_descr, VMXNET3State, +VMXNET3_DEVICE_MAX_RX_QUEUES ,0 , vmstate_vmxnet3_rxq_descr, Vmxnet3RxqDescr), -VMSTATE_ARRAY (interrupt_states, VMXNET3State,VMXNET3_MAX_INTRS , - 0, int_state_info, Vmxnet3IntState), +VMSTATE_STRUCT_ARRAY (interrupt_states, VMXNET3State, +VMXNET3_MAX_INTRS ,0 , vmstate_vmxnet3_int_state, + Vmxnet3IntState),Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
hw/net/vmxnet3.c +0
-0VMSTATE_END_OF_LIST () },Signature · 1 line
2.9.3--
Dr. David Alan Gilbert / [email protected] / Manchester, UK--
Dr. David Alan Gilbert / [email protected] <mailto:[email protected]> / Manchester, UK
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Jason Wang
AppliedRe: [Qemu-devel] [PATCH 2/2] vmxnet3: VMStatify rx/tx q_descr and int_state
Quoted 22 lines · Dr. David Alan Gilbert
Quoted 21 lines · * Dmitry Fleytman ([email protected]) wrote:
Quoted 13 lines · Dr. David Alan Gilbert
Quoted 10 lines · * Dmitry Fleytman ([email protected] <mailto:[email protected]>) wrote:
Quoted 10 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert"<[email protected]>
Fairly simple mechanical conversion of all fields.
TODO!!!!
The problem is vmxnet3-ring size/cell_size/next are declared assize_tbut written as 32bit.Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Oops, I should have removed that warning in the commit message when I added the 1st patch in.
Acked-by Dmitry Fleytman<[email protected]>Any reason for Acked-by rather than Reviewed-by ?
Are you going to pull those?Hi,
Quoted 9 lines
Quoted 4 lines
There is no specific reason, the patch is OK as for me.
Reviewed-by Dmitry Fleytman<[email protected]>Jason, would you pick up this patch?
Hi Jason,
Did you see ^^^^Dave
Applied to -net, thanks.