mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,838 Commits 50 Branches 394 Tags 404 MiB
C 82.6%
C++ 6.5%
Python 3.4%
Dylan 2.9%
Shell 1.6%
Other 2.8%
dbecebddfa
Go to file
Fam Zheng dbecebddfa block: fix backing file overriding 
Providing backing.file.filename doesn't override backing file as expected:

    $ x86_64-softmmu/qemu-system-x86_64 -drive \
        file=/tmp/child.qcow2,backing.file.filename=/tmp/fake.qcow2

    qemu-system-x86_64: -drive \
        file=/tmp/child.qcow2,backing.file.filename=/tmp/fake.qcow2: could not
        open disk image /tmp/child.qcow2: Can't specify 'file' and 'filename'
        options at the same time

With

    $ qemu-img info /tmp/child.qcow2
    image: /tmp/child.qcow2
    file format: qcow2
    virtual size: 1.0G (1073741824 bytes)
    disk size: 196K
    cluster_size: 65536
    backing file: /tmp/fake.qcow2

This fixes it by calling bdrv_get_full_backing_filename only if
backing.file.filename is not provided. Also save the backing file name
to bs->backing_file so the information is correct with HMP "info block".

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2013-09-25 10:08:56 +02:00
audio aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
backends aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
block Merge remote-tracking branch 'stefanha/block' into staging 2013-09-23 11:53:05 -05:00
bsd-user *-user: Improve documentation for lock_user function 2013-09-20 20:09:24 +04:00
default-configs default-configs: Fix A9MP and A15MP config names 2013-08-20 14:54:32 +01:00
disas disas/ppc.c: Fix little endian disassembly 2013-09-02 10:06:41 +02:00
docs Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
dtc@bc895d6d09 dtc: add submodule 2013-04-18 13:50:53 +02:00
fpu softfloat: Fix shift128Right for shift counts 64..127 2013-06-10 11:36:12 -05:00
fsdev fsdev: Fix potential memory leak 2013-07-09 13:38:56 -05:00
gdb-xml target-arm: Add AArch64 gdbstub support 2013-09-10 19:11:28 +01:00
hw Merge remote-tracking branch 'stefanha/net' into staging 2013-09-23 11:53:11 -05:00
include Merge remote-tracking branch 'stefanha/block' into staging 2013-09-23 11:53:05 -05:00
libcacard Merge remote-tracking branch 'stefanha/block' into staging 2013-09-23 11:53:05 -05:00
linux-headers linux-headers: update to 3.12-rc1 2013-09-20 12:38:48 +02:00
linux-user *-user: Improve documentation for lock_user function 2013-09-20 20:09:24 +04:00
net net: Rename send_queue to incoming_queue 2013-09-06 17:01:26 +02:00
pc-bios Update OpenBIOS images 2013-07-30 23:11:07 +01:00
pixman@97336fad32 qapi: move include files to include/qobject/ 2012-12-19 08:31:31 +01:00
po po: Update all *.po files 2013-08-07 12:48:00 -05:00
qapi OptsVisitor: don't try to flatten overlong integer ranges 2013-08-20 11:52:00 -04:00
qga qemu-ga: Install Windows VSS provider on `qemu-ga -s install' 2013-09-09 14:17:57 -05:00
qobject Implement qdict_flatten() 2013-07-26 22:01:31 +02:00
qom cpu: Move cpu state syncs up into cpu_dump_state() 2013-09-20 12:37:52 +02:00
roms Update OpenBIOS images 2013-07-30 23:11:07 +01:00
scripts QMP: add scripts/qmp 2013-09-18 08:57:02 -04:00
slirp slirp: clean up slirp_update_timeout 2013-09-17 12:26:05 +02:00
stubs Merge remote-tracking branch 'kiszka/queues/slirp' into staging 2013-09-17 10:01:24 -05:00
sysconfigs/target Eliminate cpus-x86_64.conf file 2012-09-21 15:12:58 +02:00
target-alpha tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-arm target-arm: Add AArch64 gdbstub support 2013-09-10 19:11:28 +01:00
target-cris tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-i386 Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
target-lm32 target: Include softmmu_exec.h where forgotten 2013-09-02 09:08:30 -07:00
target-m68k tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-microblaze tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-mips cpu: Use QTAILQ for CPU list 2013-09-03 12:25:55 +02:00
target-moxie target: Include softmmu_exec.h where forgotten 2013-09-02 09:08:30 -07:00
target-openrisc tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-ppc cpu: Move cpu state syncs up into cpu_dump_state() 2013-09-20 12:37:52 +02:00
target-s390x exec: Don't abort when we can't allocate guest memory 2013-09-12 11:45:32 -05:00
target-sh4 tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-sparc tcg: Change tcg_gen_exit_tb argument to uintptr_t 2013-09-02 09:08:30 -07:00
target-unicore32 target: Include softmmu_exec.h where forgotten 2013-09-02 09:08:30 -07:00
target-xtensa target: Include softmmu_exec.h where forgotten 2013-09-02 09:08:30 -07:00
tcg tcg-sparc: Fix parenthesis warning 2013-09-20 20:09:24 +04:00
tests Merge remote-tracking branch 'stefanha/block' into staging 2013-09-23 11:53:05 -05:00
trace trace: Add ftrace tracing backend 2013-05-03 13:58:09 +02:00
ui spice-core: Use g_strdup_printf instead of snprintf 2013-09-10 11:14:08 +02:00
util Merge remote-tracking branch 'stefanha/block' into staging 2013-09-23 11:53:05 -05:00
.exrc qemu: add .exrc 2012-09-07 09:02:44 +03:00
.gitignore qemu-ga: Add configure options to specify path to Windows/VSS SDK 2013-09-09 14:17:56 -05:00
.gitmodules pc-bios: Update palcode-clipper 2013-07-18 08:17:42 -07:00
.mailmap Update mailmap 2013-09-05 09:40:31 -05:00
aio-posix.c aio / timers: Convert aio_poll to use AioContext timers' deadline 2013-08-22 19:10:28 +02:00
aio-win32.c aio-win32: replace incorrect AioHandler->opaque usage with ->e 2013-08-22 22:04:54 +02:00
arch_init.c cpu: Replace qemu_for_each_cpu() 2013-09-03 12:25:55 +02:00
async.c aio / timers: aio_ctx_prepare sets timeout from AioContext timers 2013-08-22 19:10:28 +02:00
balloon.c softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
block-migration.c migration: omit drive ref as we have bdrv_ref now 2013-09-06 15:25:08 +02:00
block.c block: fix backing file overriding 2013-09-25 10:08:56 +02:00
blockdev-nbd.c nbd: use BlockDriverState refcnt 2013-09-06 15:25:08 +02:00
blockdev.c blockdev: do not default cache.no-flush to true 2013-09-20 19:27:44 +02:00
blockjob.c block: use BDS ref for block jobs 2013-09-06 15:25:08 +02:00
bt-host.c sysemu: avoid proliferation of include/ subdirectories 2013-04-15 18:19:25 +02:00
bt-vhci.c sysemu: avoid proliferation of include/ subdirectories 2013-04-15 18:19:25 +02:00
Changelog fix some common typos 2012-05-14 07:27:24 +02:00
CODING_STYLE Replace Qemu by QEMU in internal documentation 2012-04-07 13:58:25 +00:00
configure Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
COPYING
COPYING.LIB
coroutine-gthread.c block: move include files to include/block/ 2012-12-19 08:31:31 +01:00
coroutine-sigaltstack.c Merge remote-tracking branch 'kwolf/for-anthony' into staging 2013-02-26 07:44:39 -06:00
coroutine-ucontext.c Fix warnings suppressors to honor --disable-werror 2013-04-17 10:28:04 -05:00
coroutine-win32.c block: move include files to include/block/ 2012-12-19 08:31:31 +01:00
cpu-exec.c tcg: Fix next_tb type in cpu_exec 2013-09-02 09:08:29 -07:00
cpus.c cpu: Replace qemu_for_each_cpu() 2013-09-03 12:25:55 +02:00
cputlb.c cpu: Use QTAILQ for CPU list 2013-09-03 12:25:55 +02:00
device_tree.c device_tree: Add qemu_devtree_setprop_sized_cells() utility functions 2013-07-19 12:58:46 +01:00
device-hotplug.c hw: move device-hotplug.o to toplevel, compile it once 2013-03-01 13:57:13 +01:00
disas.c disas: Implement fallback to dump object code as hex 2013-08-24 07:26:45 +02:00
dma-helpers.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
dump.c cpu: Use QTAILQ for CPU list 2013-09-03 12:25:55 +02:00
exec.c Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
gdbstub.c cpu: Use QTAILQ for CPU list 2013-09-03 12:25:55 +02:00
HACKING HACKING: Document vaddr type usage 2013-07-23 02:41:31 +02:00
hmp-commands.hx hmp: add interface hmp_snapshot_delete_blkdev_internal 2013-09-12 10:12:47 +02:00
hmp.c hmp: block-stream: fix typo 2013-09-17 11:10:47 -05:00
hmp.h hmp: add interface hmp_snapshot_delete_blkdev_internal 2013-09-12 10:12:47 +02:00
iohandler.c iohandler: switch to GPollFD 2013-02-21 16:17:31 -06:00
ioport.c memory: Provide separate handling of unassigned io ports accesses 2013-09-05 18:11:43 +02:00
kvm-all.c Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 2013-09-23 11:52:49 -05:00
kvm-stub.c kvm irqfd: support direct msimessage to irq translation 2013-09-20 12:37:52 +02:00
LICENSE LICENSE: clarify 2013-08-12 09:15:12 -05:00
main-loop.c slirp: set mainloop timeout with more precise value 2013-09-17 12:26:05 +02:00
MAINTAINERS Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
Makefile Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
Makefile.objs qemu-ga: Add Windows VSS provider and requester as DLL 2013-09-09 14:17:57 -05:00
Makefile.target build: do not use TARGET_ARCH 2013-06-14 15:33:10 +01:00
memory_mapping.c cpu: Use QTAILQ for CPU list 2013-09-03 12:25:55 +02:00
memory.c Revert "memory: Return -1 again on reads from unsigned regions" 2013-09-05 18:11:48 +02:00
migration-exec.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
migration-fd.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
migration-rdma.c rdma: silly ipv6 bugfix 2013-09-01 19:03:43 +04:00
migration-tcp.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
migration-unix.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
migration.c aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
monitor.c QOM CPUState refactorings / X86CPU 2013-09-03 12:33:32 -05:00
nbd.c nbd: use BlockDriverState refcnt 2013-09-06 15:25:08 +02:00
os-posix.c Add option to mlock qemu and guest memory 2013-04-22 08:52:23 -05:00
os-win32.c qemu-timer: move timeBeginPeriod/timeEndPeriod to os-win32 2013-04-12 18:27:16 +02:00
page_cache.c remove some double-includes 2013-05-18 16:35:12 +04:00
qapi-schema.json qmp: add interface blockdev-snapshot-delete-internal-sync 2013-09-12 10:12:47 +02:00
qdev-monitor.c qemu-help: Sort devices by logical functionality 2013-07-29 10:37:09 -05:00
qdict-test-data.txt
qemu-bridge-helper.c qemu-bridge-helper: force usage of a very high MAC address for the bridge 2013-03-28 12:58:52 -05:00
qemu-char.c chardev: fix pty_chr_timer 2013-09-12 09:58:18 +02:00
qemu-coroutine-io.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
qemu-coroutine-lock.c block: Repair the throttling code. 2013-07-29 17:07:37 +02:00
qemu-coroutine-sleep.c aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API 2013-08-22 19:14:24 +02:00
qemu-coroutine.c coroutine: add ./configure --disable-coroutine-pool 2013-09-12 10:12:48 +02:00
qemu-doc.texi doc: we use seabios, not bochs bios 2013-06-28 22:10:34 +04:00
qemu-img-cmds.hx block: Image file option amendment 2013-09-12 10:12:46 +02:00
qemu-img.c qemu-img: fix invalid JSON 2013-09-12 13:49:50 +02:00
qemu-img.texi block: Image file option amendment 2013-09-12 10:12:46 +02:00
qemu-io-cmds.c block: expect errors from bdrv_co_is_allocated 2013-09-06 15:25:09 +02:00
qemu-io.c block: Error parameter for open functions 2013-09-12 10:12:48 +02:00
qemu-log.c qemu-log: default to stderr for logging output 2013-02-26 13:31:47 -06:00
qemu-nbd.c block: Error parameter for open functions 2013-09-12 10:12:48 +02:00
qemu-nbd.texi Add -f FMT / --format FMT arg to qemu-nbd 2013-04-15 14:29:20 -05:00
qemu-options-wrapper.h vl.c: In qemu -h output, only print options for the arch we are running as 2011-12-19 10:27:33 -06:00
qemu-options.h vl.c: Move option generation logic into a wrapper file 2011-12-19 10:27:33 -06:00
qemu-options.hx block: Add iops_size to do the iops accounting for a given io size. 2013-09-06 15:25:07 +02:00
qemu-seccomp.c seccomp: add arch_prctl() to the syscall whitelist 2013-07-29 19:56:52 -05:00
qemu-tech.texi qemu-tech.texi: update implemented xtensa features list 2012-11-29 13:00:52 -06:00
qemu-timer.c qemu-timer: do not take the lock in timer_pending 2013-09-18 15:48:33 +02:00
qemu.nsi w32, w64: Add build rule for installer 2013-07-29 11:43:37 +02:00
qemu.sasl Fix command example in qemu.sasl 2013-07-19 12:52:03 +04:00
qmp-commands.hx qmp: add interface blockdev-snapshot-delete-internal-sync 2013-09-12 10:12:47 +02:00
qmp.c QMP: Add cpu-add command 2013-05-01 13:06:07 +02:00
qtest.c qtest: Fix FMT_timeval vs time_t 2013-09-02 09:08:29 -07:00
readline.c monitor: avoid use of global *cur_mon in readline_completion() 2013-08-30 07:41:14 -04:00
README
rules.mak configure: Support configuring C++ compiler 2013-09-09 14:17:56 -05:00
savevm.c snapshot: distinguish id and name in snapshot delete 2013-09-12 10:12:47 +02:00
spice-qemu-char.c qemu-char: don't issue CHR_EVENT_OPEN in a BH 2013-06-10 11:38:37 -05:00
tcg-runtime.c tcg: Implement multiword multiply helpers 2013-02-23 17:25:28 +00:00
tci.c tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) 2013-09-20 20:09:24 +04:00
thread-pool.c aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
thunk.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
tpm.c tpm.c: Don't try to put -1 in a variable of type TpmModel 2013-07-29 10:37:10 -05:00
trace-events Merge remote-tracking branch 'mjt/trivial-patches' into staging 2013-09-23 11:52:55 -05:00
translate-all.c translate-all: Fix formatting of dump output 2013-09-20 20:09:24 +04:00
translate-all.h cputlb: Pass CPUState to cpu_unlink_tb() 2013-02-16 14:51:00 +01:00
user-exec.c linux-user: fix segmentation fault passing with h2g(x) != x 2013-07-23 17:28:28 +03:00
VERSION Open up 1.7 development branch 2013-08-15 15:41:13 -05:00
version.rc w32: Add an icon resource 2013-08-27 14:21:16 +02:00
vl.c Remove dev-bluetooth.c dependency from vl.c 2013-09-10 11:14:42 +02:00
xbzrle.c Move XBZRLE encoding code to a separate file to allow testing 2013-02-01 08:32:20 +01:00
xen-all.c pc: Initializing ram_memory under Xen. 2013-09-09 16:22:19 +00:00
xen-mapcache.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
xen-stub.c pc: Initializing ram_memory under Xen. 2013-09-09 16:22:19 +00:00

README 

Read the documentation in qemu-doc.html or on http://wiki.qemu.org

- QEMU team