summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'a62e5f41204e71f375a5ba0f93f06b699003f694' into upstream-mergeAvi Kivity2010-10-131-0/+1
|\
| * migration: Accept 'cont' only after successful incoming migrationAmit Shah2010-10-111-0/+1
* | Merge commit 'b7fdb3ab0e22a9a8debcb928497b248f06778845' into upstream-mergeMarcelo Tosatti2010-07-131-1/+0
|\|
| * pci hotplug: make pci_device_hot_remove() staticIsaku Yamahata2010-07-111-1/+0
* | Merge commit 'fd42deeb4cb42f90084046e3ebdb4383953195e3' into upstream-mergeAvi Kivity2010-06-211-0/+4
|\|
| * Add exit notifiers.Gerd Hoffmann2010-06-141-0/+4
| * Merge remote branch 'kwolf/for-anthony' into stagingAnthony Liguori2010-06-141-52/+0
| |\
* | \ Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into upstream-mergeAvi Kivity2010-06-211-51/+0
|\ \ \ | | |/ | |/|
| * | blockdev: Collect block device code in new blockdev.cMarkus Armbruster2010-06-041-49/+0
| * | qdev: Move declaration of qdev_init_bdrv() into qdev.hMarkus Armbruster2010-06-041-2/+0
| * | blockdev: Hide QEMUMachine from drive_init()Markus Armbruster2010-06-041-1/+2
* | | Merge commit 'f274776028ddb026f8891cabaf59bd58dbfc31bd' into upstream-mergeAvi Kivity2010-06-211-2/+0
|\| |
| * | blockdev: Belatedly remove driveoptsMarkus Armbruster2010-06-041-1/+0
| * | blockdev: Belatedly remove MAX_DRIVESMarkus Armbruster2010-06-041-1/+0
* | | Merge commit '27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71' into upstream-mergeAvi Kivity2010-06-211-0/+1
|\ \ \ | | |/ | |/|
| * | Move daemonize handling to OS specific filesJes Sorensen2010-06-121-0/+1
* | | Merge commit '59a5264b994343f01d19faf95c0e5df70346ded8' into upstream-mergeAvi Kivity2010-06-211-16/+10
|\| |
| * | Introduce OS specific cmdline argument handling and move SMB arg to os-posix.cJes Sorensen2010-06-121-0/+1
| * | Move find_datadir to OS specific files.Jes Sorensen2010-06-121-0/+2
| * | Rename os_setup_signal_handling() to os_setup_early_signal_handling()Jes Sorensen2010-06-121-1/+1
| * | Move win32 early signal handling setup to os_setup_signal_handling()Jes Sorensen2010-06-121-0/+2
| * | vl.c: Move host_main_loop_wait() to OS specific files.Jes Sorensen2010-06-121-0/+4
| * | Create qemu-os-win32.h and move WIN32 specific declarations thereJes Sorensen2010-06-121-16/+1
| |/
* | Merge remote branch 'upstream' into upstream-mergeAvi Kivity2010-05-261-0/+1
|\|
| * sysemu: Export 'no_shutdown'Luiz Capitulino2010-05-191-0/+1
* | Merge commit 'a875170167f75e63a11f68adc0a15b4e82a6c186' into upstream-mergeAvi Kivity2010-05-261-4/+1
|\|
| * Revert "Monitor: Return before exiting with 'quit'"Luiz Capitulino2010-05-191-2/+0
| * Revert "monitor: Convert do_pci_device_hot_remove() to QObject"Markus Armbruster2010-05-191-2/+1
* | Merge commit '6c6a58aee425338bf67ec8faffdcda56b0b82090' into upstream-mergeAvi Kivity2010-05-261-2/+1
|\|
| * Revert "PCI: Convert pci_device_hot_add() to QObject"Markus Armbruster2010-05-191-2/+1
* | Merge commit '0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d' into upstream-mergeMarcelo Tosatti2010-05-011-0/+2
|\|
| * Monitor: Return before exiting with 'quit'Luiz Capitulino2010-04-261-0/+2
* | Merge commit 'ad96090a01d848df67d70c5259ed8aa321fa8716' into upstream-mergeMarcelo Tosatti2010-04-061-4/+0
|\|
| * Refactor target specific handling, compile vl.c only onceBlue Swirl2010-03-291-4/+0
* | Merge commit 'd745bef890f9fa57298ae099365da8e8aa575cbd' into upstream-mergeMarcelo Tosatti2010-04-061-2/+0
|\|
| * error: Trim includes after "Move qemu_error & friends..."Markus Armbruster2010-03-271-2/+0
* | Merge commit 'aaf12c25312c49620777a232e8f770357450a603' into upstream-mergeMarcelo Tosatti2010-04-051-5/+0
|\|
| * Revert "Add exit notifiers"Anthony Liguori2010-03-211-5/+0
* | Merge commit '80a1ab598c6960e7a941e38c5d8638c532c585c3' into upstream-mergeMarcelo Tosatti2010-04-051-0/+5
|\|
| * Add exit notifiersAnthony Liguori2010-03-191-0/+5
* | Merge commit '3af12c86d9db42c826dc9a7577b657543baf7fab' into upstream-mergeMarcelo Tosatti2010-04-051-1/+1
|\|
| * disentangle tcg and deadline calculationPaolo Bonzini2010-03-171-1/+1
* | Merge commit '2f7920166d1aa402104d7b30d0225e71588f91f9' into upstream-mergeMarcelo Tosatti2010-04-051-12/+1
|\|
| * error: Move qemu_error & friends into their own headerMarkus Armbruster2010-03-161-8/+0
| * error: Simplify error sink setupMarkus Armbruster2010-03-161-3/+0
| * savevm: Fix -loadvm to report errors to stderr, not the monitorMarkus Armbruster2010-03-161-1/+1
* | Merge commit '5cd2c5b6ad75c46d40118ac67c0c09d4e7930a65' into upstream-mergeMarcelo Tosatti2010-03-151-0/+2
|\|
| * QMP: Introduce RTC_CHANGE eventLuiz Capitulino2010-03-081-0/+2
| * KVM: Rework VCPU state writeback APIJan Kiszka2010-03-041-0/+4
* | qemu-kvm: Rework VCPU state writeback APIJan Kiszka2010-03-011-0/+4