[Qemu-devel] [PULL v2 for-2.1 0/3] virtio-scsi fixes, and block/iscsi compilation fix

[Qemu-devel] [PULL v2 for-2.1 0/3] virtio-scsi fixes, and block/iscsi compilation fix

[Paolo Bonzini]

The following changes since commit ec9fe956d5c728da770db5ec9bc429080ccb5043:

  Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging (2014-06-30 15:56:00 +0100)

are available in the git repository at:


  git://github.com/bonzini/qemu.git scsi-next

for you to fetch changes up to f80ea9862fed7ca89a672785bdce0e2611f9ba97:

  configure: Fix -lm test, so that tools can be compiled on hosts that require -lm (2014-07-01 10:36:28 +0200)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      configure: Fix -lm test, so that tools can be compiled on hosts that require -lm

Cédric Le Goater (1):
      virtio-scsi: scsi events must be converted to target endianness

Greg Kurz (1):
      virtio-scsi: virtio_scsi_push_event() lacks VirtIOSCSIReq parsing

 Makefile.target       |  4 ----
 configure             |  2 +-
 hw/scsi/virtio-scsi.c | 12 +++---------
 3 files changed, 4 insertions(+), 14 deletions(-)
-- 
1.8.3.1

[Qemu-devel] [PULL v2 for-2.1 3/3] configure: Fix -lm test, so that tools can be compiled on hosts that require -lm

[Paolo Bonzini]

From: Alexey Kardashevskiy <aik@ozlabs.ru>

The existing test whether "-lm" needs to be included or not is
insufficient as it reports false negative on Fedora20/ppc64.
This happens because sin(0.0) is a constant value which compiler
can safely throw away and therefore there is no need to add "-lm".
As the result, qemu-nbd/qemu-io/qemu-img tools cannot compile.

This adds a global variable and uses it in the test to prevent
from optimization.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
[Use Peter's improvement on the test to fool LTO, and remove the
 now useless -lm addition in Makefile.target. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile.target | 4 ----
 configure       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 6089d29..137d0b0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -163,10 +163,6 @@ dummy := $(call unnest-vars,.., \
 all-obj-y += $(common-obj-y)
 all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
 
-ifndef CONFIG_HAIKU
-LIBS+=-lm
-endif
-
 # build either PROG or PROGW
 $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
 	$(call LINK,$^)
diff --git a/configure b/configure
index 23ecb37..ed41eda 100755
--- a/configure
+++ b/configure
@@ -3453,7 +3453,7 @@ fi
 # Do we need libm
 cat > $TMPC << EOF
 #include <math.h>
-int main(void) { return isnan(sin(0.0)); }
+int main(int argc, char **argv) { return isnan(sin((double)argc)); }
 EOF
 if compile_prog "" "" ; then
   :
-- 
1.8.3.1

Re: [Qemu-devel] [PULL v2 for-2.1 0/3] virtio-scsi fixes, and block/iscsi compilation fix

[Peter Maydell]

On 1 July 2014 09:39, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit ec9fe956d5c728da770db5ec9bc429080ccb5043:
>
>   Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging (2014-06-30 15:56:00 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git scsi-next
>
> for you to fetch changes up to f80ea9862fed7ca89a672785bdce0e2611f9ba97:
>
>   configure: Fix -lm test, so that tools can be compiled on hosts that require -lm (2014-07-01 10:36:28 +0200)
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (1):
>       configure: Fix -lm test, so that tools can be compiled on hosts that require -lm
>
> Cédric Le Goater (1):
>       virtio-scsi: scsi events must be converted to target endianness
>
> Greg Kurz (1):
>       virtio-scsi: virtio_scsi_push_event() lacks VirtIOSCSIReq parsing
>
>  Makefile.target       |  4 ----
>  configure             |  2 +-
>  hw/scsi/virtio-scsi.c | 12 +++---------
>  3 files changed, 4 insertions(+), 14 deletions(-)

Applied, thanks.

-- PMM