Commit 592707af authored by Wei Liu's avatar Wei Liu Committed by Aneesh Kumar K.V
Browse files

9pfs: break out virtio_init_iov_from_pdu 



Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent f657b17a

hw/9pfs/virtio-9p-device.c

+12 −0
Original line number Diff line number Diff line
@@ -170,6 +170,18 @@ ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, 
                               offset, 1, fmt, ap);

}



void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,

                              unsigned int *pniov, bool is_write)

{

    if (is_write) {

        *piov = pdu->elem.out_sg;

        *pniov = pdu->elem.out_num;

    } else {

        *piov = pdu->elem.in_sg;

        *pniov = pdu->elem.in_num;

    }

}



/* virtio-9p device */



static Property virtio_9p_properties[] = {

hw/9pfs/virtio-9p.c

+1 −7
Original line number Diff line number Diff line
@@ -1697,13 +1697,7 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, 
    struct iovec *iov;

    unsigned int niov;



    if (is_write) {

        iov = pdu->elem.out_sg;

        niov = pdu->elem.out_num;

    } else {

        iov = pdu->elem.in_sg;

        niov = pdu->elem.in_num;

    }

    virtio_init_iov_from_pdu(pdu, &iov, &niov, is_write);



    qemu_iovec_init_external(&elem, iov, niov);

    qemu_iovec_init(qiov, niov);

hw/9pfs/virtio-9p.h

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, 
                            const char *fmt, va_list ap);

ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,

                              const char *fmt, va_list ap);

void virtio_init_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,

                              unsigned int *pniov, bool is_write);



#define TYPE_VIRTIO_9P "virtio-9p-device"

#define VIRTIO_9P(obj) \