david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ivshmem: improve error handling

Browse Source 
The test whether the chardev is an AF_UNIX socket rejects
"-chardev socket,id=chr0,path=/tmp/foo,server,nowait -device
ivshmem,chardev=chr0", but fails to explain why.

Use an explicit error on why a chardev may be rejected.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
This commit is contained in:
Marc-André Lureau 2015-06-18 14:39:49 +02:00
parent f59bb37898
commit 36617792b4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/misc/ivshmem.c
View File

@ -301,7 +301,7 @@ static CharDriverState* create_eventfd_chr_device(void * opaque, EventNotifier *
chr = qemu_chr_open_eventfd(eventfd); chr = qemu_chr_open_eventfd(eventfd);
if (chr == NULL) { if (chr == NULL) {
error_report("creating eventfd for eventfd %d failed", eventfd); error_report("creating chardriver for eventfd %d failed", eventfd);
return NULL; return NULL;
} }
qemu_chr_fe_claim_no_fail(chr); qemu_chr_fe_claim_no_fail(chr);
@ -778,8 +778,12 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp)
attr |= PCI_BASE_ADDRESS_MEM_TYPE_64; attr |= PCI_BASE_ADDRESS_MEM_TYPE_64;
} }
if ((s->server_chr != NULL) && if (s->server_chr != NULL) {
(strncmp(s->server_chr->filename, "unix:", 5) == 0)) { if (strncmp(s->server_chr->filename, "unix:", 5)) {
error_setg(errp, "chardev is not a unix client socket");
return;
}
/* if we get a UNIX socket as the parameter we will talk /* if we get a UNIX socket as the parameter we will talk
* to the ivshmem server to receive the memory region */ * to the ivshmem server to receive the memory region */