Merge remote-tracking branch 'stefanha/trivial-patches' into staging

# By Ed Maste (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  bsd-user: Track change in FreeBSD SYSCTL(9) types
  virtio: Fix compilation without CONFIG_VHOST_SCSI
  qemu-doc: Option -ignore-environment removed.
  s390x: use CONFIG_INT128 to detect __uint128_t
  linux-user: fix compile error due to stray colon at end of #ifdef line

Message-id: 1366975563-16216-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c
index 18b43f1a2afc28fad6edde758998f0566bd449cc..69e3466a086f44ce657a64559e16fdea4c678583 100644 (file)
--- a/bsd-user/syscall.c
+++ b/bsd-user/syscall.c
@@ -211,7 +211,11 @@ static int sysctl_oldcvt(void *holdp, size_t holdlen, uint32_t kind)
         *(uint64_t *)holdp = tswap64(*(unsigned long *)holdp);
         break;
 #endif
+#if !defined(__FreeBSD_version) || __FreeBSD_version < 900031
     case CTLTYPE_QUAD:
+#else
+    case CTLTYPE_U64:
+#endif
         *(uint64_t *)holdp = tswap64(*(uint64_t *)holdp);
         break;
     case CTLTYPE_STRING:

diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
index cf51a85fcf8837708874246146688018079bf353..a7e81d159f2062d4cb5b47c3cd43b254dc699ee5 100644 (file)
--- a/hw/s390x/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -691,7 +691,9 @@ static void s390_virtio_register_types(void)
     type_register_static(&s390_virtio_blk);
     type_register_static(&s390_virtio_net);
     type_register_static(&s390_virtio_scsi);
+#ifdef CONFIG_VHOST_SCSI
     type_register_static(&s390_vhost_scsi);
+#endif
     type_register_static(&s390_virtio_rng);
     type_register_static(&s390_virtio_bridge_info);
 }

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index b857413fa4e93ff8526390e30773f52acd6d48e7..c0f26460a903cd6b359eb76b4fd5b61c2d8b3082 100644 (file)
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1095,7 +1095,9 @@ static void virtio_ccw_register(void)
     type_register_static(&virtio_ccw_net);
     type_register_static(&virtio_ccw_balloon);
     type_register_static(&virtio_ccw_scsi);
+#ifdef CONFIG_VHOST_SCSI
     type_register_static(&vhost_ccw_scsi);
+#endif
     type_register_static(&virtio_ccw_rng);
     type_register_static(&virtual_css_bridge_info);
 }

diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
index 04ba1b99ee5ccf06db980da4c00ccdc373b30798..121a5f8c4a3647842e441dc8c630a09ca7e6a869 100644 (file)
--- a/hw/s390x/virtio-ccw.h
+++ b/hw/s390x/virtio-ccw.h
@@ -101,6 +101,7 @@ typedef struct VirtIOSCSICcw {
     VirtIOSCSI vdev;
 } VirtIOSCSICcw;
 
+#ifdef CONFIG_VHOST_SCSI
 /* vhost-scsi-ccw */
 
 #define TYPE_VHOST_SCSI_CCW "vhost-scsi-ccw"
@@ -111,6 +112,7 @@ typedef struct VHostSCSICcw {
     VirtioCcwDevice parent_obj;
     VHostSCSI vdev;
 } VHostSCSICcw;
+#endif
 
 /* virtio-blk-ccw */
 

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index c705960d7e3e5b1cfae1fb5a91537c241f2ba123..30e93bc0d01b329ebc8fc68361b4c16af2775689 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7603,7 +7603,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #endif
 #else
     case TARGET_NR_sendfile:
-#ifdef TARGET_NR_sendfile64:
+#ifdef TARGET_NR_sendfile64
     case TARGET_NR_sendfile64:
 #endif
         goto unimplemented;

diff --git a/qemu-doc.texi b/qemu-doc.texi
index dfea4d379990e21311dea6caaf932c4d65ebe2bf..64493ebfced4e1c7a98848ba12761e16684c84ab 100644 (file)
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2683,9 +2683,6 @@ Set the x86 elf interpreter prefix (default=/usr/local/qemu-i386)
 Set the x86 stack size in bytes (default=524288)
 @item -cpu model
 Select CPU model (-cpu help for list and additional feature selection)
-@item -ignore-environment
-Start with an empty environment. Without this option,
-the initial environment is a copy of the caller's environment.
 @item -E @var{var}=@var{value}
 Set environment @var{var} to @var{value}.
 @item -U @var{var}

diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c
index af16b21baaf7998ace04e7cace61b074b2780ca2..85e49aafa687dc29c1cbf4338231ac7c21efeb36 100644 (file)
--- a/target-s390x/int_helper.c
+++ b/target-s390x/int_helper.c
@@ -97,8 +97,7 @@ uint64_t HELPER(divu64)(CPUS390XState *env, uint64_t ah, uint64_t al,
         ret = al / b;
     } else {
         /* ??? Move i386 idivq helper to host-utils.  */
-#if HOST_LONG_BITS == 64 && defined(__GNUC__)
-        /* assuming 64-bit hosts have __uint128_t */
+#ifdef CONFIG_INT128
         __uint128_t a = ((__uint128_t)ah << 64) | al;
         __uint128_t q = a / b;
         env->retxl = a % b;