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

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



# gpg: Signature made Fri 20 Oct 2017 13:02:25 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  oslib-posix: Fix compiler warning and some data types

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 718757ec e947d47d

util/oslib-posix.c

+8 −7
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 


struct MemsetThread {

    char *addr;

    uint64_t numpages;

    uint64_t hpagesize;

    size_t numpages;

    size_t hpagesize;

    QemuThread pgthread;

    sigjmp_buf env;

};
@@ -301,11 +301,7 @@ static void sigbus_handler(int signal) 
static void *do_touch_pages(void *arg)

{

    MemsetThread *memset_args = (MemsetThread *)arg;

    char *addr = memset_args->addr;

    uint64_t numpages = memset_args->numpages;

    uint64_t hpagesize = memset_args->hpagesize;

    sigset_t set, oldset;

    int i = 0;



    /* unblock SIGBUS */

    sigemptyset(&set);
@@ -315,6 +311,10 @@ static void *do_touch_pages(void *arg) 
    if (sigsetjmp(memset_args->env, 1)) {

        memset_thread_failed = true;

    } else {

        char *addr = memset_args->addr;

        size_t numpages = memset_args->numpages;

        size_t hpagesize = memset_args->hpagesize;

        size_t i;

        for (i = 0; i < numpages; i++) {

            /*

             * Read & write back the same value, so we don't
@@ -351,7 +351,8 @@ static inline int get_memset_num_threads(int smp_cpus) 
static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,

                            int smp_cpus)

{

    uint64_t numpages_per_thread, size_per_thread;

    size_t numpages_per_thread;

    size_t size_per_thread;

    char *addr = area;

    int i = 0;