david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-03-17 13:05:48 +00:00
commit 087edb503a
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu-nbd.c
View File

@ -288,19 +288,19 @@ static void *nbd_client_thread(void *arg)
ret = nbd_receive_negotiate(sock, NULL, &nbdflags, ret = nbd_receive_negotiate(sock, NULL, &nbdflags,
&size, &blocksize); &size, &blocksize);
if (ret < 0) { if (ret < 0) {
goto out; goto out_socket;
} }
fd = open(device, O_RDWR); fd = open(device, O_RDWR);
if (fd < 0) { if (fd < 0) {
/* Linux-only, we can use %m in printf. */ /* Linux-only, we can use %m in printf. */
fprintf(stderr, "Failed to open %s: %m", device); fprintf(stderr, "Failed to open %s: %m", device);
goto out; goto out_socket;
} }
ret = nbd_init(fd, sock, nbdflags, size, blocksize); ret = nbd_init(fd, sock, nbdflags, size, blocksize);
if (ret < 0) { if (ret < 0) {
goto out; goto out_fd;
} }
/* update partition table */ /* update partition table */
@ -316,12 +316,16 @@ static void *nbd_client_thread(void *arg)
ret = nbd_client(fd); ret = nbd_client(fd);
if (ret) { if (ret) {
goto out; goto out_fd;
} }
close(fd); close(fd);
kill(getpid(), SIGTERM); kill(getpid(), SIGTERM);
return (void *) EXIT_SUCCESS; return (void *) EXIT_SUCCESS;
out_fd:
close(fd);
out_socket:
closesocket(sock);
out: out:
kill(getpid(), SIGTERM); kill(getpid(), SIGTERM);
return (void *) EXIT_FAILURE; return (void *) EXIT_FAILURE;
@ -355,6 +359,11 @@ static void nbd_accept(void *opaque)
socklen_t addr_len = sizeof(addr); socklen_t addr_len = sizeof(addr);
int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len);
if (fd < 0) {
perror("accept");
return;
}
if (state >= TERMINATE) { if (state >= TERMINATE) {
close(fd); close(fd);
return; return;

4
rules.mak
View File

@ -23,8 +23,8 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
QEMU_INCLUDES += -I$(<D) -I$(@D) QEMU_INCLUDES += -I$(<D) -I$(@D)
maybe-add = $(filter-out $1, $2) $1 maybe-add = $(filter-out $1, $2) $1
extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs)) \ extract-libs = $(strip $(sort $(foreach o,$1,$($o-libs))) \
$(foreach o,$(call expand-objs,$1),$($o-libs)))) $(foreach o,$(call expand-objs,$1),$($o-libs)))
expand-objs = $(strip $(sort $(filter %.o,$1)) \ expand-objs = $(strip $(sort $(filter %.o,$1)) \
$(foreach o,$(filter %.mo,$1),$($o-objs)) \ $(foreach o,$(filter %.mo,$1),$($o-objs)) \
$(filter-out %.o %.mo,$1)) $(filter-out %.o %.mo,$1))

3
target-alpha/translate.c
View File

@ -1927,6 +1927,7 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
else { else {
tcg_gen_neg_i64(cpu_ir[rc], cpu_ir[rb]); tcg_gen_neg_i64(cpu_ir[rc], cpu_ir[rb]);
tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]); tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]);
}
} }
} }
break; break;
@ -1991,7 +1992,7 @@ static ExitStatus translate_one(DisasContext *ctx, uint32_t insn)
} else { } else {
if (islit) if (islit)
tcg_gen_movi_i64(cpu_ir[rc], -lit); tcg_gen_movi_i64(cpu_ir[rc], -lit);
else else {
tcg_gen_neg_i64(cpu_ir[rc], cpu_ir[rb]); tcg_gen_neg_i64(cpu_ir[rc], cpu_ir[rb]);
tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]); tcg_gen_ext32s_i64(cpu_ir[rc], cpu_ir[rc]);
} }

21
vl.c
View File

@ -2651,15 +2651,20 @@ static MachineClass *machine_parse(const char *name)
if (mc) { if (mc) {
return mc; return mc;
} }
printf("Supported machines are:\n"); if (name && !is_help_option(name)) {
for (el = machines; el; el = el->next) { error_report("Unsupported machine type");
MachineClass *mc = el->data; error_printf("Use -machine help to list supported machines!\n");
QEMUMachine *m = mc->qemu_machine; } else {
if (m->alias) { printf("Supported machines are:\n");
printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name); for (el = machines; el; el = el->next) {
MachineClass *mc = el->data;
QEMUMachine *m = mc->qemu_machine;
if (m->alias) {
printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
}
printf("%-20s %s%s\n", m->name, m->desc,
m->is_default ? " (default)" : "");
} }
printf("%-20s %s%s\n", m->name, m->desc,
m->is_default ? " (default)" : "");
} }
g_slist_free(machines); g_slist_free(machines);