xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-25 04:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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>
This commit is contained in:
Anthony Liguori 2013-04-26 08:32:13 -05:00
commit 186b027d98
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd-user/syscall.c
View File

@ -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:

2
hw/s390x/s390-virtio-bus.c
View File

@ -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);
}

2
hw/s390x/virtio-ccw.c
View File

@ -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);
}

2
hw/s390x/virtio-ccw.h
View File

@ -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 */

2
linux-user/syscall.c
View File

@ -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;

3
qemu-doc.texi
View File

@ -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}

3
target-s390x/int_helper.c
View File

@ -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;