# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxx
# Node ID 60d20acf8928665ea3404f0e8cb324082d43c061
# Parent 8523b124c8f8c38b721d45b896611d77b596c473
# Parent b310a1b71b5460a9a5185b788310701b9a17bbe9
merge
diff -r 8523b124c8f8 -r 60d20acf8928 tools/examples/xmexample.vmx
--- a/tools/examples/xmexample.vmx Tue Aug 16 01:01:19 2005
+++ b/tools/examples/xmexample.vmx Tue Aug 16 01:04:32 2005
@@ -34,7 +34,7 @@
# and MODE is r for read-only, w for read-write.
#disk = [ 'phy:hda1,hda1,r' ]
-disk = [ 'file:/var/images/min-el3-i386.img,hda,w' ]
+disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
#----------------------------------------------------------------------------
# Set according to whether you want the domain restarted when it exits.
diff -r 8523b124c8f8 -r 60d20acf8928 tools/ioemu/hw/ide.c
--- a/tools/ioemu/hw/ide.c Tue Aug 16 01:01:19 2005
+++ b/tools/ioemu/hw/ide.c Tue Aug 16 01:04:32 2005
@@ -430,6 +430,7 @@
put_le16(p + 59, 0x100 | s->mult_sectors);
put_le16(p + 60, s->nb_sectors);
put_le16(p + 61, s->nb_sectors >> 16);
+ put_le16(p + 63, 0x07);
put_le16(p + 80, (1 << 1) | (1 << 2));
put_le16(p + 82, (1 << 14));
put_le16(p + 83, (1 << 14));
@@ -460,7 +461,7 @@
put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */
put_le16(p + 49, 1 << 9); /* LBA supported, no DMA */
put_le16(p + 53, 3); /* words 64-70, 54-58 valid */
- put_le16(p + 63, 0x103); /* DMA modes XXX: may be incorrect */
+ put_le16(p + 63, 0x07); /* Multi-word DMA mode 2 */
put_le16(p + 64, 1); /* PIO modes */
put_le16(p + 65, 0xb4); /* minimum DMA multiword tx cycle time */
put_le16(p + 66, 0xb4); /* recommended DMA multiword tx cycle time */
diff -r 8523b124c8f8 -r 60d20acf8928 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Tue Aug 16 01:01:19 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py Tue Aug 16 01:04:32 2005
@@ -743,8 +743,7 @@
for ctrl in self.getDeviceControllers():
ctrl.initController(reboot=True)
else:
- if self.image.ostype != 'vmx':
- self.create_configured_devices()
+ self.create_configured_devices()
if not self.device_model_pid:
self.device_model_pid = self.image.createDeviceModel()
@@ -916,8 +915,7 @@
"""
self.configure_fields()
self.create_devices()
- if self.image.ostype != 'vmx':
- self.create_blkif()
+ self.create_blkif()
def create_blkif(self):
"""Create the block device interface (blkif) for the vm.
diff -r 8523b124c8f8 -r 60d20acf8928 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Tue Aug 16 01:01:19 2005
+++ b/tools/python/xen/xend/image.py Tue Aug 16 01:04:32 2005
@@ -16,6 +16,7 @@
#============================================================================
import os, string
+import re
import xen.lowlevel.xc; xc = xen.lowlevel.xc.new()
from xen.xend import sxp
@@ -329,8 +330,15 @@
if name == 'vbd':
vbdinfo = sxp.child(device, 'vbd')
uname = sxp.child_value(vbdinfo, 'uname')
- vbddev = sxp.child_value(vbdinfo, 'dev')
+ typedev = sxp.child_value(vbdinfo, 'dev')
(vbdtype, vbdparam) = string.split(uname, ':', 1)
+ if re.match('^ioemu:', typedev):
+ (emtype, vbddev) = string.split(typedev, ':', 1)
+ else:
+ emtype = 'vbd'
+ vbddev = typedev
+ if emtype != 'ioemu':
+ continue;
vbddev_list = ['hda', 'hdb', 'hdc', 'hdd']
if vbddev not in vbddev_list:
raise VmError("vmx: for qemu vbd type=file&dev=hda~hdd")
diff -r 8523b124c8f8 -r 60d20acf8928 tools/python/xen/xend/server/blkif.py
--- a/tools/python/xen/xend/server/blkif.py Tue Aug 16 01:01:19 2005
+++ b/tools/python/xen/xend/server/blkif.py Tue Aug 16 01:04:32 2005
@@ -18,6 +18,7 @@
"""Support for virtual block devices.
"""
import string
+import re
from xen.util import blkif
from xen.xend.XendError import XendError, VmError
@@ -199,6 +200,7 @@
self.vdev = None
self.mode = None
self.type = None
+ self.emtype = None
self.params = None
self.node = None
self.device = None
@@ -237,7 +239,12 @@
# Split into type and type-specific params (which are passed to the
# type-specific control script).
(self.type, self.params) = string.split(self.uname, ':', 1)
- self.dev = sxp.child_value(config, 'dev')
+ typedev = sxp.child_value(config, 'dev')
+ if re.match( '^ioemu:', typedev):
+ (self.emtype, self.dev) = string.split(typedev, ':', 1)
+ else:
+ self.emtype = 'vbd'
+ self.dev = typedev
if not self.dev:
raise VmError('vbd: Missing dev')
self.mode = sxp.child_value(config, 'mode', 'r')
@@ -258,6 +265,8 @@
if recreate:
pass
else:
+ if self.emtype == 'ioemu':
+ return
node = Blkctl.block('bind', self.type, self.params)
self.setNode(node)
self.attachBackend()
diff -r 8523b124c8f8 -r 60d20acf8928 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py Tue Aug 16 01:01:19 2005
+++ b/tools/python/xen/xm/create.py Tue Aug 16 01:04:32 2005
@@ -592,9 +592,14 @@
return d
return None
+vncpid = None
+
def spawn_vnc(display):
- os.system("vncviewer -log *:stdout:0 -listen %d &" %
- (VNC_BASE_PORT + display))
+ vncargs = (["vncviewer" + "-log", "*:stdout:0",
+ "-listen", "%d" % (VNC_BASE_PORT + display) ])
+ global vncpid
+ vncpid = os.spawnvp(os.P_NOWAIT, "vncviewer", vncargs)
+
return VNC_BASE_PORT + display
def preprocess_vnc(opts, vals):
@@ -639,6 +644,9 @@
else:
dominfo = server.xend_domain_create(config)
except XendError, ex:
+ import signal
+ if vncpid:
+ os.kill(vncpid, signal.SIGKILL)
opts.err(str(ex))
dom = sxp.child_value(dominfo, 'name')
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home