Skip to contentSkip to conversation

usb: fix u2f build

PATCH In review Gerd Hoffmann 2 participants 3 messages Sep 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: fix u2f build

Just use qemu_open_old() for a quick fix, switch
to better error handling left for another day.

Fixes 448058aa99aa ("util: rename qemu_open() to qemu_open_old()")
Cc César Belley <[email protected]>
---
 hw/usb/u2f-emulated.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/usb/u2f-emulated.c +2 -2
index 9e1b829f3d32..9151feb63d44 100644
@@ -200,7 +200,7 @@ static ssize_t u2f_emulated_read(const char *path, char *buffer,
     int fd;
     ssize_t ret;
 
-    fd = qemu_open(path, O_RDONLY);
+    fd = qemu_open_old(path, O_RDONLY);
     if (fd < 0) {
         return -1;
     }
@@ -217,7 +217,7 @@ static bool u2f_emulated_setup_counter(const char *path,
     int fd, ret;
     FILE *fp;
 
-    fd = qemu_open(path, O_RDWR);
+    fd = qemu_open_old(path, O_RDWR);
     if (fd < 0) {
         return false;
     }
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Gerd Hoffmann

Just use qemu_open_old() for a quick fix, switch
to better error handling left for another day.

Fixes 448058aa99aa ("util: rename qemu_open() to qemu_open_old()")
Cc César Belley <[email protected]>
---
 hw/usb/u2f-emulated.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#2 lore raw
Quoted 4 lines · Daniel P. Berrangé
Quoted 3 lines · Gerd Hoffmann

Just use qemu_open_old() for a quick fix, switch
to better error handling left for another day.

Quoted 8 lines
Quoted 6 lines
Fixes 448058aa99aa ("util: rename qemu_open() to qemu_open_old()")
Cc César Belley <[email protected]>
---
 hw/usb/u2f-emulated.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

BTW, this breakage shows that we're missing CI coverage for this feature. the pre-requisite library needs to be added to any of the dockerfiles where it is available and ensure its covered by at least one of the gitlab CI jobs that exists.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|