diff --git a/32on64-extra-mem.patch b/32on64-extra-mem.patch index 2a16398..6249b76 100644 --- a/32on64-extra-mem.patch +++ b/32on64-extra-mem.patch @@ -2,7 +2,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2917,7 +2917,7 @@ class XendDomainInfo: +@@ -2920,7 +2920,7 @@ class XendDomainInfo: self.guest_bitsize = self.image.getBitSize() # Make sure there's enough RAM available for the domain diff --git a/change_home_server.patch b/change_home_server.patch index 4cddc7c..4aa6dae 100644 --- a/change_home_server.patch +++ b/change_home_server.patch @@ -2,7 +2,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -3133,6 +3133,11 @@ class XendDomainInfo: +@@ -3136,6 +3136,11 @@ class XendDomainInfo: self._cleanup_phantom_devs(paths) self._cleanupVm() diff --git a/del_usb_xend_entry.patch b/del_usb_xend_entry.patch index d62c0e7..2ddfc2f 100644 --- a/del_usb_xend_entry.patch +++ b/del_usb_xend_entry.patch @@ -2,13 +2,13 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1310,8 +1310,15 @@ class XendDomainInfo: +@@ -1313,8 +1313,15 @@ class XendDomainInfo: frontpath = self.getDeviceController(deviceClass).frontendPath(dev) backpath = xstransact.Read(frontpath, "backend") thread.start_new_thread(self.getDeviceController(deviceClass).finishDeviceCleanup, (backpath, path)) - - rc = self.getDeviceController(deviceClass).destroyDevice(devid, force) -+ if deviceClass =='vusb': ++ if deviceClass =='vusb': + dev = self.getDeviceController(deviceClass).convertToDeviceNumber(devid) + state = self.getDeviceController(deviceClass).readBackend(dev, 'state') + if state == '1': diff --git a/multi-xvdp.patch b/multi-xvdp.patch index 78811a5..dc38507 100644 --- a/multi-xvdp.patch +++ b/multi-xvdp.patch @@ -34,7 +34,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py xc = xen.lowlevel.xc.xc() xoptions = XendOptions.instance() -@@ -3311,20 +3311,27 @@ class XendDomainInfo: +@@ -3314,20 +3314,27 @@ class XendDomainInfo: # This is a file, not a device. pygrub can cope with a # file if it's raw, but if it's QCOW or other such formats # used through blktap, then we need to mount it first. @@ -76,7 +76,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py try: blcfg = bootloader(blexec, fn, self, False, -@@ -3332,11 +3339,11 @@ class XendDomainInfo: +@@ -3335,11 +3342,11 @@ class XendDomainInfo: finally: if mounted: log.info("Unmounting %s from %s." % diff --git a/xen.changes b/xen.changes index cc57c95..3aa1633 100644 --- a/xen.changes +++ b/xen.changes @@ -132,6 +132,12 @@ Fri Sep 17 15:59:45 CEST 2010 - ohering@suse.de xenpaging.get_paged_frame.patch xenpaging.notify_via_xen_event_channel.patch +------------------------------------------------------------------- +Mon Sep 13 16:24:31 MDT 2010 - carnold@novell.com + +- bnc#636231 - XEN: Unable to disconnect/remove CDROM drive from VM + xend-devid-or-name.patch + ------------------------------------------------------------------- Mon Sep 13 10:50:56 MDT 2010 - carnold@novell.com diff --git a/xen.spec b/xen.spec index 8b24946..fa7d360 100644 --- a/xen.spec +++ b/xen.spec @@ -199,6 +199,7 @@ Patch370: xend-sysconfig.patch Patch371: domu-usb-controller.patch Patch372: popen2-argument-fix.patch Patch373: usb-list.patch +Patch374: xend-devid-or-name.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -698,6 +699,7 @@ Authors: %patch371 -p1 %patch372 -p1 %patch373 -p1 +%patch374 -p1 %patch400 -p1 %patch401 -p1 %patch402 -p1 diff --git a/xend-domain-lock.patch b/xend-domain-lock.patch index f44edb7..58795c4 100644 --- a/xend-domain-lock.patch +++ b/xend-domain-lock.patch @@ -94,7 +94,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py XendTask.log_progress(0, 30, self._constructDomain) XendTask.log_progress(31, 60, self._initDomain) -@@ -2987,6 +2989,11 @@ class XendDomainInfo: +@@ -2990,6 +2992,11 @@ class XendDomainInfo: self._stateSet(DOM_STATE_HALTED) self.domid = None # Do not push into _stateSet()! @@ -106,7 +106,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py finally: self.refresh_shutdown_lock.release() -@@ -4505,6 +4512,74 @@ class XendDomainInfo: +@@ -4508,6 +4515,74 @@ class XendDomainInfo: def has_device(self, dev_class, dev_uuid): return (dev_uuid in self.info['%s_refs' % dev_class.lower()]) diff --git a/xenpaging.autostart.patch b/xenpaging.autostart.patch index bbfb233..cb5a509 100644 --- a/xenpaging.autostart.patch +++ b/xenpaging.autostart.patch @@ -19,6 +19,8 @@ Signed-off-by: Olaf Hering tools/python/xen/xm/xenapi_create.py | 1 8 files changed, 107 insertions(+) +Index: xen-4.0.1-testing/tools/examples/xmexample.hvm +=================================================================== --- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm +++ xen-4.0.1-testing/tools/examples/xmexample.hvm @@ -127,6 +127,9 @@ disk = [ 'file:/var/lib/xen/images/disk. @@ -31,6 +33,8 @@ Signed-off-by: Olaf Hering #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) # default: hard disk, cd-rom, floppy +Index: xen-4.0.1-testing/tools/python/README.XendConfig +=================================================================== --- xen-4.0.1-testing.orig/tools/python/README.XendConfig +++ xen-4.0.1-testing/tools/python/README.XendConfig @@ -120,6 +120,7 @@ otherConfig @@ -41,6 +45,8 @@ Signed-off-by: Olaf Hering image.hvm.display image.hvm.xauthority image.hvm.vncconsole +Index: xen-4.0.1-testing/tools/python/README.sxpcfg +=================================================================== --- xen-4.0.1-testing.orig/tools/python/README.sxpcfg +++ xen-4.0.1-testing/tools/python/README.sxpcfg @@ -51,6 +51,7 @@ image @@ -51,6 +57,8 @@ Signed-off-by: Olaf Hering - display - xauthority - vncconsole +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py +=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -145,6 +145,7 @@ XENAPI_PLATFORM_CFG_TYPES = { @@ -70,9 +78,11 @@ Signed-off-by: Olaf Hering if 'timer_mode' not in self['platform']: self['platform']['timer_mode'] = 1 if 'viridian' not in self['platform']: +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py +=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2439,6 +2439,7 @@ class XendDomainInfo: +@@ -2442,6 +2442,7 @@ class XendDomainInfo: if self.image: self.image.createDeviceModel() @@ -80,7 +90,7 @@ Signed-off-by: Olaf Hering #if have pass-through devs, need the virtual pci slots info from qemu self.pci_device_configure_boot() -@@ -2451,6 +2452,11 @@ class XendDomainInfo: +@@ -2454,6 +2455,11 @@ class XendDomainInfo: self.image.destroyDeviceModel() except Exception, e: log.exception("Device model destroy failed %s" % str(e)) @@ -92,6 +102,8 @@ Signed-off-by: Olaf Hering else: log.debug("No device model") +Index: xen-4.0.1-testing/tools/python/xen/xend/image.py +=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py +++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -122,12 +122,14 @@ class ImageHandler: @@ -201,6 +213,8 @@ Signed-off-by: Olaf Hering def createDeviceModel(self, restore = False): if self.device_model is None: return +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py +=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py +++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -495,6 +495,10 @@ gopts.var('nfs_root', val="PATH", @@ -222,6 +236,8 @@ Signed-off-by: Olaf Hering 'device_model', 'display', 'fda', 'fdb', 'gfx_passthru', 'guest_os_type', +Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py +=================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py +++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py @@ -1086,6 +1086,7 @@ class sxp2xml: