1 qemu-xen-traditional/configure: define _GNU_SOURCE for NPTL defs
2 qemu-xen/configure: use -O2 for tests to eliminate fortify warnings (-Werror is in effect sometimes)
3 qemu-xen/configure: support usbredir 0.5+
4 tools/qemu-xen/block/iscsi.c: update for libiscsi 1.6.0(?)
5 --- xen-4.2.0/tools/qemu-xen-traditional/configure.orig 2012-09-06 18:05:30.000000000 +0200
6 +++ xen-4.2.0/tools/qemu-xen-traditional/configure 2012-10-27 08:16:21.702515768 +0200
12 -if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
13 +if $cc $ARCH_CFLAGS -D_GNU_SOURCE -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
22 # static link with sdl ?
23 - if test "$sdl" = "yes" ; then
24 + if test "$static" = "yes" -a "$sdl" = "yes" ; then
26 `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
27 sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
28 --- xen-4.2.0/tools/qemu-xen/configure.orig 2012-09-10 20:10:52.000000000 +0200
29 +++ xen-4.2.0/tools/qemu-xen/configure 2012-10-27 13:28:33.178396347 +0200
34 - echo $cc $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log
35 - $cc $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log 2>&1
36 + echo $cc -O2 $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log
37 + $cc -O2 $QEMU_CFLAGS -c -o $TMPO $TMPC >> config.log 2>&1
43 - echo $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log
44 - $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log 2>&1
45 + echo $cc -O2 $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log
46 + $cc -O2 $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags >> config.log 2>&1
49 @@ -2543,6 +2543,12 @@
50 usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)
51 QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
52 LIBS="$LIBS $usb_redir_libs"
53 + elif $pkg_config libusbredirparser-0.5 >/dev/null 2>&1 ; then
55 + usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)
56 + usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)
57 + QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
58 + LIBS="$LIBS $usb_redir_libs"
60 if test "$usb_redir" = "yes"; then
61 feature_not_found "usb-redir"
62 --- xen-4.2.0/tools/qemu-xen/block/iscsi.c.orig 2012-09-10 20:10:52.000000000 +0200
63 +++ xen-4.2.0/tools/qemu-xen/block/iscsi.c 2012-10-27 21:27:02.120524882 +0200
65 size = nb_sectors * BDRV_SECTOR_SIZE;
66 acb->buf = g_malloc(size);
67 qemu_iovec_to_buffer(acb->qiov, acb->buf);
68 - acb->task = iscsi_write10_task(iscsi, iscsilun->lun, acb->buf, size,
69 - sector_qemu2lun(sector_num, iscsilun),
70 - fua, 0, iscsilun->block_size,
71 + acb->task = iscsi_write10_task(iscsi, iscsilun->lun, sector_qemu2lun(sector_num, iscsilun),
72 + acb->buf, size, iscsilun->block_size,
74 iscsi_aio_write10_cb, acb);
75 if (acb->task == NULL) {
76 error_report("iSCSI: Failed to send write10 command. %s",
78 acb->task = iscsi_read10_task(iscsi, iscsilun->lun,
79 sector_qemu2lun(sector_num, iscsilun),
80 lun_read_size, iscsilun->block_size,
82 iscsi_aio_read10_cb, acb);
83 if (acb->task == NULL) {
84 error_report("iSCSI: Failed to send read10 command. %s",