ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivshmem: add missing msix calls 

ivshmem used msix but didn't call it on either reset or
config write paths. This used to partically work since
guests don't use all of msi-x configuration fields,
and reset is rarely used, but the patch 'msix: track function masked
in pci device state' broke that. Fix by adding appropriate calls.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Cam Macdonell <cam@cs.ualberta.ca>
Tested-by: Cam Macdonell <cam@cs.ualberta.ca>
This commit is contained in:
Michael S. Tsirkin 2011-12-05 21:48:43 +02:00
parent fbbaf9ae88
commit 4490c71191
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/ivshmem.c
View File

@ -509,11 +509,29 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
return; return;
} }
/* Select the MSI-X vectors used by device.
* ivshmem maps events to vectors statically, so
* we just enable all vectors on init and after reset. */
static void ivshmem_use_msix(IVShmemState * s)
{
int i;
if (!msix_present(&s->dev)) {
return;
}
for (i = 0; i < s->vectors; i++) {
msix_vector_use(&s->dev, i);
}
}
static void ivshmem_reset(DeviceState *d) static void ivshmem_reset(DeviceState *d)
{ {
IVShmemState *s = DO_UPCAST(IVShmemState, dev.qdev, d); IVShmemState *s = DO_UPCAST(IVShmemState, dev.qdev, d);
s->intrstatus = 0; s->intrstatus = 0;
msix_reset(&s->dev);
ivshmem_use_msix(s);
return; return;
} }
@ -544,12 +562,8 @@ static uint64_t ivshmem_get_size(IVShmemState * s) {
return value; return value;
} }
static void ivshmem_setup_msi(IVShmemState * s) { static void ivshmem_setup_msi(IVShmemState * s)
{
int i;
/* allocate the MSI-X vectors */
memory_region_init(&s->msix_bar, "ivshmem-msix", 4096); memory_region_init(&s->msix_bar, "ivshmem-msix", 4096);
if (!msix_init(&s->dev, s->vectors, &s->msix_bar, 1, 0)) { if (!msix_init(&s->dev, s->vectors, &s->msix_bar, 1, 0)) {
pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY,
@ -560,13 +574,10 @@ static void ivshmem_setup_msi(IVShmemState * s) {
exit(1); exit(1);
} }
/* 'activate' the vectors */
for (i = 0; i < s->vectors; i++) {
msix_vector_use(&s->dev, i);
}
/* allocate QEMU char devices for receiving interrupts */ /* allocate QEMU char devices for receiving interrupts */
s->eventfd_table = g_malloc0(s->vectors * sizeof(EventfdEntry)); s->eventfd_table = g_malloc0(s->vectors * sizeof(EventfdEntry));
ivshmem_use_msix(s);
} }
static void ivshmem_save(QEMUFile* f, void *opaque) static void ivshmem_save(QEMUFile* f, void *opaque)
@ -590,7 +601,7 @@ static int ivshmem_load(QEMUFile* f, void *opaque, int version_id)
IVSHMEM_DPRINTF("ivshmem_load\n"); IVSHMEM_DPRINTF("ivshmem_load\n");
IVShmemState *proxy = opaque; IVShmemState *proxy = opaque;
int ret, i; int ret;
if (version_id > 0) { if (version_id > 0) {
return -EINVAL; return -EINVAL;
@ -608,9 +619,7 @@ static int ivshmem_load(QEMUFile* f, void *opaque, int version_id)
if (ivshmem_has_feature(proxy, IVSHMEM_MSI)) { if (ivshmem_has_feature(proxy, IVSHMEM_MSI)) {
msix_load(&proxy->dev, f); msix_load(&proxy->dev, f);
for (i = 0; i < proxy->vectors; i++) { ivshmem_use_msix(proxy);
msix_vector_use(&proxy->dev, i);
}
} else { } else {
proxy->intrstatus = qemu_get_be32(f); proxy->intrstatus = qemu_get_be32(f);
proxy->intrmask = qemu_get_be32(f); proxy->intrmask = qemu_get_be32(f);
@ -619,6 +628,13 @@ static int ivshmem_load(QEMUFile* f, void *opaque, int version_id)
return 0; return 0;
} }
static void ivshmem_write_config(PCIDevice *pci_dev, uint32_t address,
uint32_t val, int len)
{
pci_default_write_config(pci_dev, address, val, len);
msix_write_config(pci_dev, address, val, len);
}
static int pci_ivshmem_init(PCIDevice *dev) static int pci_ivshmem_init(PCIDevice *dev)
{ {
IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev); IVShmemState *s = DO_UPCAST(IVShmemState, dev, dev);
@ -744,6 +760,8 @@ static int pci_ivshmem_init(PCIDevice *dev)
} }
s->dev.config_write = ivshmem_write_config;
return 0; return 0;
} }