diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-27 16:26:18 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-04-27 16:26:18 +0200 |
| commit | aa348082d8e89d2ab021caadbcc97c93038fffb2 (patch) | |
| tree | 2925d93352e37255827b17b98aa8cee1a6a6a69f /qemu-img.c | |
| parent | c6a0487b1fc29bc6047da0e484f79d4d627f9018 (diff) | |
| parent | df6e008a8814af9db872f1319b58784d87987c93 (diff) | |
| download | focaccia-qemu-aa348082d8e89d2ab021caadbcc97c93038fffb2.tar.gz focaccia-qemu-aa348082d8e89d2ab021caadbcc97c93038fffb2.zip | |
Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin
* 'for-anthony' of git://repo.or.cz/qemu/kevin: Remove obsolete 'enabled' variable from progress state Add dd-style SIGUSR1 progress reporting qed: Fix consistency check on 32-bit hosts ide/atapi: Introduce CHECK_READY flag for commands ide/atapi: Replace bdrv_get_geometry calls by s->nb_sectors ide/atapi: Use table instead of switch for commands ide/atapi: Factor commands out ide: Split atapi.c out Improve accuracy of block migration bandwidth calculation atapi: Add 'medium ready' to 'medium not ready' transition on cd change qemu-img: allow rebase to a NULL backing file when unsafe
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index d9c2c12fa0..ed5ba91117 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1240,7 +1240,7 @@ static int img_rebase(int argc, char **argv) } } - if ((optind >= argc) || !out_baseimg) { + if ((optind >= argc) || (!unsafe && !out_baseimg)) { help(); } filename = argv[optind++]; |