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

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



The Darwin host support still needs some more work. It won't make it for
soft-freeze, but I'd like these preparatory patches to be merged anyway.

# gpg: Signature made Fri 29 Jun 2018 11:39:04 BST
# gpg:                using RSA key 71D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Gregory Kurz <gregory.kurz@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3  4910 71D4 D5E5 822F 73D6

* remotes/gkurz/tags/for-upstream:
  9p: darwin: Explicitly cast comparisons of mode_t with -1
  cutils: Provide strchrnul

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 75507f1a 230f1b31

configure

+18 −0
Original line number Diff line number Diff line
@@ -4796,6 +4796,21 @@ if compile_prog "" "" ; then 
    sem_timedwait=yes

fi



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

# check if we have strchrnul



strchrnul=no

cat > $TMPC << EOF

#include <string.h>

int main(void);

// Use a haystack that the compiler shouldn't be able to constant fold

char *haystack = (char*)&main;

int main(void) { return strchrnul(haystack, 'x') != &haystack[6]; }

EOF

if compile_prog "" "" ; then

    strchrnul=yes

fi



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

# check if trace backend exists
@@ -6280,6 +6295,9 @@ fi 
if test "$sem_timedwait" = "yes" ; then

  echo "CONFIG_SEM_TIMEDWAIT=y" >> $config_host_mak

fi

if test "$strchrnul" = "yes" ; then

  echo "HAVE_STRCHRNUL=y" >> $config_host_mak

fi

if test "$byteswap_h" = "yes" ; then

  echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak

fi

hmp.c

+4 −4
Original line number Diff line number Diff line
@@ -2145,12 +2145,12 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) 
    int has_hold_time = qdict_haskey(qdict, "hold-time");

    int hold_time = qdict_get_try_int(qdict, "hold-time", -1);

    Error *err = NULL;

    char *separator;

    const char *separator;

    int keyname_len;



    while (1) {

        separator = strchr(keys, '-');

        keyname_len = separator ? separator - keys : strlen(keys);

        separator = qemu_strchrnul(keys, '-');

        keyname_len = separator - keys;



        /* Be compatible with old interface, convert user inputted "<" */

        if (keys[0] == '<' && keyname_len == 1) {
@@ -2187,7 +2187,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) 
            keylist->value->u.qcode.data = idx;

        }



        if (!separator) {

        if (!*separator) {

            break;

        }

        keys = separator + 1;

hw/9pfs/9p-local.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int local_open_nofollow(FsContext *fs_ctx, const char *path, int flags, 
        assert(*path != '/');



        head = g_strdup(path);

        c = strchrnul(path, '/');

        c = qemu_strchrnul(path, '/');

        if (*c) {

            /* Intermediate path element */

            head[c - path] = 0;
@@ -308,7 +308,7 @@ update_map_file: 
    if (credp->fc_gid != -1) {

        gid = credp->fc_gid;

    }

    if (credp->fc_mode != -1) {

    if (credp->fc_mode != (mode_t)-1) {

        mode = credp->fc_mode;

    }

    if (credp->fc_rdev != -1) {
@@ -414,7 +414,7 @@ static int local_set_xattrat(int dirfd, const char *path, FsCred *credp) 
            return err;

        }

    }

    if (credp->fc_mode != -1) {

    if (credp->fc_mode != (mode_t)-1) {

        uint32_t tmp_mode = cpu_to_le32(credp->fc_mode);

        err = fsetxattrat_nofollow(dirfd, path, "user.virtfs.mode", &tmp_mode,

                                   sizeof(mode_t), 0);

include/qemu/cutils.h

+8 −0
Original line number Diff line number Diff line
@@ -122,6 +122,14 @@ int qemu_strnlen(const char *s, int max_len); 
 * Returns: the pointer originally in @input.

 */

char *qemu_strsep(char **input, const char *delim);

#ifdef HAVE_STRCHRNUL

static inline const char *qemu_strchrnul(const char *s, int c)

{

    return strchrnul(s, c);

}

#else

const char *qemu_strchrnul(const char *s, int c);

#endif

time_t mktimegm(struct tm *tm);

int qemu_fdatasync(int fd);

int fcntl_setfl(int fd, int flag);

monitor.c

+2 −6
Original line number Diff line number Diff line
@@ -820,9 +820,7 @@ static int compare_cmd(const char *name, const char *list) 
    p = list;

    for(;;) {

        pstart = p;

        p = strchr(p, '|');

        if (!p)

            p = pstart + strlen(pstart);

        p = qemu_strchrnul(p, '|');

        if ((p - pstart) == len && !memcmp(pstart, name, len))

            return 1;

        if (*p == '\0')
@@ -3491,9 +3489,7 @@ static void cmd_completion(Monitor *mon, const char *name, const char *list) 
    p = list;

    for(;;) {

        pstart = p;

        p = strchr(p, '|');

        if (!p)

            p = pstart + strlen(pstart);

        p = qemu_strchrnul(p, '|');

        len = p - pstart;

        if (len > sizeof(cmd) - 2)

            len = sizeof(cmd) - 2;