Commit e42590c2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* --help/--version improvements (Eric)
* GCC 7 workaround (Greg)
* Small SCSI fix (Hannes)
* SSE 4.1 fix (Joseph)
* RCU deadlock fix (myself)

# gpg: Signature made Tue 08 Aug 2017 16:28:56 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  maint: Include bug-reporting info in --help output
  qga: Give more --version information
  qemu-io: Give more --version information
  qemu-img: Sort sub-command names in --help
  target/i386: set rip_offset for some SSE4.1 instructions
  scsi: clarify sense codes for LUN0 emulation
  kvm: workaround build break on gcc-7.1.1 / fedora26
  Revert "rcu: do not create thread in pthread_atfork callback"
  rcu: completely disable pthread_atfork callbacks as soon as possible

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 53b080fa f5048cb7

bsd-user/main.c

+2 −0
Original line number Diff line number Diff line
@@ -686,6 +686,8 @@ static void usage(void) 
           "    -E var1=val2 -E var2=val2 -U LD_PRELOAD -U LD_DEBUG\n"

           "Note that if you provide several changes to single variable\n"

           "last change will stay in effect.\n"

           "\n"

           QEMU_HELP_BOTTOM "\n"

           ,

           TARGET_NAME,

           interp_prefix,

hw/scsi/scsi-bus.c

+6 −1
Original line number Diff line number Diff line
@@ -517,6 +517,11 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) 
{

    SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req);



    if (req->lun != 0) {

        scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED));

        scsi_req_complete(req, CHECK_CONDITION);

        return 0;

    }

    switch (buf[0]) {

    case REPORT_LUNS:

        if (!scsi_target_emulate_report_luns(r)) {
@@ -542,7 +547,7 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) 
    case TEST_UNIT_READY:

        break;

    default:

        scsi_req_build_sense(req, SENSE_CODE(LUN_NOT_SUPPORTED));

        scsi_req_build_sense(req, SENSE_CODE(INVALID_OPCODE));

        scsi_req_complete(req, CHECK_CONDITION);

        return 0;

    illegal_request:

include/qemu-common.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \

    "Fabrice Bellard and the QEMU Project developers"



/* Bug reporting information for --help arguments, About dialogs, etc */

#define QEMU_HELP_BOTTOM \

    "See <http://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \

    "More information on the QEMU project at <http://qemu.org>."



/* main function, renamed */

#if defined(CONFIG_COCOA)

int qemu_main(int argc, char **argv, char **envp);

include/qemu/rcu.h

+6 −1
Original line number Diff line number Diff line
@@ -105,7 +105,12 @@ extern void synchronize_rcu(void); 
 */

extern void rcu_register_thread(void);

extern void rcu_unregister_thread(void);

extern void rcu_after_fork(void);



/*

 * Support for fork().  fork() support is enabled at startup.

 */

extern void rcu_enable_atfork(void);

extern void rcu_disable_atfork(void);



struct rcu_head;

typedef void RCUCBFunc(struct rcu_head *head);

include/sysemu/kvm.h

+4 −10
Original line number Diff line number Diff line
@@ -428,11 +428,8 @@ int kvm_vm_check_extension(KVMState *s, unsigned int extension); 
            .flags = cap_flags,                                      \

        };                                                           \

        uint64_t args_tmp[] = { __VA_ARGS__ };                       \

        int i;                                                       \

        for (i = 0; i < (int)ARRAY_SIZE(args_tmp) &&                 \

                     i < ARRAY_SIZE(cap.args); i++) {                \

            cap.args[i] = args_tmp[i];                               \

        }                                                            \

        size_t n = MIN(ARRAY_SIZE(args_tmp), ARRAY_SIZE(cap.args));  \

        memcpy(cap.args, args_tmp, n * sizeof(cap.args[0]));         \

        kvm_vm_ioctl(s, KVM_ENABLE_CAP, &cap);                       \

    })
@@ -443,11 +440,8 @@ int kvm_vm_check_extension(KVMState *s, unsigned int extension); 
            .flags = cap_flags,                                      \

        };                                                           \

        uint64_t args_tmp[] = { __VA_ARGS__ };                       \

        int i;                                                       \

        for (i = 0; i < (int)ARRAY_SIZE(args_tmp) &&                 \

                     i < ARRAY_SIZE(cap.args); i++) {                \

            cap.args[i] = args_tmp[i];                               \

        }                                                            \

        size_t n = MIN(ARRAY_SIZE(args_tmp), ARRAY_SIZE(cap.args));  \

        memcpy(cap.args, args_tmp, n * sizeof(cap.args[0]));         \

        kvm_vcpu_ioctl(cpu, KVM_ENABLE_CAP, &cap);                   \

    })