[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/48] ivshmem: improve error handling
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL 18/48] ivshmem: improve error handling |
Date: |
Tue, 6 Oct 2015 21:19:14 +0200 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
hw/misc/ivshmem.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 50f9c8f..d7a00bd 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -301,7 +301,7 @@ static CharDriverState* create_eventfd_chr_device(void *
opaque, EventNotifier *
chr = qemu_chr_open_eventfd(eventfd);
if (chr == NULL) {
- error_report("creating eventfd for eventfd %d failed", eventfd);
+ error_report("creating chardriver for eventfd %d failed", eventfd);
return NULL;
}
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;
}
- if ((s->server_chr != NULL) &&
- (strncmp(s->server_chr->filename, "unix:", 5) == 0)) {
+ if (s->server_chr != NULL) {
+ 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
* to the ivshmem server to receive the memory region */
--
2.4.3
- [Qemu-devel] [PULL 28/48] ivshmem: replace 'guest' for 'peer' appropriately, (continued)
- [Qemu-devel] [PULL 28/48] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 33/48] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 07/48] ivshmem: remove superflous ivshmem_attr field, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 17/48] ivshmem: improve debug messages, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 21/48] ivshmem: use common return, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 09/48] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 48/48] ivshmem: use little-endian int64_t for the protocol, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 06/48] ivshmem: remove unnecessary dup(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 02/48] msix: add VMSTATE_MSIX_TEST, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 15/48] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 18/48] ivshmem: improve error handling,
marcandre . lureau <=
- [Qemu-devel] [PULL 25/48] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 37/48] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 47/48] ivshmem: use kvm irqfd for msi notifications, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 29/48] ivshmem: error on too many eventfd received, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 38/48] msix: implement pba write (but read-only), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 23/48] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 31/48] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 20/48] ivshmem: simplify a bit the code, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 22/48] ivshmem: use common is_power_of_2(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 42/48] ivshmem: do not keep shm_fd open, marcandre . lureau, 2015/10/08