diff -ur xen-3.1-3.1.0/tools/ioemu/vl.c xen-3.1-3.1.0-my/tools/ioemu/vl.c --- xen-3.1-3.1.0/tools/ioemu/vl.c 2007-05-18 20:45:21.000000000 +0600 +++ xen-3.1-3.1.0-my/tools/ioemu/vl.c 2007-12-30 14:45:13.000000000 +0500 @@ -5515,7 +5515,8 @@ QEMU_OPTION_std_vga, QEMU_OPTION_monitor, QEMU_OPTION_domainname, - QEMU_OPTION_serial, + QEMU_OPTION_seriala, + QEMU_OPTION_serialb, QEMU_OPTION_parallel, QEMU_OPTION_loadvm, QEMU_OPTION_full_screen, @@ -5603,7 +5604,8 @@ { "std-vga", 0, QEMU_OPTION_std_vga }, { "monitor", 1, QEMU_OPTION_monitor }, { "domain-name", 1, QEMU_OPTION_domainname }, - { "serial", 1, QEMU_OPTION_serial }, + { "seriala", 1, QEMU_OPTION_seriala }, + { "serialb", 1, QEMU_OPTION_serialb }, { "parallel", 1, QEMU_OPTION_parallel }, { "loadvm", HAS_ARG, QEMU_OPTION_loadvm }, { "full-screen", 0, QEMU_OPTION_full_screen }, @@ -6465,7 +6467,8 @@ case QEMU_OPTION_monitor: pstrcpy(monitor_device, sizeof(monitor_device), optarg); break; - case QEMU_OPTION_serial: + case QEMU_OPTION_seriala: + case QEMU_OPTION_serialb: if (serial_device_index >= MAX_SERIAL_PORTS) { fprintf(stderr, "qemu: too many serial ports\n"); exit(1); diff -ur xen-3.1-3.1.0/tools/python/xen/xend/image.py xen-3.1-3.1.0-my/tools/python/xen/xend/image.py --- xen-3.1-3.1.0/tools/python/xen/xend/image.py 2007-05-18 20:45:21.000000000 +0600 +++ xen-3.1-3.1.0-my/tools/python/xen/xend/image.py 2007-12-30 19:24:14.000000000 +0500 @@ -299,7 +299,7 @@ # xm config file def parseDeviceModelArgs(self, vmConfig): dmargs = [ 'boot', 'fda', 'fdb', 'soundhw', - 'localtime', 'serial', 'stdvga', 'isa', + 'localtime', 'seriala', 'serialb', 'stdvga', 'isa', 'acpi', 'usb', 'usbdevice', 'keymap' ] ret = ['-vcpus', str(self.vm.getVCpuCount())] diff -ur xen-3.1-3.1.0/tools/python/xen/xend/XendConfig.py xen-3.1-3.1.0-my/tools/python/xen/xend/XendConfig.py --- xen-3.1-3.1.0/tools/python/xen/xend/XendConfig.py 2007-05-18 20:45:21.000000000 +0600 +++ xen-3.1-3.1.0-my/tools/python/xen/xend/XendConfig.py 2007-12-30 19:25:04.000000000 +0500 @@ -119,7 +119,7 @@ # Platform configuration keys. XENAPI_PLATFORM_CFG = [ 'acpi', 'apic', 'boot', 'device_model', 'display', 'fda', 'fdb', 'keymap', 'isa', 'localtime', 'monitor', - 'nographic', 'pae', 'rtc_timeoffset', 'serial', 'sdl', + 'nographic', 'pae', 'rtc_timeoffset', 'seriala', 'serialb', 'sdl', 'soundhw','stdvga', 'usb', 'usbdevice', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten', 'vncpasswd', 'vncunused', 'xauthority'] diff -ur xen-3.1-3.1.0/tools/python/xen/xm/create.py xen-3.1-3.1.0-my/tools/python/xen/xm/create.py --- xen-3.1-3.1.0/tools/python/xen/xm/create.py 2007-05-18 20:45:21.000000000 +0600 +++ xen-3.1-3.1.0-my/tools/python/xen/xm/create.py 2007-12-30 19:25:57.000000000 +0500 @@ -417,7 +417,11 @@ fn=set_value, default='', use="Path to fdb") -gopts.var('serial', val='FILE', +gopts.var('seriala', val='FILE', + fn=set_value, default='', + use="Path to serial or pty or vc") + +gopts.var('serialb', val='FILE', fn=set_value, default='', use="Path to serial or pty or vc") @@ -723,7 +727,7 @@ """Create the config for HVM devices. """ args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', - 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', + 'localtime', 'seriala', 'serialb', 'stdvga', 'isa', 'nographic', 'soundhw', 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor', 'acpi', 'apic', 'usb', 'usbdevice', 'keymap' ]