Commit 56140fbb authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Michael S. Tsirkin
Browse files

libqos: enforce Device Initialization order 



According to VIRTIO 1.1 "3.1.1 Driver Requirements: Device
Initialization", configuration space and virtqueues cannot be accessed
before features have been negotiated.  Enforce this requirement.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20191023100425.12168-8-stefanha@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent c5bd6d02

tests/libqos/virtio.c

+7 −0
Original line number Diff line number Diff line
@@ -15,21 +15,25 @@ 


uint8_t qvirtio_config_readb(QVirtioDevice *d, uint64_t addr)

{

    g_assert_true(d->features_negotiated);

    return d->bus->config_readb(d, addr);

}



uint16_t qvirtio_config_readw(QVirtioDevice *d, uint64_t addr)

{

    g_assert_true(d->features_negotiated);

    return d->bus->config_readw(d, addr);

}



uint32_t qvirtio_config_readl(QVirtioDevice *d, uint64_t addr)

{

    g_assert_true(d->features_negotiated);

    return d->bus->config_readl(d, addr);

}



uint64_t qvirtio_config_readq(QVirtioDevice *d, uint64_t addr)

{

    g_assert_true(d->features_negotiated);

    return d->bus->config_readq(d, addr);

}
@@ -42,11 +46,13 @@ void qvirtio_set_features(QVirtioDevice *d, uint64_t features) 
{

    d->features = features;

    d->bus->set_features(d, features);

    d->features_negotiated = true;

}



QVirtQueue *qvirtqueue_setup(QVirtioDevice *d,

                             QGuestAllocator *alloc, uint16_t index)

{

    g_assert_true(d->features_negotiated);

    return d->bus->virtqueue_setup(d, alloc, index);

}
@@ -60,6 +66,7 @@ void qvirtio_reset(QVirtioDevice *d) 
{

    d->bus->set_status(d, 0);

    g_assert_cmphex(d->bus->get_status(d), ==, 0);

    d->features_negotiated = false;

}



void qvirtio_set_acknowledge(QVirtioDevice *d)

tests/libqos/virtio.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ typedef struct QVirtioDevice { 
    uint16_t device_type;

    uint64_t features;

    bool big_endian;

    bool features_negotiated;

} QVirtioDevice;



typedef struct QVirtQueue {