mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
[XEND] Merge VFB support for PV and HVM guests.
This patch merges the way VFB are represented inside Xend by making HVM VNC consoles use the VFB as its configuration object. It preserves the way options are specified through xm but will create a new VFB device that is used by image.py to put vnc config into qemu-dm's command line. The parsing is moved into image.py's parseDeviceModel() rather than in configVNC(). Through the Xen API, you can create a 'console' of protocol 'rfb' and end up with a VNC console, on both HVM and PV guests. The location of the connecting port is stored in the location attribute of the console object. This is updated on each XendDomainInfo.update() if it changes. Also fixes missing read of the vnclisten and HVM_boot from the config when initialised via xm. Makes sure bootable attribute for VBD is store as an int when making SXP config. Signed-off-by: Alastair Tse <atse@xensource.com>
This commit is contained in:
1 parent
6501ac6994
commit
f492dd97fb
9 files changed
+342
-89
No files matched your search
@@ -45,7 +45,7 @@ VDI_LIST_FORMAT = '%(name_label)-18s %(uuid)-36s %(virtual_size)-8s '\
|
||||
VBD_LIST_FORMAT = '%(device)-6s %(uuid)-36s %(VDI)-8s'
|
||||
TASK_LIST_FORMAT = '%(name_label)-18s %(uuid)-36s %(status)-8s %(progress)-4s'
|
||||
VIF_LIST_FORMAT = '%(name)-8s %(device)-7s %(uuid)-36s %(MAC)-10s'
|
||||
CONSOLE_LIST_FORMAT = '%(uuid)-36s %(protocol)-8s %(uri)-32s'
|
||||
CONSOLE_LIST_FORMAT = '%(uuid)-36s %(protocol)-8s %(location)-32s'
|
||||
|
||||
COMMANDS = {
|
||||
'host-info': ('', 'Get Xen Host Info'),
|
||||
@@ -545,7 +545,7 @@ def xapi_console_list(args, async = False):
|
||||
|
||||
if not is_long:
|
||||
print CONSOLE_LIST_FORMAT % {'protocol': 'Protocol',
|
||||
'uri': 'URI',
|
||||
'location': 'Location',
|
||||
'uuid': 'UUID'}
|
||||
|
||||
for console in consoles:
|
||||
|
||||