From: Stefan Weil via <qemu-trivial@nongnu.org>
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>
---
chardev/baum.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/chardev/baum.c b/chardev/baum.c
index f3e8cd27f0..ad68321504 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);
}
--
2.47.2