3 files changed, 10 insertions, 0 deletions

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index ddf86b6500b7..cdf2f5451c76 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1895,6 +1895,13 @@ static int virtcons_restore(struct virtio_device *vdev)
 
                 /* Get port open/close status on the host */
                 send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);
+
+                /*
+                 * If a port was open at the time of suspending, we
+                 * have to let the host know that it's still open.
+                 */
+                if (port->guest_connected)
+                        send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 1);
         }
         return 0;
 }
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index af8acc85f4bb..cbefe671bcc6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -492,7 +492,9 @@ static void virtnet_napi_enable(struct virtnet_info *vi)
          * We synchronize against interrupts via NAPI_STATE_SCHED */
         if (napi_schedule_prep(&vi->napi)) {
                 virtqueue_disable_cb(vi->rvq);
+                local_bh_disable();
                 __napi_schedule(&vi->napi);
+                local_bh_enable();
         }
 }
 
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index c2d05a8279fd..8807fe501d20 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -390,6 +390,7 @@ static void __devexit virtballoon_remove(struct virtio_device *vdev)
         /* There might be pages left in the balloon: free them. */
         while (vb->num_pages)
                 leak_balloon(vb, vb->num_pages);
+        update_balloon_size(vb);
 
         /* Now we reset the device so we can clean up the queues. */
         vdev->config->reset(vdev);