aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil via <qemu-trivial@nongnu.org>2025-08-09 08:13:02 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2025-09-03 10:56:11 +0300
commit1566b8c8df9e8603f5d03cc1a7708c4ecfda0897 (patch)
tree98ce441170344c8bbac230609c4ca44e6ff7d041
parent8415b0619f65bff12f10c774659df92d3f61daca (diff)
downloadqemu-1566b8c8df9e8603f5d03cc1a7708c4ecfda0897.zip
qemu-1566b8c8df9e8603f5d03cc1a7708c4ecfda0897.tar.gz
qemu-1566b8c8df9e8603f5d03cc1a7708c4ecfda0897.tar.bz2
chardev/baum: Fix compiler warning for Windows builds
Compiler warning: ../chardev/baum.c:657:25: warning: comparison between pointer and integer Use brlapi_fileDescriptor instead of int for brlapi_fd and BRLAPI_INVALID_FILE_DESCRIPTOR instead of -1. Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--chardev/baum.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/chardev/baum.c b/chardev/baum.c
index f3e8cd2..ad68321 100644
--- a/chardev/baum.c
+++ b/chardev/baum.c
@@ -94,7 +94,7 @@ struct BaumChardev {
Chardev parent;
brlapi_handle_t *brlapi;
- int brlapi_fd;
+ brlapi_fileDescriptor brlapi_fd;
unsigned int x, y;
bool deferred_init;
@@ -654,7 +654,7 @@ static void baum_chr_open(Chardev *chr,
baum->brlapi = handle;
baum->brlapi_fd = brlapi__openConnection(handle, NULL, NULL);
- if (baum->brlapi_fd == -1) {
+ if (baum->brlapi_fd == BRLAPI_INVALID_FILE_DESCRIPTOR) {
error_setg(errp, "brlapi__openConnection: %s",
brlapi_strerror(brlapi_error_location()));
g_free(handle);
@@ -665,6 +665,10 @@ static void baum_chr_open(Chardev *chr,
baum->cellCount_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, baum_cellCount_timer_cb, baum);
+ /*
+ * On Windows, brlapi_fd is a pointer, which is being used here
+ * as an integer, but in practice it seems to work
+ */
qemu_set_fd_handler(baum->brlapi_fd, baum_chr_read, NULL, baum);
}