sd.c: Handle NULL block backend in sd_get_inserted()

[qemu.git] / migration / qemu-file-unix.c

diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c
index c503b027a9f517398e35fa70287a6445518a3be7..61b059b25b85e272e9ee390ca9e6bdee483daa4d 100644 (file)
--- a/migration/qemu-file-unix.c
+++ b/migration/qemu-file-unix.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
@@ -72,7 +73,8 @@ static ssize_t socket_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
             pfd.fd = s->fd;
             pfd.events = G_IO_OUT | G_IO_ERR;
             pfd.revents = 0;
-            g_poll(&pfd, 1 /* 1 fd */, -1 /* no timeout */);
+            TFR(err = g_poll(&pfd, 1, -1 /* no timeout */));
+            /* Errors other than EINTR intentionally ignored */
         }
      }