Linux virtualization list
 help / color / mirror / Atom feed
* [PULL] virtio console fixes, abi change
@ 2010-04-14  5:35 Amit Shah
  2010-04-14  7:25 ` Juan Quintela
  0 siblings, 1 reply; 2+ messages in thread
From: Amit Shah @ 2010-04-14  5:35 UTC (permalink / raw)
  To: Rusty Russell; +Cc: Juan Quintela, Virtualization List

Hello Rusty,

To avoid sending the same patches again, this time I'm trying a git pull
request.

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/amit/vs-kernel.git for-rusty

to get the patches that I've sent to the list previously, with a couple
of fixes:

- Create a console port when not using multiport (fix was sent as a
  reply to prev. series)

- Add hunk that got inadvertently reverted during git rebase operations
  (thanks Juan).

The diff to the v6 version is attached below:

diff --git a/drivers/char/virtio_console.c
b/drivers/char/virtio_console.c
index b06a0e5..a64558f 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1083,6 +1083,8 @@ free_cdev:
 free_port:
        kfree(port);
 fail:
+       /* The host might want to notify management sw about port add
failure */
+       send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 0);
        return err;
 }
@@ -1407,17 +1513,14 @@ static int __devinit virtcons_probe(struct
virtio_device *vdev)
                        err = -ENOMEM;
                        goto free_vqs;
                }
+       } else {
+               /*
+                * For backward compatibility: Create a console port
+                * if we're running on older host.
+                */
+               add_port(portdev, 0);
        }

Thanks,
		Amit

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-04-14  7:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-14  5:35 [PULL] virtio console fixes, abi change Amit Shah
2010-04-14  7:25 ` Juan Quintela

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox