aboutsummaryrefslogtreecommitdiff
path: root/net/vde.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-12-21 07:53:48 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-12-21 07:53:48 -0600
commitbb5801f551ee8591d576d87a9290af297998e322 (patch)
tree232402f237f940946c642c4cd6e0edcf6f94dd3f /net/vde.c
parent914606d26e654d4c01bd5186f4d05e3fd445e219 (diff)
parent9848a40427cd76628d04d918fa4751c542527915 (diff)
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 'net/vde.c')
-rw-r--r--net/vde.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/vde.c b/net/vde.c
index 275bda92c3..754a141543 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -25,11 +25,10 @@
#include <libvdeplug.h>
-#include "net.h"
+#include "net/net.h"
#include "clients.h"
-#include "qemu-char.h"
#include "qemu-common.h"
-#include "qemu-option.h"
+#include "qemu/option.h"
typedef struct VDEState {
NetClientState nc;