i386: Update new x86_apicid parsing rules with die_offset support

[mirror_qemu.git] / bt-vhci.c

diff --git a/bt-vhci.c b/bt-vhci.c
index 146939313d59cae23cf2017c834af512326f3bef..886e146743c5e3564fd2d20728a4b03250f91863 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -13,21 +13,16 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "qemu-common.h"
-#include "qemu-char.h"
-#include "sysemu.h"
-#include "net.h"
+#include "qemu/osdep.h"
+#include "sysemu/bt.h"
 #include "hw/bt.h"
+#include "qemu/main-loop.h"
 
-#include <sys/uio.h>
-
-#define VHCI_DEV       "/dev/vhci" 
+#define VHCI_DEV       "/dev/vhci"
 #define VHCI_UDEV      "/dev/hci_vhci"
 
 struct bt_vhci_s {
@@ -161,12 +156,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);
 }