| commit | 6cb1c7ff2936461c07409fb91f471c0f1b0adaab | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:31:12 +0000 (26 15:31 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 12:43:26 +0000 (26 15:43 +0300) | ||
| tree | a02a2f30d0d4b553420c4a95d41343c069d9400c | treesnapshot (tar.gz zip) |
| parent | b5e71b9dd3e7bd15fa474756268a6646b23389d1 | commitdiff |
| parent | a875170167f75e63a11f68adc0a15b4e82a6c186 | commitdiff |
Merge commit 'a875170167f75e63a11f68adc0a15b4e82a6c186' into upstream-merge
* commit 'a875170167f75e63a11f68adc0a15b4e82a6c186':
Revert "Monitor: Return before exiting with 'quit'"
Revert "monitor: Convert do_pci_device_hot_remove() to QObject"
Conflicts:
sysemu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'a875170167f75e63a11f68adc0a15b4e82a6c186':
Revert "Monitor: Return before exiting with 'quit'"
Revert "monitor: Convert do_pci_device_hot_remove() to QObject"
Conflicts:
sysemu.h
Signed-off-by: Avi Kivity <avi@redhat.com>