From 12d7cd59c31dfb3f088845c64b9590df12e0abf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 16 Nov 2022 22:43:08 +0400
Subject: [PATCH] Remove DMABUF handler functions on !unix

---
 qemu-display/src/console_listener.rs | 2 ++
 qemu-rdw/src/display.rs              | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/qemu-display/src/console_listener.rs b/qemu-display/src/console_listener.rs
index 2138c18..1ca0c90 100644
--- a/qemu-display/src/console_listener.rs
+++ b/qemu-display/src/console_listener.rs
@@ -98,8 +98,10 @@ pub trait ConsoleListenerHandler: 'static + Send + Sync {
 
     async fn update(&mut self, update: Update);
 
+    #[cfg(unix)]
     async fn scanout_dmabuf(&mut self, scanout: ScanoutDMABUF);
 
+    #[cfg(unix)]
     async fn update_dmabuf(&mut self, update: UpdateDMABUF);
 
     async fn mouse_set(&mut self, set: MouseSet);
diff --git a/qemu-rdw/src/display.rs b/qemu-rdw/src/display.rs
index 0ce1e05..3e4e15f 100644
--- a/qemu-rdw/src/display.rs
+++ b/qemu-rdw/src/display.rs
@@ -174,10 +174,6 @@ mod imp {
                                 }
                                 this.obj().update_area(u.x as _, u.y as _, u.w as _, u.h as _, u.stride as _, &u.data);
                             }
-                            #[cfg(windows)]
-                            ScanoutDMABUF(_) => {
-                                unimplemented!()
-                            }
                             #[cfg(unix)]
                             ScanoutDMABUF(s) => {
                                 this.obj().set_display_size(Some((s.width as _, s.height as _)));
@@ -191,6 +187,7 @@ mod imp {
                                     fd: s.into_raw_fd(),
                                 });
                             }
+                            #[cfg(unix)]
                             UpdateDMABUF { wait_tx, .. } => {
                                 this.obj().render();
                                 let _ = wait_tx.send(());
@@ -257,7 +254,9 @@ impl Display {
 enum ConsoleEvent {
     Scanout(qemu_display::Scanout),
     Update(qemu_display::Update),
+    #[cfg(unix)]
     ScanoutDMABUF(qemu_display::ScanoutDMABUF),
+    #[cfg(unix)]
     UpdateDMABUF {
         _update: qemu_display::UpdateDMABUF,
         wait_tx: futures::channel::oneshot::Sender<()>,
@@ -289,10 +288,12 @@ impl ConsoleListenerHandler for ConsoleHandler {
         self.send(ConsoleEvent::Update(update));
     }
 
+    #[cfg(unix)]
     async fn scanout_dmabuf(&mut self, scanout: qemu_display::ScanoutDMABUF) {
         self.send(ConsoleEvent::ScanoutDMABUF(scanout));
     }
 
+    #[cfg(unix)]
     async fn update_dmabuf(&mut self, _update: qemu_display::UpdateDMABUF) {
         let (wait_tx, wait_rx) = futures::channel::oneshot::channel();
         self.send(ConsoleEvent::UpdateDMABUF { _update, wait_tx });