mirror of https://gitee.com/openkylin/qemu.git
tests/libqos: remove global_qtest from virtio endianness checks
This is needed to support migration tests with qgraph. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
1ce66ecec0
commit
d5006a45f5
|
@ -43,6 +43,14 @@ typedef struct QVirtioPCIForeachData {
|
|||
void *user_data;
|
||||
} QVirtioPCIForeachData;
|
||||
|
||||
static inline bool qvirtio_pci_is_big_endian(QVirtioPCIDevice *dev)
|
||||
{
|
||||
QPCIBus *bus = dev->pdev->bus;
|
||||
|
||||
/* FIXME: virtio 1.0 is always little-endian */
|
||||
return qtest_big_endian(bus->qts);
|
||||
}
|
||||
|
||||
void qvirtio_pci_device_free(QVirtioPCIDevice *dev)
|
||||
{
|
||||
g_free(dev->pdev);
|
||||
|
@ -56,6 +64,7 @@ static void qvirtio_pci_init_from_pcidev(QVirtioPCIDevice *dev, QPCIDevice *pci_
|
|||
dev->config_msix_entry = -1;
|
||||
|
||||
dev->vdev.bus = &qvirtio_pci;
|
||||
dev->vdev.big_endian = qvirtio_pci_is_big_endian(dev);
|
||||
|
||||
/* each virtio-xxx-pci device should override at least this function */
|
||||
dev->obj.get_driver = NULL;
|
||||
|
@ -99,7 +108,7 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d, uint64_t off)
|
|||
* so with a big-endian guest the order has been reversed,
|
||||
* reverse it again
|
||||
* virtio-1.0 is always little-endian, like PCI, but this
|
||||
* case will be managed inside qvirtio_is_big_endian()
|
||||
* case will be managed inside qvirtio_pci_is_big_endian()
|
||||
*/
|
||||
|
||||
static uint16_t qvirtio_pci_config_readw(QVirtioDevice *d, uint64_t off)
|
||||
|
|
|
@ -372,3 +372,8 @@ void qvirtio_start_device(QVirtioDevice *vdev)
|
|||
qvirtio_set_acknowledge(vdev);
|
||||
qvirtio_set_driver(vdev);
|
||||
}
|
||||
|
||||
bool qvirtio_is_big_endian(QVirtioDevice *d)
|
||||
{
|
||||
return d->big_endian;
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ typedef struct QVirtioDevice {
|
|||
const QVirtioBus *bus;
|
||||
/* Device type */
|
||||
uint16_t device_type;
|
||||
bool big_endian;
|
||||
} QVirtioDevice;
|
||||
|
||||
typedef struct QVirtQueue {
|
||||
|
@ -90,12 +91,6 @@ struct QVirtioBus {
|
|||
void (*virtqueue_kick)(QVirtioDevice *d, QVirtQueue *vq);
|
||||
};
|
||||
|
||||
static inline bool qvirtio_is_big_endian(QVirtioDevice *d)
|
||||
{
|
||||
/* FIXME: virtio 1.0 is always little-endian */
|
||||
return qtest_big_endian(global_qtest);
|
||||
}
|
||||
|
||||
static inline uint32_t qvring_size(uint32_t num, uint32_t align)
|
||||
{
|
||||
return ((sizeof(struct vring_desc) * num + sizeof(uint16_t) * (3 + num)
|
||||
|
@ -109,6 +104,7 @@ uint32_t qvirtio_config_readl(QVirtioDevice *d, uint64_t addr);
|
|||
uint64_t qvirtio_config_readq(QVirtioDevice *d, uint64_t addr);
|
||||
uint32_t qvirtio_get_features(QVirtioDevice *d);
|
||||
void qvirtio_set_features(QVirtioDevice *d, uint32_t features);
|
||||
bool qvirtio_is_big_endian(QVirtioDevice *d);
|
||||
|
||||
void qvirtio_reset(QVirtioDevice *d);
|
||||
void qvirtio_set_acknowledge(QVirtioDevice *d);
|
||||
|
|
Loading…
Reference in New Issue