diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:46:55 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:46:55 -0500 |
| commit | a6e43daa732b90b9ca58e7c38f6faa5a82f4b176 (patch) | |
| tree | 7c8c8e63ff65cef5e3f9b0e3cded21b160e4e93d /hw/hw.h | |
| parent | 46cd37e7718f6c2c502228a61b3a0811c849c52f (diff) | |
| parent | ee86c61f285042386c0a27edf69300627a1987b4 (diff) | |
| download | focaccia-qemu-a6e43daa732b90b9ca58e7c38f6faa5a82f4b176.tar.gz focaccia-qemu-a6e43daa732b90b9ca58e7c38f6faa5a82f4b176.zip | |
Merge remote-tracking branch 'quintela/migration-pull' into staging
Diffstat (limited to 'hw/hw.h')
| -rw-r--r-- | hw/hw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/hw.h b/hw/hw.h index a124da9c26..ed20f5a27a 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -85,8 +85,8 @@ uint64_t qemu_get_be64(QEMUFile *f); int qemu_file_rate_limit(QEMUFile *f); int64_t qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); int64_t qemu_file_get_rate_limit(QEMUFile *f); -int qemu_file_has_error(QEMUFile *f); -void qemu_file_set_error(QEMUFile *f); +int qemu_file_get_error(QEMUFile *f); +void qemu_file_set_error(QEMUFile *f, int error); /* Try to send any outstanding data. This function is useful when output is * halted due to rate limiting or EAGAIN errors occur as it can be used to |