* [PATCH] chardev: clean up chardev-parallel.c
@ 2022-12-19 9:17 Paolo Bonzini
2022-12-19 9:23 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2022-12-19 9:17 UTC (permalink / raw)
To: qemu-devel; +Cc: philmd
Replace HAVE_CHARDEV_PARPORT with a Meson conditional, remove unnecessary
defines, and close the file descriptor on FreeBSD/DragonFly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
chardev/char-parallel.c | 15 ++-------------
chardev/meson.build | 5 ++++-
include/qemu/osdep.h | 5 -----
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index 05e7efbd6ca9..a5164f975af3 100644
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -238,7 +238,6 @@ static void qemu_chr_open_pp_fd(Chardev *chr,
}
#endif
-#ifdef HAVE_CHARDEV_PARPORT
static void qmp_chardev_open_parallel(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
@@ -276,29 +275,21 @@ static void char_parallel_class_init(ObjectClass *oc, void *data)
cc->parse = qemu_chr_parse_parallel;
cc->open = qmp_chardev_open_parallel;
-#if defined(__linux__)
cc->chr_ioctl = pp_ioctl;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__DragonFly__)
- cc->chr_ioctl = pp_ioctl;
-#endif
}
static void char_parallel_finalize(Object *obj)
{
-#if defined(__linux__)
Chardev *chr = CHARDEV(obj);
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
int fd = drv->fd;
+#if defined(__linux__)
pp_hw_mode(drv, IEEE1284_MODE_COMPAT);
ioctl(fd, PPRELEASE);
+#endif
close(fd);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__DragonFly__)
- /* FIXME: close fd? */
-#endif
}
static const TypeInfo char_parallel_type_info = {
@@ -315,5 +306,3 @@ static void register_types(void)
}
type_init(register_types);
-
-#endif
diff --git a/chardev/meson.build b/chardev/meson.build
index 664f77b8879a..ceedb68d4f95 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -14,9 +14,12 @@ chardev_ss.add(files(
))
chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files(
'char-fd.c',
- 'char-parallel.c',
'char-pty.c',
), util])
+if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly']
+ 'char-parallel.c',
+endif
+
chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
'char-console.c',
'char-win-stdio.c',
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index b9c4307779c5..4886361be6a7 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -421,11 +421,6 @@ void qemu_anon_ram_free(void *ptr, size_t size);
#define HAVE_CHARDEV_SERIAL 1
#endif
-#if defined(__linux__) || defined(__FreeBSD__) || \
- defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#define HAVE_CHARDEV_PARPORT 1
-#endif
-
#if defined(__HAIKU__)
#define SIGIO SIGPOLL
#endif
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] chardev: clean up chardev-parallel.c
2022-12-19 9:17 [PATCH] chardev: clean up chardev-parallel.c Paolo Bonzini
@ 2022-12-19 9:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-12-19 9:23 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel
On 19/12/22 10:17, Paolo Bonzini wrote:
> Replace HAVE_CHARDEV_PARPORT with a Meson conditional, remove unnecessary
> defines, and close the file descriptor on FreeBSD/DragonFly.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> chardev/char-parallel.c | 15 ++-------------
> chardev/meson.build | 5 ++++-
> include/qemu/osdep.h | 5 -----
> 3 files changed, 6 insertions(+), 19 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] chardev: clean up chardev-parallel.c
@ 2022-12-22 7:38 Paolo Bonzini
2022-12-22 8:04 ` Philippe Mathieu-Daudé
2023-01-02 11:56 ` Marc-André Lureau
0 siblings, 2 replies; 5+ messages in thread
From: Paolo Bonzini @ 2022-12-22 7:38 UTC (permalink / raw)
To: qemu-devel; +Cc: f4bug
Replace HAVE_CHARDEV_PARPORT with a Meson conditional, remove unnecessary
defines, and close the file descriptor on FreeBSD/DragonFly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
chardev/char-parallel.c | 15 ++-------------
chardev/meson.build | 5 ++++-
include/qemu/osdep.h | 5 -----
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index 05e7efbd6ca9..a5164f975af3 100644
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -238,7 +238,6 @@ static void qemu_chr_open_pp_fd(Chardev *chr,
}
#endif
-#ifdef HAVE_CHARDEV_PARPORT
static void qmp_chardev_open_parallel(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
@@ -276,29 +275,21 @@ static void char_parallel_class_init(ObjectClass *oc, void *data)
cc->parse = qemu_chr_parse_parallel;
cc->open = qmp_chardev_open_parallel;
-#if defined(__linux__)
cc->chr_ioctl = pp_ioctl;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__DragonFly__)
- cc->chr_ioctl = pp_ioctl;
-#endif
}
static void char_parallel_finalize(Object *obj)
{
-#if defined(__linux__)
Chardev *chr = CHARDEV(obj);
ParallelChardev *drv = PARALLEL_CHARDEV(chr);
int fd = drv->fd;
+#if defined(__linux__)
pp_hw_mode(drv, IEEE1284_MODE_COMPAT);
ioctl(fd, PPRELEASE);
+#endif
close(fd);
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__DragonFly__)
- /* FIXME: close fd? */
-#endif
}
static const TypeInfo char_parallel_type_info = {
@@ -315,5 +306,3 @@ static void register_types(void)
}
type_init(register_types);
-
-#endif
diff --git a/chardev/meson.build b/chardev/meson.build
index 664f77b8879a..ceedb68d4f95 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -14,9 +14,12 @@ chardev_ss.add(files(
))
chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files(
'char-fd.c',
- 'char-parallel.c',
'char-pty.c',
), util])
+if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly']
+ 'char-parallel.c',
+endif
+
chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
'char-console.c',
'char-win-stdio.c',
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index b9c4307779c5..4886361be6a7 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -421,11 +421,6 @@ void qemu_anon_ram_free(void *ptr, size_t size);
#define HAVE_CHARDEV_SERIAL 1
#endif
-#if defined(__linux__) || defined(__FreeBSD__) || \
- defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#define HAVE_CHARDEV_PARPORT 1
-#endif
-
#if defined(__HAIKU__)
#define SIGIO SIGPOLL
#endif
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] chardev: clean up chardev-parallel.c
2022-12-22 7:38 Paolo Bonzini
@ 2022-12-22 8:04 ` Philippe Mathieu-Daudé
2023-01-02 11:56 ` Marc-André Lureau
1 sibling, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-12-22 8:04 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: f4bug
On 22/12/22 08:38, Paolo Bonzini wrote:
> Replace HAVE_CHARDEV_PARPORT with a Meson conditional, remove unnecessary
> defines, and close the file descriptor on FreeBSD/DragonFly.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> chardev/char-parallel.c | 15 ++-------------
> chardev/meson.build | 5 ++++-
> include/qemu/osdep.h | 5 -----
> 3 files changed, 6 insertions(+), 19 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] chardev: clean up chardev-parallel.c
2022-12-22 7:38 Paolo Bonzini
2022-12-22 8:04 ` Philippe Mathieu-Daudé
@ 2023-01-02 11:56 ` Marc-André Lureau
1 sibling, 0 replies; 5+ messages in thread
From: Marc-André Lureau @ 2023-01-02 11:56 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, f4bug
On Thu, Dec 22, 2022 at 11:42 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Replace HAVE_CHARDEV_PARPORT with a Meson conditional, remove unnecessary
> defines, and close the file descriptor on FreeBSD/DragonFly.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> chardev/char-parallel.c | 15 ++-------------
> chardev/meson.build | 5 ++++-
> include/qemu/osdep.h | 5 -----
> 3 files changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
> index 05e7efbd6ca9..a5164f975af3 100644
> --- a/chardev/char-parallel.c
> +++ b/chardev/char-parallel.c
> @@ -238,7 +238,6 @@ static void qemu_chr_open_pp_fd(Chardev *chr,
> }
> #endif
>
> -#ifdef HAVE_CHARDEV_PARPORT
> static void qmp_chardev_open_parallel(Chardev *chr,
> ChardevBackend *backend,
> bool *be_opened,
> @@ -276,29 +275,21 @@ static void char_parallel_class_init(ObjectClass *oc, void *data)
>
> cc->parse = qemu_chr_parse_parallel;
> cc->open = qmp_chardev_open_parallel;
> -#if defined(__linux__)
> cc->chr_ioctl = pp_ioctl;
> -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
> - defined(__DragonFly__)
> - cc->chr_ioctl = pp_ioctl;
> -#endif
> }
>
> static void char_parallel_finalize(Object *obj)
> {
> -#if defined(__linux__)
> Chardev *chr = CHARDEV(obj);
> ParallelChardev *drv = PARALLEL_CHARDEV(chr);
> int fd = drv->fd;
>
> +#if defined(__linux__)
> pp_hw_mode(drv, IEEE1284_MODE_COMPAT);
> ioctl(fd, PPRELEASE);
> +#endif
> close(fd);
> qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
> -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
> - defined(__DragonFly__)
> - /* FIXME: close fd? */
> -#endif
> }
>
> static const TypeInfo char_parallel_type_info = {
> @@ -315,5 +306,3 @@ static void register_types(void)
> }
>
> type_init(register_types);
> -
> -#endif
> diff --git a/chardev/meson.build b/chardev/meson.build
> index 664f77b8879a..ceedb68d4f95 100644
> --- a/chardev/meson.build
> +++ b/chardev/meson.build
> @@ -14,9 +14,12 @@ chardev_ss.add(files(
> ))
> chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files(
> 'char-fd.c',
> - 'char-parallel.c',
> 'char-pty.c',
> ), util])
> +if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly']
> + 'char-parallel.c',
diff --git a/chardev/meson.build b/chardev/meson.build
index ceedb68d4f..789b50056a 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -17,7 +17,7 @@ chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files(
'char-pty.c',
), util])
if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly']
- 'char-parallel.c',
+ chardev_ss.add(files('char-parallel.c'))
endif
With that:
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Feel free to queue in the next build-sys/meson PR.
thanks
> +endif
> +
> chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
> 'char-console.c',
> 'char-win-stdio.c',
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index b9c4307779c5..4886361be6a7 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -421,11 +421,6 @@ void qemu_anon_ram_free(void *ptr, size_t size);
> #define HAVE_CHARDEV_SERIAL 1
> #endif
>
> -#if defined(__linux__) || defined(__FreeBSD__) || \
> - defined(__FreeBSD_kernel__) || defined(__DragonFly__)
> -#define HAVE_CHARDEV_PARPORT 1
> -#endif
> -
> #if defined(__HAIKU__)
> #define SIGIO SIGPOLL
> #endif
> --
> 2.38.1
>
>
--
Marc-André Lureau
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-01-02 11:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-19 9:17 [PATCH] chardev: clean up chardev-parallel.c Paolo Bonzini
2022-12-19 9:23 ` Philippe Mathieu-Daudé
-- strict thread matches above, loose matches on Subject: below --
2022-12-22 7:38 Paolo Bonzini
2022-12-22 8:04 ` Philippe Mathieu-Daudé
2023-01-02 11:56 ` Marc-André Lureau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).