From 79c6d6f32356ffd08bb57c4defa7630c2a750887 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Thu, 24 Aug 2023 02:23:55 +0300 Subject: [PATCH] Make QEMU driver compatible with QEMU 8.1 --- src/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 3f3c41ec..0024c5d3 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -197,7 +197,11 @@ static void vitastor_parse_filename(const char *filename, QDict *options, Error !strcmp(name, "rdma-mtu")) { unsigned long long num_val; +#if QEMU_VERSION_MAJOR < 8 || QEMU_VERSION_MAJOR == 8 && QEMU_VERSION_MINOR < 1 if (parse_uint_full(value, &num_val, 0)) +#else + if (parse_uint_full(value, 0, &num_val)) +#endif { error_setg(errp, "Illegal %s: %s", name, value); goto out; @@ -320,7 +324,7 @@ static void vitastor_aio_fd_write(void *fddv) static void universal_aio_set_fd_handler(AioContext *ctx, int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque) { aio_set_fd_handler(ctx, fd, -#if QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 5 || QEMU_VERSION_MAJOR >= 3 +#if QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 5 || QEMU_VERSION_MAJOR >= 3 && (QEMU_VERSION_MAJOR < 8 || QEMU_VERSION_MAJOR == 8 && QEMU_VERSION_MINOR < 1) 0 /*is_external*/, #endif fd_read,