mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivshmem: generalize ivshmem_setup_interrupts

Browse Source 
Call ivshmem_setup_interrupts() with or without MSI, always allocate
msi_vectors that is going to be used in all case in the following patch.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2015-12-21 12:08:54 +01:00
parent 00ffc3c166
commit fd47bfe5ad
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/misc/ivshmem.c
View File

@ -769,18 +769,20 @@ static void ivshmem_reset(DeviceState *d)
ivshmem_use_msix(s); ivshmem_use_msix(s);
} }
static int ivshmem_setup_msi(IVShmemState * s) static int ivshmem_setup_interrupts(IVShmemState *s)
{ {
if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) { /* allocate QEMU callback data for receiving interrupts */
return -1;
}
IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors);
/* allocate QEMU char devices for receiving interrupts */
s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector)); s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));
ivshmem_use_msix(s); if (ivshmem_has_feature(s, IVSHMEM_MSI)) {
if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) {
return -1;
}
IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors);
ivshmem_use_msix(s);
}
return 0; return 0;
} }
@ -947,9 +949,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp)
IVSHMEM_DPRINTF("using shared memory server (socket = %s)\n", IVSHMEM_DPRINTF("using shared memory server (socket = %s)\n",
s->server_chr->filename); s->server_chr->filename);
if (ivshmem_has_feature(s, IVSHMEM_MSI) && if (ivshmem_setup_interrupts(s) < 0) {
ivshmem_setup_msi(s)) { error_setg(errp, "failed to initialize interrupts");
error_setg(errp, "msix initialization failed");
return; return;
} }