diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-21 07:53:48 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-21 07:53:48 -0600 |
| commit | bb5801f551ee8591d576d87a9290af297998e322 (patch) | |
| tree | 232402f237f940946c642c4cd6e0edcf6f94dd3f /qemu-char.c | |
| parent | 914606d26e654d4c01bd5186f4d05e3fd445e219 (diff) | |
| parent | 9848a40427cd76628d04d918fa4751c542527915 (diff) | |
| download | qemu-bb5801f551ee8591d576d87a9290af297998e322.tar.gz | |
Merge remote-tracking branch 'quintela/thread-20121220.next' into staging
* quintela/thread-20121220.next: (79 commits)
migration: merge QEMUFileBuffered into MigrationState
migration: fix qemu_get_fd for BufferedFile
ram: refactor ram_save_block() return value
ram: account the amount of transferred ram better
ram: optimize migration bitmap walking
ram: Use memory_region_test_and_clear_dirty
memory: introduce memory_region_test_and_clear_dirty
ram: Add last_sent_block
ram: rename last_block to last_seen_block
migration: move migration notifier
migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect
migration: move migration_fd_put_ready()
migration: add XFER_LIMIT_RATIO
migration: move buffered_file.c code into migration.c
savevm: New save live migration method: pending
buffered_file: unfold buffered_append in buffered_put_buffer
buffered_file: don't flush on put buffer
buffered_file: Unfold the trick to restart generating migration data
migration: just lock migrate_fd_put_ready
migration: remove unfreeze logic
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/qemu-char.c b/qemu-char.c index 9940701d6a..6113d0ab60 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -22,12 +22,11 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "net.h" -#include "monitor.h" -#include "console.h" -#include "sysemu.h" -#include "qemu-timer.h" -#include "qemu-char.h" +#include "monitor/monitor.h" +#include "ui/console.h" +#include "sysemu/sysemu.h" +#include "qemu/timer.h" +#include "char/char.h" #include "hw/usb.h" #include "hw/baum.h" #include "hw/msmouse.h" @@ -95,7 +94,7 @@ #endif #endif -#include "qemu_socket.h" +#include "qemu/sockets.h" #include "ui/qemu-spice.h" #define READ_BUF_LEN 4096 |