QEMU repository mirror for Proxmox QEMU builds
 
 
 
 
 
 
Go to file
Markus Armbruster 8281abd548 vl: Fix -boot order and once regressions, and related bugs
Option "once" sets up a different boot order just for the initial
boot.  Boot order reverts back to normal on reset.  Option "order"
changes the normal boot order.

The reversal is implemented by reset handler restore_boot_devices(),
which takes the boot order to revert to as argument.
restore_boot_devices() does nothing on its first call, because that
must be the initial machine reset.  On its second call, it changes the
boot order back, and unregisters itself.

Because we register the handler right when -boot gets parsed, we can
revert to an incorrect normal boot order, and multiple -boot can
interact in funny ways.

Here's how things work without -boot once or order:

* boot_devices is "".

* main() passes machine->boot_order to to machine->init(), because
  boot_devices is "".  machine->init() configures firmware
  accordingly.  For PC machines, machine->boot_order is "cad", and
  pc_cmos_init() writes it to RTC CMOS, where SeaBIOS picks it up.

Now consider -boot order=:

* boot_devices is "".

* -boot order= sets boot_devices to "" (no change).

* main() passes machine->boot_order to to machine->init(), because
  boot_devices is "", as above.

  Bug: -boot order= has no effect.  Broken in commit e4ada29e.

Next, consider -boot once=a:

* boot_devices is "".

* -boot once=a registers restore_boot_devices() with argument "", and
  sets boot_devices to "a".

* main() passes boot_devices "a" to machine->init(), which configures
  firmware accordingly.  For PC machines, pc_cmos_init() writes the
  boot order to RTC CMOS.

* main() calls qemu_system_reset().  This runs reset handlers.

  - restore_boot_devices() gets called with argument "".  Does
    nothing, because it's the first call.

* Machine boots, boot order is "a".

* Machine resets (e.g. monitor command).  Reset handlers run.

  - restore_boot_devices() gets called with argument "".  Calls
    qemu_boot_set("") to reconfigure firmware.  For PC machines,
    pc_boot_set() writes it into RTC CMOS.  Reset handler
    unregistered.

    Bug: boot order reverts to "" instead of machine->boot_order.  The
    actual boot order depends on how firmware interprets "".  Broken
    in commit e4ada29e.

Next, consider -boot once=a -boot order=c:

* boot_devices is "".

* -boot once=a registers restore_boot_devices() with argument "", and
  sets boot_devices to "a".

* -boot order=c sets boot_devices to "c".

* main() passes boot_devices "c" to machine->init(), which configures
  firmware accordingly.  For PC machines, pc_cmos_init() writes the
  boot order to RTC CMOS.

* main() calls qemu_system_reset().  This runs reset handlers.

  - restore_boot_devices() gets called with argument "".  Does
    nothing, because it's the first call.

* Machine boots, boot order is "c".

  Bug: it should be "a".  I figure this has always been broken.

* Machine resets (e.g. monitor command).  Reset handlers run.

  - restore_boot_devices() gets called with argument "".  Calls
    qemu_boot_set("") to reconfigure firmware.  For PC machines,
    pc_boot_set() writes it into RTC CMOS.  Reset handler
    unregistered.

    Bug: boot order reverts to "" instead of "c".  I figure this has
    always been broken, just differently broken before commit
    e4ada29e.

Next, consider -boot once=a -boot once=b -boot once=c:

* boot_devices is "".

* -boot once=a registers restore_boot_devices() with argument "", and
  sets boot_devices to "a".

* -boot once=b registers restore_boot_devices() with argument "a", and
  sets boot_devices to "b".

* -boot once=c registers restore_boot_devices() with argument "b", and
  sets boot_devices to "c".

* main() passes boot_devices "c" to machine->init(), which configures
  firmware accordingly.  For PC machines, pc_cmos_init() writes the
  boot order to RTC CMOS.

* main() calls qemu_system_reset().  This runs reset handlers.

  - restore_boot_devices() gets called with argument "".  Does
    nothing, because it's the first call.

  - restore_boot_devices() gets called with argument "a".  Calls
    qemu_boot_set("a") to reconfigure firmware.  For PC machines,
    pc_boot_set() writes it into RTC CMOS.  Reset handler
    unregistered.

  - restore_boot_devices() gets called with argument "b".  Calls
    qemu_boot_set("b") to reconfigure firmware.  For PC machines,
    pc_boot_set() writes it into RTC CMOS.  Reset handler
    unregistered.

* Machine boots, boot order is "b".

  Bug: should really be "c", because that came last, and for all other
  -boot options, the last one wins.  I figure this was broken some
  time before commit 37905d6a, and fixed there only for a single
  occurence of "once".

* Machine resets (e.g. monitor command).  Reset handlers run.

  - restore_boot_devices() gets called with argument "".  Calls
    qemu_boot_set("") to reconfigure firmware.  For PC machines,
    pc_boot_set() writes it into RTC CMOS.  Reset handler
    unregistered.

    Same bug as above: boot order reverts to "" instead of
    machine->boot_order.

Fix by acting upon -boot options order, once and menu only after
option parsing is complete, and the machine is known.  This is how the
other -boot options work already.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1371208516-7857-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-06-19 14:10:42 -05:00
QMP correct RTC_CHANGE_EVENT description (v2) 2013-06-07 17:01:00 -04:00
audio Remove OSS support for OpenBSD 2013-05-26 11:14:52 +00:00
backends rng-random: use error_setg_file_open() 2013-06-17 11:01:14 -04:00
block Merge remote-tracking branch 'bonzini/scsi-next' into staging 2013-06-18 10:06:47 -05:00
bsd-user main: use TARGET_ARCH only for the target-specific #define 2013-06-14 15:33:11 +01:00
default-configs NVMe: Initial commit for new storage interface 2013-06-17 17:47:59 +02:00
disas tcg-arm: Implement division instructions 2013-04-27 02:16:44 +02:00
docs build: do not use TARGET_ARCH 2013-06-14 15:33:10 +01: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 remove double semicolons 2013-05-12 13:25:55 +04:00
gdb-xml
hw wdt_i6300esb: fix vmstate versioning 2013-06-18 13:44:37 -05:00
include qemu-option: check_params() is now unused, drop it 2013-06-19 14:10:42 -05:00
ldscripts build: create ldscripts/ 2012-12-19 08:29:06 +01:00
libcacard libcacard/vscclient: fix leakage of socket on error paths 2013-06-12 16:04:43 +04:00
linux-headers linux-headers: Update to v3.10-rc5 2013-06-12 13:19:10 +04:00
linux-user main: use TARGET_ARCH only for the target-specific #define 2013-06-14 15:33:11 +01:00
net tap: fix NULL dereference when passing invalid parameters to tap 2013-06-07 15:48:11 +02:00
pc-bios gtk: use better icon 2013-06-10 11:36:12 -05:00
pixman@97336fad32 qapi: move include files to include/qobject/ 2012-12-19 08:31:31 +01:00
po po/hu.po: Hungarian translation for the GTK+ interface 2013-06-03 08:39:11 -05:00
qapi qapi: Fix unchecked strdup() by converting to g_strdup() 2013-01-30 11:14:46 +01:00
qga qga: save state directory in ga_install_service() 2013-05-30 11:37:37 -05:00
qobject json-parser: fix handling of large whole number values 2013-05-23 09:44:20 -04:00
qom cpu: Change default for CPUClass::get_paging_enabled() 2013-06-11 18:18:34 +02:00
roms update seabios to release 1.7.2.2 2013-05-28 12:19:02 +02:00
scripts main: use TARGET_ARCH only for the target-specific #define 2013-06-14 15:33:11 +01:00
slirp slirp: cleanup leftovers from misc.h 2013-06-01 14:25:39 +04:00
stubs dump: Drop qmp_dump_guest_memory() stub and build for all targets 2013-06-11 18:16:36 +02:00
sysconfigs/target Eliminate cpus-x86_64.conf file 2012-09-21 15:12:58 +02:00
target-alpha cpu: Replace do_interrupt() by CPUClass::do_interrupt method 2013-03-12 10:35:55 +01:00
target-arm Merge remote-tracking branch 'mjt/trivial-patches-next' into staging 2013-06-14 07:51:45 -05:00
target-cris target-cris: Override do_interrupt for pre-v32 CPU cores 2013-04-16 02:45:11 +02:00
target-i386 target-i386: fix over 80 chars warnings 2013-06-15 17:50:38 +00:00
target-lm32 hw: move headers to include/ 2013-04-08 18:13:10 +02:00
target-m68k cpu: Replace do_interrupt() by CPUClass::do_interrupt method 2013-03-12 10:35:55 +01:00
target-microblaze microblaze: Add internal base vectors reg 2013-04-26 11:28:50 +02:00
target-mips linux-user: Save the correct resume address for MIPS signal handling 2013-05-20 18:16:17 +02:00
target-moxie target-moxie: replace target_phys_addr_t with hwaddr 2013-05-18 16:35:12 +04:00
target-openrisc cpu: Replace do_interrupt() by CPUClass::do_interrupt method 2013-03-12 10:35:55 +01:00
target-ppc KVM: PPC: Add dummy kvm_arch_init_irq_routing() 2013-06-12 13:19:10 +04:00
target-s390x KVM: S390: Add dummy kvm_arch_init_irq_routing() 2013-06-12 13:19:10 +04:00
target-sh4 hw: move headers to include/ 2013-04-08 18:13:10 +02:00
target-sparc target-sparc: Replace free by g_free 2013-06-11 23:45:44 +04:00
target-unicore32 Remove unnecessary break statements 2013-06-01 14:25:38 +04:00
target-xtensa cpu: Replace do_interrupt() by CPUClass::do_interrupt method 2013-03-12 10:35:55 +01:00
tcg tcg-ppc64: rotr_i32 rotates wrong amount 2013-06-17 10:42:16 -07:00
tests ide-test: fix failure for test_flush 2013-06-14 13:08:15 -05:00
trace trace: Add ftrace tracing backend 2013-05-03 13:58:09 +02:00
ui gtk: Fix compiler warning (GTK 3 deprecated function) 2013-06-16 20:00:46 -05:00
util qemu-option: check_params() is now unused, drop it 2013-06-19 14:10:42 -05:00
.exrc qemu: add .exrc 2012-09-07 09:02:44 +03:00
.gitignore gitignore: unignore *.patch 2013-06-11 23:45:43 +04:00
.gitmodules dtc: add submodule 2013-04-18 13:50:53 +02:00
.mailmap
CODING_STYLE Replace Qemu by QEMU in internal documentation 2012-04-07 13:58:25 +00:00
COPYING
COPYING.LIB
Changelog fix some common typos 2012-05-14 07:27:24 +02:00
HACKING osdep, kvm: rename low-level RAM allocation functions 2013-05-14 08:53:31 -05:00
LICENSE
MAINTAINERS NVMe: Initial commit for new storage interface 2013-06-17 17:47:59 +02:00
Makefile Makefile: Install qemu-img and qemu-nbd man pages only if built 2013-06-11 23:45:44 +04:00
Makefile.objs Make qemu-io commands available in HMP 2013-06-06 11:27:05 +02:00
Makefile.target build: do not use TARGET_ARCH 2013-06-14 15:33:10 +01:00
README
VERSION Open up 1.6 development 2013-05-20 10:55:18 -05:00
aio-posix.c aio: support G_IO_HUP and G_IO_ERR 2013-02-21 16:17:31 -06:00
aio-win32.c aio: Fix return value of aio_poll() 2013-01-17 10:51:42 +01:00
arch_init.c Merge remote-tracking branch 'pmaydell/configury.next' into staging 2013-06-17 08:57:57 -05:00
async.c aio: add a ThreadPool instance to AioContext 2013-03-15 16:07:50 +01:00
balloon.c softmmu: move include files to include/sysemu/ 2012-12-19 08:32:45 +01:00
block-migration.c migration: run setup callbacks out of big lock 2013-03-11 13:32:01 +01:00
block.c block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED 2013-06-17 11:01:14 -04:00
blockdev-nbd.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
blockdev.c blockdev: use error_setg_file_open() 2013-06-17 11:01:14 -04:00
blockjob.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01: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
configure configure: Require libfdt for arm, ppc, microblaze softmmu targets 2013-06-14 15:34:19 +01:00
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 target-i386/helper: remove DF macro 2013-06-15 17:50:21 +00:00
cpus.c cpus: use error_setg_file_open() 2013-06-17 11:01:14 -04:00
cputlb.c cputlb: fix debug logs 2013-06-14 14:29:04 +04:00
device-hotplug.c hw: move device-hotplug.o to toplevel, compile it once 2013-03-01 13:57:13 +01:00
device_tree.c device tree: Fix cppcheck warning 2013-06-11 23:45:44 +04:00
disas.c disas: Disassemble all ppc insns for the guest 2013-04-26 23:02:42 +02:00
dma-helpers.c memory: add address_space_access_valid 2013-05-29 16:27:16 +02:00
dump.c dump: qmp_dump_guest_memory(): use error_setg_file_open() 2013-06-17 11:01:14 -04:00
exec.c memory: add return value to address_space_rw/read/write 2013-05-29 16:27:34 +02:00
gdbstub.c gdbstub: let the debugger resume from guest panicked state 2013-06-10 11:36:11 -05:00
hmp-commands.hx dump: Drop qmp_dump_guest_memory() stub and build for all targets 2013-06-11 18:16:36 +02:00
hmp.c hmp: add parameters device and -v for info block 2013-06-07 13:45:01 +02:00
hmp.h Make qemu-io commands available in HMP 2013-06-06 11:27:05 +02:00
iohandler.c iohandler: switch to GPollFD 2013-02-21 16:17:31 -06:00
ioport.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
kvm-all.c fix double free the memslot in kvm_set_phys_mem 2013-06-03 15:21:27 -05:00
kvm-stub.c kvm: add kvm_readonly_mem_enabled 2013-05-29 08:15:35 -05:00
main-loop.c main-loop: do not include slirp/slirp.h, use libslirp.h instead 2013-06-12 18:43:08 +04:00
memory.c memory: propagate errors on I/O dispatch 2013-05-29 16:27:32 +02:00
memory_mapping.c memory_mapping: Improve qemu_get_guest_memory_mapping() error reporting 2013-06-11 19:38:13 +02:00
migration-exec.c migration: eliminate s->migration_file 2013-03-11 13:32:03 +01:00
migration-fd.c migration: eliminate s->migration_file 2013-03-11 13:32:03 +01:00
migration-tcp.c migration: eliminate s->migration_file 2013-03-11 13:32:03 +01:00
migration-unix.c migration: eliminate s->migration_file 2013-03-11 13:32:03 +01:00
migration.c migration: Remove duplicate bandwidth_limit set 2013-06-01 14:25:38 +04:00
monitor.c monitor: Simplify do_inject_mce() with qemu_get_cpu() 2013-06-11 00:09:48 +02:00
nbd.c nbd: support large NBD requests 2013-05-03 13:05:49 +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-test.json qapi: add native list coverage for QMP output visitor tests 2013-05-23 09:44:21 -04:00
qapi-schema.json build: drop TARGET_TYPE 2013-06-14 15:33:12 +01:00
qdev-monitor.c qdev: Let qdev_prop_parse() pass through Error 2013-05-06 19:40:44 +02: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 create qemu_openpty_raw() helper function and move it to a separate file 2013-06-14 14:28:43 +04:00
qemu-coroutine-io.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
qemu-coroutine-lock.c coroutine: stop using AioContext in CoQueue 2013-05-24 16:17:56 +02:00
qemu-coroutine-sleep.c misc: move include files to include/qemu/ 2012-12-19 08:32:39 +01:00
qemu-coroutine.c coroutine: stop using AioContext in CoQueue 2013-05-24 16:17:56 +02:00
qemu-doc.texi Remove Sun4c, Sun4d and a few CPUs 2013-05-26 11:37:58 +00:00
qemu-img-cmds.hx qemu-img: Add compare subcommand 2013-02-22 21:21:10 +01:00
qemu-img.c block: add image info query function bdrv_query_image_info() 2013-06-07 13:37:45 +02:00
qemu-img.texi qemu-img: Add compare subcommand 2013-02-22 21:21:10 +01:00
qemu-io-cmds.c qemu-io: Interface cleanup 2013-06-06 11:27:05 +02:00
qemu-io.c qemu-io: Use the qemu version for -V 2013-06-06 11:27:05 +02:00
qemu-log.c qemu-log: default to stderr for logging output 2013-02-26 13:31:47 -06:00
qemu-nbd.c Add -f FMT / --format FMT arg to qemu-nbd 2013-04-15 14:29:20 -05: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 monitor: allow to disable the default monitor 2013-05-23 09:58:45 -04:00
qemu-seccomp.c seccomp: add the asynchronous I/O syscalls to the whitelist 2013-05-30 11:46:07 -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: move timeBeginPeriod/timeEndPeriod to os-win32 2013-04-12 18:27:16 +02:00
qemu.sasl
qmp-commands.hx qmp: add ImageInfo in BlockDeviceInfo used by query-block 2013-06-07 13:37:45 +02:00
qmp.c QMP: Add cpu-add command 2013-05-01 13:06:07 +02:00
qtest.c qtest: Handle addresses and values for {in, out}[bwl] as unsigned 2013-04-22 09:11:50 -05:00
readline.c readline: Handle xterm escape sequences for Home/End keys 2013-05-14 08:53:22 -05:00
rules.mak win32: fix compilation again 2013-05-03 12:04:40 -05:00
savevm.c savevm: qmp_xen_save_devices_state(): use error_setg_file_open() 2013-06-17 11:01:14 -04: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: Make tcg temporaries local to tcg_qemu_tb_exec 2013-04-11 19:58:21 +02:00
thread-pool.c threadpool: drop global thread pool 2013-03-15 16:07:51 +01:00
thunk.c exec: move include files to include/exec/ 2012-12-19 08:31:31 +01:00
tpm.c Move TPM passthrough specific command line options to backend structure 2013-04-23 10:40:40 -05:00
trace-events Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging 2013-05-24 13:47:42 -05:00
translate-all.c tcg/aarch64: implement new TCG target for aarch64 2013-06-12 16:20:22 +01:00
translate-all.h cputlb: Pass CPUState to cpu_unlink_tb() 2013-02-16 14:51:00 +01:00
user-exec.c user-exec.c: aarch64 initial implementation of cpu_signal_handler 2013-06-12 16:20:23 +01:00
version.rc
vl.c vl: Fix -boot order and once regressions, and related bugs 2013-06-19 14:10:42 -05: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 hw/xen: Use g_free instead of free and fix potential memory leaks 2013-06-11 23:45:44 +04:00
xen-mapcache.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
xen-stub.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00

README

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

- QEMU team