Commit 496c1b19 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Guest ABI fixes for PC machines (hw_version)
* Fixes for recent Perl
* John Snow's configure fixes
* file-backed RAM improvements (Igor, Pavel)
* -Werror=clobbered fixes (Stefan)
* Kill -d ioport
* Fix qemu-system-s390x
* Performance improvement for kvmclock migration

# gpg: Signature made Thu 05 Nov 2015 13:42:27 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream:
  iscsi: Translate scsi sense into error code
  Revert "Introduce cpu_clean_all_dirty"
  kvmclock: add a new function to update env->tsc.
  configure: disable FORTIFY_SOURCE under clang
  backends/hostmem-file: Allow to specify full pathname for backing file
  configure: disallow ccache during compile tests
  cpu-exec: Fix compiler warning (-Werror=clobbered)
  memory: call begin, log_start and commit when registering a new listener
  megasas: Use qemu_hw_version() instead of QEMU_VERSION
  osdep: Rename qemu_{get, set}_version() to qemu_{, set_}hw_version()
  pc: Set hw_version on all machine classes
  qemu-log: remove -d ioport
  ioport: do not use CPU_LOG_IOPORT
  target-i386: fix pcmpxstrx equal-ordered (strstr) mode
  scripts/text2pod.pl: Escape left brace
  file_ram_alloc: propagate error to caller instead of terminating QEMU

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8835b9df e01dd3da

block/iscsi.c

+73 −20
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ typedef struct IscsiTask { 
    IscsiLun *iscsilun;

    QEMUTimer retry_timer;

    bool force_next_flush;

    int err_code;

} IscsiTask;



typedef struct IscsiAIOCB {
@@ -169,19 +170,70 @@ static inline unsigned exp_random(double mean) 
    return -mean * log((double)rand() / RAND_MAX);

}



/* SCSI_STATUS_TASK_SET_FULL and SCSI_STATUS_TIMEOUT were introduced

 * in libiscsi 1.10.0 as part of an enum. The LIBISCSI_API_VERSION

 * macro was introduced in 1.11.0. So use the API_VERSION macro as

 * a hint that the macros are defined and define them ourselves

 * otherwise to keep the required libiscsi version at 1.9.0 */

#if !defined(LIBISCSI_API_VERSION)

#define QEMU_SCSI_STATUS_TASK_SET_FULL  0x28

#define QEMU_SCSI_STATUS_TIMEOUT        0x0f000002

#else

#define QEMU_SCSI_STATUS_TASK_SET_FULL  SCSI_STATUS_TASK_SET_FULL

#define QEMU_SCSI_STATUS_TIMEOUT        SCSI_STATUS_TIMEOUT

/* SCSI_SENSE_ASCQ_INVALID_FIELD_IN_PARAMETER_LIST was introduced in

 * libiscsi 1.10.0, together with other constants we need.  Use it as

 * a hint that we have to define them ourselves if needed, to keep the

 * minimum required libiscsi version at 1.9.0.  We use an ASCQ macro for

 * the test because SCSI_STATUS_* is an enum.

 *

 * To guard against future changes where SCSI_SENSE_ASCQ_* also becomes

 * an enum, check against the LIBISCSI_API_VERSION macro, which was

 * introduced in 1.11.0.  If it is present, there is no need to define

 * anything.

 */

#if !defined(SCSI_SENSE_ASCQ_INVALID_FIELD_IN_PARAMETER_LIST) && \

    !defined(LIBISCSI_API_VERSION)

#define SCSI_STATUS_TASK_SET_FULL                          0x28

#define SCSI_STATUS_TIMEOUT                                0x0f000002

#define SCSI_SENSE_ASCQ_INVALID_FIELD_IN_PARAMETER_LIST    0x2600

#define SCSI_SENSE_ASCQ_PARAMETER_LIST_LENGTH_ERROR        0x1a00

#endif



static int iscsi_translate_sense(struct scsi_sense *sense)

{

    int ret;



    switch (sense->key) {

    case SCSI_SENSE_NOT_READY:

        return -EBUSY;

    case SCSI_SENSE_DATA_PROTECTION:

        return -EACCES;

    case SCSI_SENSE_COMMAND_ABORTED:

        return -ECANCELED;

    case SCSI_SENSE_ILLEGAL_REQUEST:

        /* Parse ASCQ */

        break;

    default:

        return -EIO;

    }

    switch (sense->ascq) {

    case SCSI_SENSE_ASCQ_PARAMETER_LIST_LENGTH_ERROR:

    case SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE:

    case SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB:

    case SCSI_SENSE_ASCQ_INVALID_FIELD_IN_PARAMETER_LIST:

        ret = -EINVAL;

        break;

    case SCSI_SENSE_ASCQ_LBA_OUT_OF_RANGE:

        ret = -ENOSPC;

        break;

    case SCSI_SENSE_ASCQ_LOGICAL_UNIT_NOT_SUPPORTED:

        ret = -ENOTSUP;

        break;

    case SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT:

    case SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED:

    case SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN:

        ret = -ENOMEDIUM;

        break;

    case SCSI_SENSE_ASCQ_WRITE_PROTECTED:

        ret = -EACCES;

        break;

    default:

        ret = -EIO;

        break;

    }

    return ret;

}



static void

iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,

                        void *command_data, void *opaque)
@@ -203,11 +255,11 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 
                goto out;

            }

            if (status == SCSI_STATUS_BUSY ||

                status == QEMU_SCSI_STATUS_TIMEOUT ||

                status == QEMU_SCSI_STATUS_TASK_SET_FULL) {

                status == SCSI_STATUS_TIMEOUT ||

                status == SCSI_STATUS_TASK_SET_FULL) {

                unsigned retry_time =

                    exp_random(iscsi_retry_times[iTask->retries - 1]);

                if (status == QEMU_SCSI_STATUS_TIMEOUT) {

                if (status == SCSI_STATUS_TIMEOUT) {

                    /* make sure the request is rescheduled AFTER the

                     * reconnect is initiated */

                    retry_time = EVENT_INTERVAL * 2;
@@ -226,6 +278,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 
                return;

            }

        }

        iTask->err_code = iscsi_translate_sense(&task->sense);

        error_report("iSCSI Failure: %s", iscsi_get_error(iscsi));

    } else {

        iTask->iscsilun->force_next_flush |= iTask->force_next_flush;
@@ -455,7 +508,7 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        return -EIO;

        return iTask.err_code;

    }



    iscsi_allocationmap_set(iscsilun, sector_num, nb_sectors);
@@ -644,7 +697,7 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        return -EIO;

        return iTask.err_code;

    }



    return 0;
@@ -683,7 +736,7 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        return -EIO;

        return iTask.err_code;

    }



    return 0;
@@ -703,7 +756,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, 
    if (status < 0) {

        error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",

                     iscsi_get_error(iscsi));

        acb->status = -EIO;

        acb->status = iscsi_translate_sense(&acb->task->sense);

    }



    acb->ioh->driver_status = 0;
@@ -905,7 +958,7 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        return -EIO;

        return iTask.err_code;

    }



    iscsi_allocationmap_clear(iscsilun, sector_num, nb_sectors);
@@ -999,7 +1052,7 @@ retry: 
    }



    if (iTask.status != SCSI_STATUS_GOOD) {

        return -EIO;

        return iTask.err_code;

    }



    if (flags & BDRV_REQ_MAY_UNMAP) {

configure

+20 −1
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
CLICOLOR_FORCE= GREP_OPTIONS=

unset CLICOLOR_FORCE GREP_OPTIONS



# Don't allow CCACHE, if present, to use cached results of compile tests!

export CCACHE_RECACHE=yes



# Temporary directory used for files created while

# configure runs. Since it is in the build directory

# we can safely blow away any previous version of it
@@ -261,6 +264,7 @@ rdma="" 
gprof="no"

debug_tcg="no"

debug="no"

fortify_source=""

strip_opt="yes"

tcg_interpreter="no"

bigendian="no"
@@ -876,6 +880,7 @@ for opt do 
      debug_tcg="yes"

      debug="yes"

      strip_opt="no"

      fortify_source="no"

  ;;

  --enable-sparse) sparse="yes"

  ;;
@@ -4398,6 +4403,7 @@ fi 
# check if ccache is interfering with

# semantic analysis of macros



unset CCACHE_CPP2

ccache_cpp2=no

cat > $TMPC << EOF

static const int Z = 1;
@@ -4421,6 +4427,19 @@ if ! compile_object "-Werror"; then 
    ccache_cpp2=yes

fi



#################################################

# clang does not support glibc + FORTIFY_SOURCE.



if test "$fortify_source" != "no"; then

  if echo | $cc -dM -E - | grep __clang__ > /dev/null 2>&1 ; then

    fortify_source="no";

  elif echo | $cxx -dM -E - | grep __clang__ > /dev/null 2>&1 ; then

    fortify_source="no";

  else

    fortify_source="yes"

  fi

fi



##########################################

# End of CC checks

# After here, no more $cc or $ld runs
@@ -4428,7 +4447,7 @@ fi 
if test "$gcov" = "yes" ; then

  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"

  LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"

elif test "$debug" = "no" ; then

elif test "$fortify_source" = "yes" ; then

  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"

fi

cpu-exec.c

+15 −3
Original line number Diff line number Diff line
@@ -539,15 +539,27 @@ int cpu_exec(CPUState *cpu) 
                   only be set by a memory fault) */

            } /* for(;;) */

        } else {

            /* Reload env after longjmp - the compiler may have smashed all

             * local variables as longjmp is marked 'noreturn'. */

#if defined(__clang__) || !QEMU_GNUC_PREREQ(4, 6)

            /* Some compilers wrongly smash all local variables after

             * siglongjmp. There were bug reports for gcc 4.5.0 and clang.

             * Reload essential local variables here for those compilers.

             * Newer versions of gcc would complain about this code (-Wclobbered). */

            cpu = current_cpu;

            cc = CPU_GET_CLASS(cpu);

            cpu->can_do_io = 1;

#ifdef TARGET_I386

            x86_cpu = X86_CPU(cpu);

            env = &x86_cpu->env;

#endif

#else /* buggy compiler */

            /* Assert that the compiler does not smash local variables. */

            g_assert(cpu == current_cpu);

            g_assert(cc == CPU_GET_CLASS(cpu));

#ifdef TARGET_I386

            g_assert(x86_cpu == X86_CPU(cpu));

            g_assert(env == &x86_cpu->env);

#endif

#endif /* buggy compiler */

            cpu->can_do_io = 1;

            tb_lock_reset();

        }

    } /* for(;;) */

cpus.c

+0 −9
Original line number Diff line number Diff line
@@ -694,15 +694,6 @@ void cpu_synchronize_all_post_init(void) 
    }

}



void cpu_clean_all_dirty(void)

{

    CPUState *cpu;



    CPU_FOREACH(cpu) {

        cpu_clean_state(cpu);

    }

}



static int do_vm_stop(RunState state)

{

    int ret = 0;

exec.c

+22 −18
Original line number Diff line number Diff line
@@ -1205,6 +1205,7 @@ static void *file_ram_alloc(RAMBlock *block, 
                            const char *path,

                            Error **errp)

{

    struct stat st;

    char *filename;

    char *sanitized_name;

    char *c;
@@ -1233,26 +1234,33 @@ static void *file_ram_alloc(RAMBlock *block, 
        goto error;

    }



    if (!stat(path, &st) && S_ISDIR(st.st_mode)) {

        /* Make name safe to use with mkstemp by replacing '/' with '_'. */

        sanitized_name = g_strdup(memory_region_name(block->mr));

        for (c = sanitized_name; *c != '\0'; c++) {

        if (*c == '/')

            if (*c == '/') {

                *c = '_';

            }

        }



        filename = g_strdup_printf("%s/qemu_back_mem.%s.XXXXXX", path,

                                   sanitized_name);

        g_free(sanitized_name);



        fd = mkstemp(filename);

        if (fd >= 0) {

            unlink(filename);

        }

        g_free(filename);

    } else {

        fd = open(path, O_RDWR | O_CREAT, 0644);

    }



    if (fd < 0) {

        error_setg_errno(errp, errno,

                         "unable to create backing store for hugepages");

        g_free(filename);

        goto error;

    }

    unlink(filename);

    g_free(filename);



    memory = ROUND_UP(memory, hpagesize);
@@ -1282,10 +1290,6 @@ static void *file_ram_alloc(RAMBlock *block, 
    return area;



error:

    if (mem_prealloc) {

        error_report("%s", error_get_pretty(*errp));

        exit(1);

    }

    return NULL;

}

#endif
@@ -2698,8 +2702,8 @@ void cpu_register_map_client(QEMUBH *bh) 
void cpu_exec_init_all(void)

{

    qemu_mutex_init(&ram_list.mutex);

    memory_map_init();

    io_mem_init();

    memory_map_init();

    qemu_mutex_init(&map_client_list_lock);

}