rpms/xen/F-7 xen-hvm-save-paths.patch, NONE, 1.1 xen.spec, 1.178, 1.179 xen-remove-vnc-monitor.patch, 1.1, NONE
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Mon Jun 11 18:59:48 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/xen/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25709
Modified Files:
xen.spec
Added Files:
xen-hvm-save-paths.patch
Removed Files:
xen-remove-vnc-monitor.patch
Log Message:
Remove obsolete VNC monitor patch. Fixed HVM save/restore paths. Stpp bogus xen-vncfb daemon
xen-hvm-save-paths.patch:
--- NEW FILE xen-hvm-save-paths.patch ---
diff -rup xen-3.1.0-src/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
--- xen-3.1.0-src/tools/ioemu/target-i386-dm/helper2.c 2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c 2007-06-11 08:25:16.000000000 -0400
@@ -615,7 +615,7 @@ int main_loop(void)
extern int suspend_requested;
CPUState *env = cpu_single_env;
int evtchn_fd = xc_evtchn_fd(xce_handle);
- char qemu_file[20];
+ char qemu_file[PATH_MAX];
buffered_io_timer = qemu_new_timer(rt_clock, handle_buffered_io,
cpu_single_env);
@@ -637,7 +637,9 @@ int main_loop(void)
ide_stop_dma_thread();
/* Save the device state */
- sprintf(qemu_file, "/tmp/xen.qemu-dm.%d", domid);
+ snprintf(qemu_file, PATH_MAX-1, "/var/lib/xen/qemu-save.%d", domid);
+ qemu_file[PATH_MAX-1] = '\0';
+
if (qemu_savevm(qemu_file) < 0)
fprintf(stderr, "qemu save fail.\n");
diff -rup xen-3.1.0-src/tools/python/xen/xend/image.py xen-3.1.0-src.new/tools/python/xen/xend/image.py
--- xen-3.1.0-src/tools/python/xen/xend/image.py 2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/image.py 2007-06-11 08:24:07.000000000 -0400
@@ -433,7 +433,7 @@ class HVMImageHandler(ImageHandler):
(self.getRequiredInitialReservation() / 1024) ])
args = args + self.dmargs
if restore:
- args = args + ([ "-loadvm", "/tmp/xen.qemu-dm.%d" %
+ args = args + ([ "-loadvm", "/var/lib/xen/qemu-save.%d" %
self.vm.getDomid() ])
env = dict(os.environ)
if self.display:
diff -rup xen-3.1.0-src/tools/python/xen/xend/XendCheckpoint.py xen-3.1.0-src.new/tools/python/xen/xend/XendCheckpoint.py
--- xen-3.1.0-src/tools/python/xen/xend/XendCheckpoint.py 2007-05-18 10:45:21.000000000 -0400
+++ xen-3.1.0-src.new/tools/python/xen/xend/XendCheckpoint.py 2007-06-11 08:24:07.000000000 -0400
@@ -111,7 +111,8 @@ def save(fd, dominfo, network, live, dst
# put qemu device model state
if hvm:
write_exact(fd, QEMU_SIGNATURE, "could not write qemu signature")
- qemu_fd = os.open("/tmp/xen.qemu-dm.%d" % dominfo.getDomid(), os.O_RDONLY)
+ qemu_fd = os.open("/var/lib/xen/qemu-save.%d" % dominfo.getDomid(),
+ os.O_RDONLY)
while True:
buf = os.read(qemu_fd, dm_batch)
if len(buf):
@@ -119,7 +120,7 @@ def save(fd, dominfo, network, live, dst
else:
break
os.close(qemu_fd)
- os.remove("/tmp/xen.qemu-dm.%d" % dominfo.getDomid())
+ os.remove("/var/lib/xen/qemu-save.%d" % dominfo.getDomid())
if checkpoint:
dominfo.resumeDomain()
@@ -238,7 +239,7 @@ def restore(xd, fd, dominfo = None, paus
if qemu_signature != QEMU_SIGNATURE:
raise XendError("not a valid device model state: found '%s'" %
qemu_signature)
- qemu_fd = os.open("/tmp/xen.qemu-dm.%d" % dominfo.getDomid(),
+ qemu_fd = os.open("/var/lib/xen/qemu-save.%d" % dominfo.getDomid(),
os.O_WRONLY | os.O_CREAT | os.O_TRUNC)
while True:
buf = os.read(fd, dm_batch)
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-7/xen.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- xen.spec 25 May 2007 15:02:47 -0000 1.178
+++ xen.spec 11 Jun 2007 18:59:12 -0000 1.179
@@ -3,7 +3,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 3.1.0
-Release: 1%{dist}
+Release: 2%{dist}
Group: Development/Libraries
License: GPL
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -19,8 +19,8 @@
Patch20: xen-blktap-no-aio-epoll.patch
Patch21: xen-blktap-error-returns.patch
-Patch24: xen-remove-vnc-monitor.patch
Patch25: xen-qemu-vnc-delete.patch
+Patch26: xen-hvm-save-paths.patch
# Patches to modify the default config of xend
Patch100: xen-config-dom0-minmem.patch
@@ -31,6 +31,7 @@
# from FC5/6 days. Can kill off once FC6 is EOL'd
Patch150: xen-pvfb-compat.patch
Patch151: xen-pvfb-terminate.patch
+Patch152: xen-pvfb-no-hvm.patch
Patch251: pygrub-manykernels.patch
@@ -107,8 +108,8 @@
%patch20 -p1
%patch21 -p1
-%patch24 -p1
%patch25 -p1
+%patch26 -p1
# config patches
%patch100 -p1
@@ -118,6 +119,7 @@
# pvfb compat
%patch150 -p1
%patch151 -p1
+%patch152 -p1
# upstream patches
%patch251 -p1
@@ -248,6 +250,11 @@
%{_libdir}/*.a
%changelog
+* Mon Jun 11 2007 Daniel Berrange <berrange at t60wlan.home.berrange.com> - 3.1.0-2.fc7
+- Remove patch which kills VNC monitor
+- Fix HVM save/restore file path to be /var/lib/xen instead of /tmp
+- Don't spawn a bogus xen-vncfb daemon for HVM guests
+
* Fri May 25 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-1.fc7
- Updated to official 3.1.0 tar.gz
- Fixed data corruption from VNC client disconnect (bz 241303)
--- xen-remove-vnc-monitor.patch DELETED ---
More information about the fedora-extras-commits
mailing list