diff options
author | John Levon <john.levon@nutanix.com> | 2021-02-10 18:26:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-10 18:26:53 +0000 |
commit | cf449d6290ddd723a23f0451d0ce18ffc6099e15 (patch) | |
tree | bb59c4564609839ca6281582035068a6ea92ff92 /samples | |
parent | aa2157aad1876c3963efe34c694c93eadd309c97 (diff) | |
download | libvfio-user-cf449d6290ddd723a23f0451d0ce18ffc6099e15.zip libvfio-user-cf449d6290ddd723a23f0451d0ce18ffc6099e15.tar.gz libvfio-user-cf449d6290ddd723a23f0451d0ce18ffc6099e15.tar.bz2 |
don't expose -errno in public API (#327)
Regardless of what we do internally, most of our API uses standard mechanisms
for reporting errors. Fix vfu_run_ctx() to do so properly as well, and fix a
couple of other references for user-provided callbacks.
This will require a small fix to SPDK.
Signed-off-by: John Levon <john.levon@nutanix.com>
Reviewed-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/gpio-pci-idio-16.c | 12 | ||||
-rw-r--r-- | samples/server.c | 19 |
2 files changed, 15 insertions, 16 deletions
diff --git a/samples/gpio-pci-idio-16.c b/samples/gpio-pci-idio-16.c index 350d11f..771de3a 100644 --- a/samples/gpio-pci-idio-16.c +++ b/samples/gpio-pci-idio-16.c @@ -122,8 +122,7 @@ main(int argc, char *argv[]) ret = vfu_setup_region(vfu_ctx, VFU_PCI_DEV_BAR2_REGION_IDX, 0x100, &bar2_access, VFU_REGION_FLAG_RW, NULL, 0, -1); if (ret < 0) { - fprintf(stderr, "failed to setup region\n"); - goto out; + err(EXIT_FAILURE, "failed to setup region"); } ret = vfu_setup_device_nr_irqs(vfu_ctx, VFU_DEV_INTX_IRQ, 1); @@ -143,16 +142,13 @@ main(int argc, char *argv[]) ret = vfu_run_ctx(vfu_ctx); if (ret != 0) { - if (ret != -ENOTCONN && ret != -EINTR) { - fprintf(stderr, "failed to realize device emulation\n"); - goto out; + if (errno != ENOTCONN && errno != EINTR) { + err(EXIT_FAILURE, "failed to realize device emulation"); } - ret = 0; } -out: vfu_destroy_ctx(vfu_ctx); - return ret; + return EXIT_SUCCESS; } /* ex: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/samples/server.c b/samples/server.c index 9c2ee37..72d4241 100644 --- a/samples/server.c +++ b/samples/server.c @@ -81,7 +81,7 @@ arm_timer(vfu_ctx_t *vfu_ctx, time_t t) new.it_value.tv_sec); if (setitimer(ITIMER_REAL, &new, NULL) != 0) { vfu_log(vfu_ctx, LOG_ERR, "failed to arm timer: %m"); - return -errno; + return -1; } return 0; } @@ -339,7 +339,8 @@ migration_read_data(vfu_ctx_t *vfu_ctx, void *buf, __u64 size, __u64 offset) */ if (offset != 0 || size != server_data->migration.pending_bytes) { - return -EINVAL; + errno = EINVAL; + return -1; } memcpy(buf, server_data->bar1, server_data->bar1_size); @@ -365,7 +366,8 @@ migration_write_data(vfu_ctx_t *vfu_ctx, void *data, __u64 size, __u64 offset) if (offset != 0 || size < server_data->bar1_size) { vfu_log(vfu_ctx, LOG_DEBUG, "XXX bad migration data write %#llx-%#llx", offset, offset + size - 1); - return -EINVAL; + errno = EINVAL; + return -1; } memcpy(server_data->bar1, buf, server_data->bar1_size); @@ -375,7 +377,8 @@ migration_write_data(vfu_ctx_t *vfu_ctx, void *data, __u64 size, __u64 offset) return 0; } if (size != sizeof server_data->bar0) { - return -EINVAL; + errno = EINVAL; + return -1; } memcpy(&server_data->bar0, buf, sizeof server_data->bar0); ret = bar0_access(vfu_ctx, buf, sizeof server_data->bar0, 0, true); @@ -574,7 +577,7 @@ int main(int argc, char *argv[]) do { ret = vfu_run_ctx(vfu_ctx); - if (ret == -EINTR) { + if (ret == -1 && errno == EINTR) { if (irq_triggered) { irq_triggered = false; vfu_irq_trigger(vfu_ctx, 0); @@ -601,9 +604,9 @@ int main(int argc, char *argv[]) } } while (ret == 0); - if (ret != -ENOTCONN && ret != -EINTR && ret != -ESHUTDOWN) { - errx(EXIT_FAILURE, "failed to realize device emulation: %s\n", - strerror(-ret)); + if (ret == -1 && + errno != ENOTCONN && errno != EINTR && errno != ESHUTDOWN) { + errx(EXIT_FAILURE, "failed to realize device emulation"); } vfu_destroy_ctx(vfu_ctx); |