X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=bt-vhci.c;h=9d277c32bf0c274f7340d53916337e9a43b9e276;hb=ddc2c3a57e0752c0650fdb735a8b8322542d4248;hp=146939313d59cae23cf2017c834af512326f3bef;hpb=ab2b6f507ded382df734fe6a237ec56e2f421de4;p=mirror_qemu.git
diff --git a/bt-vhci.c b/bt-vhci.c
index 146939313d..9d277c32bf 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -13,21 +13,17 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see .
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "qemu-char.h"
-#include "sysemu.h"
-#include "net.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
+#include "qemu/main-loop.h"
-#include
-
-#define VHCI_DEV "/dev/vhci"
+#define VHCI_DEV "/dev/vhci"
#define VHCI_UDEV "/dev/hci_vhci"
struct bt_vhci_s {
@@ -161,12 +157,12 @@ void bt_vhci_init(struct HCIInfo *info)
exit(-1);
}
- s = qemu_mallocz(sizeof(struct bt_vhci_s));
+ s = g_malloc0(sizeof(struct bt_vhci_s));
s->fd = fd;
s->info = info ?: qemu_next_hci();
s->info->opaque = s;
s->info->evt_recv = vhci_out_hci_packet_event;
s->info->acl_recv = vhci_out_hci_packet_acl;
- qemu_set_fd_handler(s->fd, vhci_read, 0, s);
+ qemu_set_fd_handler(s->fd, vhci_read, NULL, s);
}