Commit 7135781f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into staging 



trivial patches for 2014-11-02

# gpg: Signature made Sun 02 Nov 2014 11:54:43 GMT 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-2014-11-02: (23 commits)
  vdi: wrapped uuid_unparse() in #ifdef
  tap: fix possible fd leak in net_init_tap
  tap: do not close(fd) in net_init_tap_one
  target-i386: Remove unused model_features_t struct
  tap_int.h: remove repeating NETWORK_SCRIPT defines
  os-posix: reorder parent notification for -daemonize
  pidfile: stop making pidfile error a special case
  os-posix: replace goto again with a proper loop
  os-posix: use global daemon_pipe instead of cryptic fds[1]
  dump: Fix dump-guest-memory termination and use-after-close
  virtio-9p-proxy: improve error messages in connect_namedsocket()
  virtio-9p-proxy: fix error return in proxy_init()
  virtio-9p-proxy: Fix sockfd leak
  target-tricore: check return value before using it
  net/slirp: specify logbase for smbd
  Revert "os-posix: report error message when lock file failed"
  util: Improve os_mem_prealloc error message
  sparse: fix build
  target-arm: A64: remove redundant store
  target-xtensa: mark XtensaConfig structs as unused
  ...

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

block/vdi.c

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static inline int uuid_is_null(const uuid_t uu) 
    return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;

}



# if defined(CONFIG_VDI_DEBUG)

static inline void uuid_unparse(const uuid_t uu, char *out)

{

    snprintf(out, 37, UUID_FMT,
@@ -144,6 +145,7 @@ static inline void uuid_unparse(const uuid_t uu, char *out) 
            uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);

}

# endif

#endif



typedef struct {

    char text[0x40];

configure

+1 −0
Original line number Diff line number Diff line
@@ -4908,6 +4908,7 @@ echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak 
echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $config_host_mak

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

  echo "CC           := REAL_CC=\"\$(CC)\" cgcc"       >> $config_host_mak

  echo "CXX          := REAL_CC=\"\$(CXX)\" cgcc"      >> $config_host_mak

  echo "HOST_CC      := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_host_mak

  echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak

fi

dump.c

+4 −7
Original line number Diff line number Diff line
@@ -604,10 +604,9 @@ static void dump_iterate(DumpState *s, Error **errp) 
{

    GuestPhysBlock *block;

    int64_t size;

    int ret;

    Error *local_err = NULL;



    while (1) {

    do {

        block = s->next_block;



        size = block->target_end - block->target_start;
@@ -623,12 +622,10 @@ static void dump_iterate(DumpState *s, Error **errp) 
            return;

        }



        ret = get_next_block(s, block);

        if (ret == 1) {

    } while (!get_next_block(s, block));



    dump_completed(s);

}

    }

}



static void create_vmcore(DumpState *s, Error **errp)

{

hw/9pfs/virtio-9p-proxy.c

+7 −4
Original line number Diff line number Diff line
@@ -1104,14 +1104,15 @@ static int connect_namedsocket(const char *path) 


    sockfd = socket(AF_UNIX, SOCK_STREAM, 0);

    if (sockfd < 0) {

        fprintf(stderr, "socket %s\n", strerror(errno));

        fprintf(stderr, "failed to create socket: %s\n", strerror(errno));

        return -1;

    }

    strcpy(helper.sun_path, path);

    helper.sun_family = AF_UNIX;

    size = strlen(helper.sun_path) + sizeof(helper.sun_family);

    if (connect(sockfd, (struct sockaddr *)&helper, size) < 0) {

        fprintf(stderr, "socket error\n");

        fprintf(stderr, "failed to connect to %s: %s\n", path, strerror(errno));

        close(sockfd);

        return -1;

    }
@@ -1154,10 +1155,12 @@ static int proxy_init(FsContext *ctx) 
        sock_id = atoi(ctx->fs_root);

        if (sock_id < 0) {

            fprintf(stderr, "socket descriptor not initialized\n");

        }

    }

    if (sock_id < 0) {

        g_free(proxy);

        return -1;

    }

    }

    g_free(ctx->fs_root);

    ctx->fs_root = NULL;

hw/tricore/tricore_testboard.c

+1 −1
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ static void tricore_testboard_init(MachineState *machine, int board_id) 
        machine->cpu_model = "tc1796";

    }

    cpu = cpu_tricore_init(machine->cpu_model);

    env = &cpu->env;

    if (!cpu) {

        error_report("Unable to find CPU definition");

        exit(1);

    }

    env = &cpu->env;

    memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", 2*1024*1024, &error_abort);

    vmstate_register_ram_global(ext_cram);

    memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", 4*1024*1024, &error_abort);