diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-27 16:01:35 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-27 16:01:35 +0000 |
| commit | b1ded68a3c56de12dc2c18978bdf999f25909af3 (patch) | |
| tree | d8a63acee148f948b2556b595e7a9eda556093c6 | |
| parent | 1e1c9845799ca82c3b2501701829b1304d8218c3 (diff) | |
| download | xen-b1ded68a3c56de12dc2c18978bdf999f25909af3.tar.gz xen-b1ded68a3c56de12dc2c18978bdf999f25909af3.tar.bz2 xen-b1ded68a3c56de12dc2c18978bdf999f25909af3.zip | |
pygrub/xend: Fix console plumbing to xenconsole client.
Domain's console tty now lives at serial/0/tty in xenstore.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | tools/python/xen/util/diagnose.py | 2 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendBootloader.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/python/xen/util/diagnose.py b/tools/python/xen/util/diagnose.py index e31f396e73..b857e2d740 100644 --- a/tools/python/xen/util/diagnose.py +++ b/tools/python/xen/util/diagnose.py @@ -77,7 +77,7 @@ def diagnose(dom): def diagnose_console(): port = xstransact.Read(dompath + '/console/port') ringref = xstransact.Read(dompath + '/console/ring-ref') - tty = xstransact.Read(dompath + '/console/tty') + tty = xstransact.Read(dompath + '/serial/0/tty') if not port: print "Console port is missing; Xend has failed." diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py index 74c9a2ac19..0cef917358 100644 --- a/tools/python/xen/xend/XendBootloader.py +++ b/tools/python/xen/xend/XendBootloader.py @@ -85,7 +85,7 @@ def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '', fcntl.fcntl(m1, fcntl.F_SETFL, os.O_NDELAY) slavename = ptsname.ptsname(m1) - dom.storeDom("console/tty", slavename) + dom.storeDom("serial/0/tty", slavename) # Release the domain lock here, because we definitely don't want # a stuck bootloader to deny service to other xend clients. |