mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
HVM: Allow qemu monitor to be configured in domain config file.
From: Yongkang You <yongkang.you@intel.com> Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
kfraser@localhost.localdomain committed
1 parent
9919a2345e
commit
40bb2e5fea
7 files changed
+20
-1
No files matched your search
@@ -115,6 +115,7 @@ otherConfig
|
||||
image.nographic
|
||||
image.vnc
|
||||
image.sdl
|
||||
image.monitor
|
||||
image.vncdisplay
|
||||
image.vncunused
|
||||
image.hvm.device_model
|
||||
|
||||
@@ -63,6 +63,7 @@ image
|
||||
- fdb
|
||||
- soundhw
|
||||
- localtime
|
||||
- monitor
|
||||
- serial
|
||||
- stdvga
|
||||
- isa
|
||||
|
||||
@@ -117,7 +117,7 @@ LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG)
|
||||
|
||||
# Platform configuration keys.
|
||||
XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display',
|
||||
'fda', 'fdb', 'keymap', 'isa', 'localtime',
|
||||
'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor',
|
||||
'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl',
|
||||
'soundhw','stdvga', 'usb', 'usbdevice', 'vnc',
|
||||
'vncconsole', 'vncdisplay', 'vnclisten',
|
||||
|
||||
@@ -415,6 +415,8 @@ class HVMImageHandler(ImageHandler):
|
||||
else:
|
||||
ret.append('-nographic')
|
||||
|
||||
if int(vmConfig['platform'].get('monitor', 0)) != 0:
|
||||
ret.append('-monitor vc')
|
||||
return ret
|
||||
|
||||
def createDeviceModel(self, restore = False):
|
||||
|
||||
@@ -421,6 +421,10 @@ gopts.var('serial', val='FILE',
|
||||
fn=set_value, default='',
|
||||
use="Path to serial or pty or vc")
|
||||
|
||||
gopts.var('monitor', val='no|yes',
|
||||
fn=set_bool, default=0,
|
||||
use="""Should the device model use monitor?""")
|
||||
|
||||
gopts.var('localtime', val='no|yes',
|
||||
fn=set_bool, default=0,
|
||||
use="Is RTC set to localtime?")
|
||||
|
||||