← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to bt-host.c

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
bt-host.c
14
14
 * GNU General Public License for more details.
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License along
17
 
 * with this program; if not, write to the Free Software Foundation, Inc.,
18
 
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
17
 * with this program; if not, see <http://www.gnu.org/licenses/>.
19
18
 */
20
19
 
21
20
#include "qemu-common.h"
22
21
#include "qemu-char.h"
23
22
#include "sysemu.h"
24
23
#include "net.h"
 
24
#include "bt-host.h"
25
25
 
26
26
#ifndef _WIN32
27
27
# include <errno.h>
52
52
    struct iovec iv[2];
53
53
    int ret;
54
54
 
55
 
    iv[0].iov_base = &pkt;
 
55
    iv[0].iov_base = (void *)&pkt;
56
56
    iv[0].iov_len  = 1;
57
57
    iv[1].iov_base = (void *) data;
58
58
    iv[1].iov_len  = len;
171
171
    if (fd < 0) {
172
172
        fprintf(stderr, "qemu: Can't open `%s': %s (%i)\n",
173
173
                        id, strerror(errno), errno);
174
 
        return 0;
 
174
        return NULL;
175
175
    }
176
176
 
177
177
# ifdef CONFIG_BLUEZ
192
192
    s->hci.acl_send = bt_host_acl;
193
193
    s->hci.bdaddr_set = bt_host_bdaddr_set;
194
194
 
195
 
    qemu_set_fd_handler2(s->fd, bt_host_read_poll, bt_host_read, 0, s);
 
195
    qemu_set_fd_handler2(s->fd, bt_host_read_poll, bt_host_read, NULL, s);
196
196
 
197
197
    return &s->hci;
198
198
}