Commit 8ec4fe0a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging 



trivial patches for 2016-05-18

# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
  Fix some typos found by codespell
  9p: drop unused declaration from coth.h
  smbios: fix typo
  accel: make configure_accelerator return void
  configure: Use uniform description for devel packages
  ipack: Update e-mail address
  util: fix comment typos
  qdict: fix unbounded stack warning for qdict_array_entries
  Fix typo in variable name (found and fixed by codespell)
  vl: fix comment about when parsing cpu definitions
  loader: fix potential memory leak
  remove comment for nonexistent structure member
  s390: remove misleading comment

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a257c741 cb8d4c8f

accel.c

+1 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 
    return ret;

}



int configure_accelerator(MachineState *ms)

void configure_accelerator(MachineState *ms)

{

    const char *p;

    char buf[10];
@@ -128,8 +128,6 @@ int configure_accelerator(MachineState *ms) 
    if (init_failed) {

        fprintf(stderr, "Back to %s accelerator.\n", acc->name);

    }



    return !accel_initialised;

}

audio/mixeng.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ f_sample *mixeng_clip[2][2][2][3] = { 
 * August 21, 1998

 * Copyright 1998 Fabrice Bellard.

 *

 * [Rewrote completly the code of Lance Norskog And Sundry

 * [Rewrote completely the code of Lance Norskog And Sundry

 * Contributors with a more efficient algorithm.]

 *

 * This source code is freely redistributable and may be used for

audio/ossaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static struct audio_option oss_options[] = { 
        .name  = "EXCLUSIVE",

        .tag   = AUD_OPT_BOOL,

        .valp  = &glob_conf.exclusive,

        .descr = "Open device in exclusive mode (vmix wont work)"

        .descr = "Open device in exclusive mode (vmix won't work)"

    },

#ifdef USE_DSP_POLICY

    {

configure

+1 −1
Original line number Diff line number Diff line
@@ -4611,7 +4611,7 @@ if test "$softmmu" = yes ; then 
      tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"

    else

      if test "$virtfs" = yes; then

        error_exit "VirtFS is supported only on Linux and requires libcap-devel and libattr-devel"

        error_exit "VirtFS is supported only on Linux and requires libcap devel and libattr devel"

      fi

      virtfs=no

    fi

contrib/ivshmem-server/ivshmem-server.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * unix socket. For each client, the server will create some eventfd

 * (see EVENTFD(2)), one per vector. These fd are transmitted to all

 * clients using the SCM_RIGHTS cmsg message. Therefore, each client is

 * able to send a notification to another client without beeing

 * able to send a notification to another client without being

 * "profixied" by the server.

 *

 * We use this mechanism to send interruptions between guests.