OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'kwolf/for-anthony' into staging

Browse Source 
* kwolf/for-anthony:
  qemu-img: Fix segmentation fault
  qcow2: Don't ignore failure to clear autoclear flags
  coroutine: Fix setup of sigaltstack coroutines
This commit is contained in:
Anthony Liguori 2012-05-14 12:45:01 -05:00
commit 9cc31772bf
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/qcow2.c
View File

@ -300,7 +300,10 @@ static int qcow2_open(BlockDriverState *bs, int flags)
if (!bs->read_only && s->autoclear_features != 0) { if (!bs->read_only && s->autoclear_features != 0) {
s->autoclear_features = 0; s->autoclear_features = 0;
qcow2_update_header(bs); ret = qcow2_update_header(bs);
if (ret < 0) {
goto fail;
}
} }
/* Check support for various header values */ /* Check support for various header values */

2
coroutine-sigaltstack.c
View File

@ -226,7 +226,7 @@ static Coroutine *coroutine_new(void)
* called. * called.
*/ */
coTS->tr_called = 0; coTS->tr_called = 0;
kill(getpid(), SIGUSR2); pthread_kill(pthread_self(), SIGUSR2);
sigfillset(&sigs); sigfillset(&sigs);
sigdelset(&sigs, SIGUSR2); sigdelset(&sigs, SIGUSR2);
while (!coTS->tr_called) { while (!coTS->tr_called) {

4
qemu-img.c
View File

@ -712,6 +712,9 @@ static int img_convert(int argc, char **argv)
out_filename = argv[argc - 1]; out_filename = argv[argc - 1];
/* Initialize before goto out */
qemu_progress_init(progress, 2.0);
if (options && !strcmp(options, "?")) { if (options && !strcmp(options, "?")) {
ret = print_block_option_help(out_filename, out_fmt); ret = print_block_option_help(out_filename, out_fmt);
goto out; goto out;
@ -724,7 +727,6 @@ static int img_convert(int argc, char **argv)
goto out; goto out;
} }
qemu_progress_init(progress, 2.0);
qemu_progress_print(0, 100); qemu_progress_print(0, 100);
bs = g_malloc0(bs_n * sizeof(BlockDriverState *)); bs = g_malloc0(bs_n * sizeof(BlockDriverState *));