Max Reitz 48758a8473 qemu-img/convert: Move bs_n > 1 && -B check down ...

It does not make much sense to use a backing image for the target when
you concatenate multiple images (because then there is no correspondence
between the source images' backing files and the target's); but it was
still possible to give one by using -o backing_file=X instead of -B X.

Fix this by moving the check.

(Also, change the error message because -B is not the only way to
 specify the backing file, evidently.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

2017-04-27 17:26:28 +02:00

..

acpi-test-data

tests/acpi: update DSDT after last patch

2017-03-02 07:31:26 +02:00

data

…

docker

docker/dockerfiles/debian-s390-cross: include clang

2017-03-10 15:05:22 +08:00

guest-debug

…

image-fuzzer

…

libqos

tests: fix virtio-blk-test leaks

2017-03-01 11:58:57 +04:00

migration

…

multiboot

…

qapi-schema

qapi2texi: Fix translation of *strong* and _emphasized_

2017-03-21 10:42:58 +01:00

qemu-iotests

qemu-img/convert: Move bs_n > 1 && -B check down

2017-04-27 17:26:28 +02:00

rocker

…

tcg

target/openrisc: Rename the cpu from or32 to or1k

2017-02-14 08:14:58 +11:00

vmstate-static-checker-data

…

.gitignore

test-qapi-util: New, covering qapi/qapi-util.c

2017-03-07 16:07:47 +01:00

ac97-test.c

…

acpi-utils.c

tests: Move reusable ACPI code into a utility file

2017-03-02 07:14:27 +02:00

acpi-utils.h

tests/acpi: don't pack a structure

2017-03-30 19:12:44 +03:00

ahci-test.c

ahci-test: add QMP tray test for ATAPI

2016-11-14 11:15:55 -05:00

atomic_add-bench.c

…

bios-tables-test.c

virtio, pc: fixes, features

2017-03-03 10:09:03 +00:00

boot-order-test.c

…

boot-sector.c

…

boot-sector.h

…

boot-serial-test.c

boot-serial-test: use -no-shutdown

2017-03-24 13:39:50 +00:00

check-block.sh

…

check-qdict.c

Don't check qobject_type() before qobject_to_qdict()

2017-02-22 19:52:01 +01:00

check-qfloat.c

…

check-qint.c

…

check-qjson.c

check-qjson: Test errors from qobject_from_json()

2017-03-07 16:07:47 +01:00

check-qlist.c

…

check-qnull.c

qapi: Drop unused non-strict qobject input visitor

2017-03-05 09:14:19 +01:00

check-qom-interface.c

…

check-qom-proplist.c

…

check-qstring.c

…

crypto-tls-x509-helpers.c

…

crypto-tls-x509-helpers.h

…

device-introspect-test.c

qom: Make all interface types abstract

2017-01-16 17:52:34 +01:00

display-vga-test.c

qtest: add display-vga-test to ppc64

2017-01-31 10:10:13 +11:00

drive_del-test.c

…

ds1338-test.c

…

e1000-test.c

tests: fix e1000-test leak

2017-03-01 11:51:28 +04:00

e1000e-test.c

tests: fix e1000e leaks

2017-03-01 11:51:28 +04:00

eepro100-test.c

tests: fix eepro100-test leak

2017-03-01 11:51:05 +04:00

endianness-test.c

tests: fix endianness-test leaks

2017-03-01 00:09:28 +04:00

es1370-test.c

…

fdc-test.c

…

fw_cfg-test.c

…

hd-geo-test.c

tests: fix hd-geo-test leaks

2017-03-01 11:51:04 +04:00

i440fx-test.c

tests: fix i440fx-test leaks

2017-03-01 11:51:28 +04:00

i82801b11-test.c

…

ide-test.c

tests: fix ide-test leaks

2017-03-01 11:51:04 +04:00

intel-hda-test.c

…

io-channel-helpers.c

…

io-channel-helpers.h

…

ioh3420-test.c

…

iothread.c

aio: introduce aio_co_schedule and aio_co_wake

2017-02-21 11:14:07 +00:00

iothread.h

aio: introduce aio_co_schedule and aio_co_wake

2017-02-21 11:14:07 +00:00

ipmi-bt-test.c

tests: fix ipmi-bt-test leak

2017-03-01 11:51:05 +04:00

ipmi-kcs-test.c

tests: fix ipmi-kcs-test leak

2017-03-01 11:51:05 +04:00

ipoctal232-test.c

…

ivshmem-test.c

qtest: add ivshmem-test for ppc64

2017-01-31 10:10:13 +11:00

libqtest.c

libqtest: Add a generic function to run a callback function for every machine

2017-04-26 14:42:31 +01:00

libqtest.h

libqtest: Add a generic function to run a callback function for every machine

2017-04-26 14:42:31 +01:00

m25p80-test.c

aspeed/smc: extend tests for Command mode

2017-01-20 11:15:08 +00:00

m48t59-test.c

…

Makefile.include

tests: Add a tester for HMP commands

2017-04-26 14:42:31 +01:00

ne2000-test.c

…

nvme-test.c

…

pc-cpu-test.c

libqtest: Add a generic function to run a callback function for every machine

2017-04-26 14:42:31 +01:00

pcnet-test.c

…

pkix_asn1_tab.c

…

pnv-xscom-test.c

powernv: Don't test POWER9 CPU yet

2017-03-03 11:30:59 +11:00

postcopy-test.c

tests: fix qmp response leak

2017-03-01 00:09:28 +04:00

prom-env-test.c

tests/prom-env: Enable the test for the sun4u machine, too

2017-02-28 09:03:39 +03:00

ptimer-test-stubs.c

tests: fix ptimer leaks

2017-03-01 00:09:28 +04:00

ptimer-test.c

tests: fix ptimer leaks

2017-03-01 00:09:28 +04:00

ptimer-test.h

…

pvpanic-test.c

tests: fix qmp response leak

2017-03-01 00:09:28 +04:00

pxe-test.c

…

q35-test.c

tests: fix q35-test leaks

2017-03-01 11:50:33 +04:00

qemu-iotests-quick.sh

…

qht-bench.c

…

qmp-test.c

qapi: Drop unused non-strict qobject input visitor

2017-03-05 09:14:19 +01:00

qom-test.c

libqtest: Add a generic function to run a callback function for every machine

2017-04-26 14:42:31 +01:00

rcutorture.c

…

rtas-test.c

…

rtc-test.c

…

rtl8139-test.c

…

spapr-phb-test.c

…

tco-test.c

tests: fix tco-test leaks

2017-03-01 11:51:25 +04:00

test-aio-multithread.c

cpus: define QEMUTimerListNotifyCB for QEMU system emulation

2017-03-14 13:28:29 +01:00

test-aio.c

cpus: define QEMUTimerListNotifyCB for QEMU system emulation

2017-03-14 13:28:29 +01:00

test-arm-mptimer.c

…

test-base64.c

…

test-bitcnt.c

tests: New test-bitcnt

2017-01-10 08:49:59 -08:00

test-bitops.c

…

test-blockjob-txn.c

tests/block-job-txn: Don't start block job before adding to txn

2017-04-11 20:07:15 +08:00

test-blockjob.c

tests: Remove FIXME comments

2017-02-28 20:47:50 +01:00

test-bufferiszero.c

…

test-char.c

char: rename CharDriverState Chardev

2017-01-27 18:07:59 +01:00

test-clone-visitor.c

…

test-coroutine.c

…

test-crypto-afsplit.c

…

test-crypto-block.c

crypto: Make errp the last parameter of functions

2017-04-24 09:13:22 +02:00

test-crypto-cipher.c

crypto: add 3des-ede support when using libgcrypt/nettle

2016-12-21 14:26:26 +00:00

test-crypto-hash.c

…

test-crypto-hmac.c

crypto: add HMAC algorithms testcases

2016-12-22 09:24:59 +00:00

test-crypto-ivgen.c

…

test-crypto-pbkdf.c

…

test-crypto-secret.c

…

test-crypto-tlscredsx509.c

…

test-crypto-tlssession.c

…

test-crypto-xts.c

…

test-cutils.c

util/cutils: Change qemu_strtosz*() from int64_t to uint64_t

2017-02-23 20:35:36 +01:00

test-filter-mirror.c

tests: fix qmp response leak

2017-03-01 00:09:28 +04:00

test-filter-redirector.c

tests: fix qmp response leak

2017-03-01 00:09:28 +04:00

test-hbitmap.c

test-hbitmap: Add hbitmap_is_serializable() calls

2017-01-26 10:25:01 +08:00

test-hmp.c

tests: Add a tester for HMP commands

2017-04-26 14:42:31 +01:00

test-int128.c

…

test-io-channel-buffer.c

…

test-io-channel-command.c

tests: fix leaks in test-io-channel-command

2017-03-01 00:09:28 +04:00

test-io-channel-file.c

…

test-io-channel-socket.c

io: fix incoming client socket initialization

2017-04-04 16:17:03 +01:00

test-io-channel-tls.c

io: change the QIOTask callback signature

2017-01-23 15:32:18 +00:00

test-io-task.c

io: fix possible double free of task error object

2017-01-26 10:26:18 +00:00

test-iov.c

…

test-keyval.c

test-keyval: Cover alternate and 'any' type

2017-03-21 10:42:06 +01:00

test-logging.c

…

test-mul64.c

…

test-netfilter.c

…

test-opts-visitor.c

qapi: Fix QemuOpts visitor regression on unvisited input

2017-03-22 19:24:34 +01:00

test-qapi-util.c

qapi: New parse_qapi_name()

2017-03-07 16:07:47 +01:00

test-qdev-global-props.c

…

test-qdist.c

…

test-qemu-opts.c

tests: Use error_free_or_abort() where appropriate

2017-03-15 08:52:09 +01:00

test-qga.c

qemu-ga patch queue for 2.9

2017-03-07 07:32:28 +00:00

test-qht-par.c

…

test-qht.c

…

test-qmp-commands.c

qapi: Drop unused non-strict qobject input visitor

2017-03-05 09:14:19 +01:00

test-qmp-event.c

test-qmp-event: Simplify and tighten event_test_emit()

2017-02-22 19:51:59 +01:00

test-qobject-input-visitor.c

test-qobject-input-visitor: Cover visit_type_uint64()

2017-03-21 20:01:39 +01:00

test-qobject-output-visitor.c

tests: Use error_free_or_abort() where appropriate

2017-03-15 08:52:09 +01:00

test-rcu-list.c

…

test-replication.c

block: Make errp the last parameter of bdrv_img_create

2017-04-24 09:12:59 +02:00

test-shift128.c

host-utils: Implement unsigned quadword left/right shift and unit tests

2017-01-31 10:10:14 +11:00

test-string-input-visitor.c

qapi: Fix string input visitor regression for empty lists

2017-03-21 10:43:01 +01:00

test-string-output-visitor.c

…

test-thread-pool.c

test-thread-pool: use generic AioContext infrastructure

2017-02-21 11:14:07 +00:00

test-throttle.c

throttle: make throttle_config(throttle_get_config()) symmetric

2017-04-21 10:36:12 +01:00

test-timed-average.c

…

test-uuid.c

test-uuid: fix leak

2016-11-11 20:53:23 +08:00

test-visitor-serialization.c

test-visitor-serialization: Pass &error_abort to qobject_from_json()

2017-03-07 16:07:47 +01:00

test-vmstate.c

tests/test-vmstate.c: test array of ptr to primitive

2017-02-28 11:30:22 +00:00

test-write-threshold.c

…

test-x86-cpuid-compat.c

…

test-x86-cpuid.c

…

test-xbzrle.c

…

tmp105-test.c

…

tpci200-test.c

…

usb-hcd-ehci-test.c

tests: fix usb-test leaks

2017-03-01 11:51:29 +04:00

usb-hcd-ohci-test.c

…

usb-hcd-uhci-test.c

tests: fix usb-test leaks

2017-03-01 11:51:29 +04:00

usb-hcd-xhci-test.c

…

vhost-user-bridge.c

tests/vhost-user-bridge: use contrib/libvhost-user

2016-12-16 01:14:38 +02:00

vhost-user-test.c

tests: fix vhost-user-test leaks

2017-03-01 11:51:00 +04:00

virtio-9p-test.c

tests/virtio-9p-test: Don't call le*_to_cpus on fields of packed struct

2017-03-27 21:15:31 +02:00

virtio-balloon-test.c

…

virtio-blk-test.c

tests: fix virtio-blk-test leaks

2017-03-01 11:58:57 +04:00

virtio-console-test.c

…

virtio-net-test.c

…

virtio-rng-test.c

…

virtio-scsi-test.c

tests: fix virtio-scsi-test leak

2017-03-01 11:51:28 +04:00

virtio-serial-test.c

…

vmxnet3-test.c

…

wdt_ib700-test.c

…