Commit 087edb50 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/fixes-for-2.0' into staging 



* remotes/bonzini/fixes-for-2.0:
  vl.c: Output error on invalid machine type
  target-alpha: fix subl and s8subl indentation
  qemu-nbd: Fix coverity issues
  rules.mak: Fix per object libs extraction

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f4b11eee 025172d5

qemu-nbd.c

+13 −4
Original line number Diff line number Diff line
@@ -288,19 +288,19 @@ static void *nbd_client_thread(void *arg) 
    ret = nbd_receive_negotiate(sock, NULL, &nbdflags,

                                &size, &blocksize);

    if (ret < 0) {

        goto out;

        goto out_socket;

    }



    fd = open(device, O_RDWR);

    if (fd < 0) {

        /* Linux-only, we can use %m in printf.  */

        fprintf(stderr, "Failed to open %s: %m", device);

        goto out;

        goto out_socket;

    }



    ret = nbd_init(fd, sock, nbdflags, size, blocksize);

    if (ret < 0) {

        goto out;

        goto out_fd;

    }



    /* update partition table */
@@ -316,12 +316,16 @@ static void *nbd_client_thread(void *arg) 


    ret = nbd_client(fd);

    if (ret) {

        goto out;

        goto out_fd;

    }

    close(fd);

    kill(getpid(), SIGTERM);

    return (void *) EXIT_SUCCESS;



out_fd:

    close(fd);

out_socket:

    closesocket(sock);

out:

    kill(getpid(), SIGTERM);

    return (void *) EXIT_FAILURE;
@@ -355,6 +359,11 @@ static void nbd_accept(void *opaque) 
    socklen_t addr_len = sizeof(addr);



    int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len);

    if (fd < 0) {

        perror("accept");

        return;

    }



    if (state >= TERMINATE) {

        close(fd);

        return;

rules.mak

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d 
QEMU_INCLUDES += -I$(<D) -I$(@D)



maybe-add = $(filter-out $1, $2) $1

extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \

                  $(foreach o,$(call expand-objs,$1),$($o-libs))))

extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \

                  $(foreach o,$(call expand-objs,$1),$($o-libs)))

expand-objs = $(strip $(sort $(filter %.o,$1)) \

                  $(foreach o,$(filter %.mo,$1),$($o-objs)) \

                  $(filter-out %.o %.mo,$1))

target-alpha/translate.c

+2 −1
Original line number Diff line number Diff line
@@ -1929,6 +1929,7 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn) 
                        tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]);

                    }

                }

            }

            break;

        case 0x0B:

            /* S4SUBL */
@@ -1991,7 +1992,7 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn) 
                } else {

                    if (islit)

                        tcg_gen_movi_i64(cpu_ir[rc], -lit);

                    else

                    else {

                        tcg_gen_neg_i64(cpu_ir[rc], cpu_ir[rb]);

                        tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]);

                    }

vl.c

+13 −8
Original line number Diff line number Diff line
@@ -2651,6 +2651,10 @@ static MachineClass *machine_parse(const char *name) 
    if (mc) {

        return mc;

    }

    if (name && !is_help_option(name)) {

        error_report("Unsupported machine type");

        error_printf("Use -machine help to list supported machines!\n");

    } else {

        printf("Supported machines are:\n");

        for (el = machines; el; el = el->next) {

            MachineClass *mc = el->data;
@@ -2661,6 +2665,7 @@ static MachineClass *machine_parse(const char *name) 
            printf("%-20s %s%s\n", m->name, m->desc,

                   m->is_default ? " (default)" : "");

        }

    }



    g_slist_free(machines);

    exit(!name || !is_help_option(name));