nbd: Always call "close_fn" in nbd_client_new

[qemu.git] / bt-host.c

diff --git a/bt-host.c b/bt-host.c
index 311864517defc53d4c8e1615c51a291b23c5de64..49205bf288cf2441b1a78486c1593c8c576c1967 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,9 +18,8 @@
  */
 
 #include "qemu-common.h"
-#include "net.h"
-#include "bt-host.h"
-#include "main-loop.h"
+#include "sysemu/bt.h"
+#include "qemu/main-loop.h"
 
 #ifndef _WIN32
 # include <errno.h>
@@ -172,7 +171,7 @@ struct HCIInfo *bt_host_hci(const char *id)
     hci_filter_all_ptypes(&flt);
     hci_filter_all_events(&flt);
 
-    if (setsockopt(fd, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
+    if (qemu_setsockopt(fd, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
         fprintf(stderr, "qemu: Can't set HCI filter on socket (%i)\n", errno);
         return 0;
     }