rpms/xen/devel xen-qemu-vnc-authentication.patch, 1.1, 1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.1, 1.2
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Mon Sep 24 20:01:58 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18739
Modified Files:
xen-qemu-vnc-authentication.patch
xen-pvfb-02-qemu-pv-machine.patch
Log Message:
Cast explicit VNC disply num to an int (rhbz #279581)
xen-qemu-vnc-authentication.patch:
Index: xen-qemu-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-authentication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-vnc-authentication.patch 28 Aug 2007 21:49:31 -0000 1.1
+++ xen-qemu-vnc-authentication.patch 24 Sep 2007 20:01:25 -0000 1.2
@@ -1965,8 +1965,8 @@
vnclisten = config.get('vnclisten',
xen.xend.XendOptions.instance().get_vnclisten_address())
vncdisplay = config.get('vncdisplay', 0)
-- args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
-+ args += ['-vnc', "%s:%d%s" % (vnclisten, vncdisplay, vncopts)]
+- args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
++ args += ['-vnc', "%s:%d%s" % (vnclisten, int(vncdisplay), vncopts)]
if config.get('vncunused', 0):
args += ['-vncunused']
xen-pvfb-02-qemu-pv-machine.patch:
Index: xen-pvfb-02-qemu-pv-machine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-02-qemu-pv-machine.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-02-qemu-pv-machine.patch 28 Aug 2007 21:50:58 -0000 1.1
+++ xen-pvfb-02-qemu-pv-machine.patch 24 Sep 2007 20:01:25 -0000 1.2
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
--- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-09-24 13:22:06.000000000 -0400
@@ -0,0 +1,231 @@
+/*
+ * QEMU Xen PV Machine
@@ -233,9 +233,9 @@
+ * tab-width: 4
+ * End:
+ */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-09-24 13:22:06.000000000 -0400
@@ -370,6 +370,8 @@ VL_OBJS+= piix4acpi.o
VL_OBJS+= xenstore.o
VL_OBJS+= xen_platform.o
@@ -245,9 +245,9 @@
VL_OBJS+= tpm_tis.o
DEFINES += -DHAS_AUDIO
endif
-diff -rupN xen-3.1.0-src.orig/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.orig/tools/ioemu/target-i386-dm/helper2.c 2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c 2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/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.orig/tools/ioemu/target-i386-dm/helper2.c 2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c 2007-09-24 13:22:06.000000000 -0400
@@ -614,14 +614,15 @@ int main_loop(void)
extern int shutdown_requested;
extern int suspend_requested;
@@ -266,9 +266,9 @@
while (!(vm_running && suspend_requested))
/* Wait up to 10 msec. */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-08-23 10:53:46.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
+--- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-09-24 13:22:06.000000000 -0400
@@ -168,7 +168,7 @@ int xc_handle;
time_t timeoffset = 0;
@@ -296,9 +296,9 @@
break;
case QEMU_OPTION_d:
domid = atoi(optarg);
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-08-23 10:52:07.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-08-23 10:52:15.000000000 -0400
+diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
+--- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-09-24 13:21:38.000000000 -0400
++++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-09-24 13:22:06.000000000 -0400
@@ -968,6 +968,7 @@ extern QEMUMachine pc_machine;
extern QEMUMachine isapc_machine;
#ifdef CONFIG_DM
@@ -307,10 +307,18 @@
#endif
extern int fd_bootchk;
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py 2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py 2007-08-23 10:54:47.000000000 -0400
-@@ -53,8 +53,10 @@ class VfbifController(DevController):
+diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py 2007-05-18 10:45:21.000000000 -0400
++++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py 2007-09-24 13:22:54.000000000 -0400
+@@ -6,6 +6,7 @@ import xen.xend
+ import os
+
+ def spawn_detached(path, args, env):
++ log.debug("Spawn: " + str(args))
+ p = os.fork()
+ if p == 0:
+ os.spawnve(os.P_NOWAIT, path, args, env)
+@@ -50,8 +51,10 @@ class VfbifController(DevController):
# is HVM, so qemu-dm will handle the vfb.
return
@@ -323,7 +331,7 @@
t = config.get("type", None)
if t == "vnc":
passwd = None
-@@ -68,26 +70,24 @@ class VfbifController(DevController):
+@@ -65,26 +68,24 @@ class VfbifController(DevController):
else:
log.debug("No VNC passwd configured for vfb access")
@@ -338,7 +346,7 @@
xen.xend.XendOptions.instance().get_vnclisten_address())
- args += [ "--listen", vnclisten ]
+ vncdisplay = config.get('vncdisplay', 0)
-+ args += ['-vnc', "%s:%d" % (vnclisten, vncdisplay)]
++ args += ['-vnc', "%s:%d" % (vnclisten, int(vncdisplay))]
+
+ if config.get('vncunused', 0):
+ args += ['-vncunused']
@@ -359,9 +367,9 @@
else:
raise VmError('Unknown vfb type %s (%s)' % (t, repr(config)))
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
--- xen-3.1.0-src.orig/tools/xenfb/xenfb.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.c 2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.c 2007-09-24 13:22:06.000000000 -0400
@@ -677,37 +677,58 @@ static int xenfb_on_state_change(struct
return 0;
}
@@ -471,9 +479,9 @@
+ * tab-width: 8
+ * End:
+ */
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
+diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
--- xen-3.1.0-src.orig/tools/xenfb/xenfb.h 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.h 2007-08-23 10:52:15.000000000 -0400
++++ xen-3.1.0-src.new/tools/xenfb/xenfb.h 2007-09-24 13:22:06.000000000 -0400
@@ -25,8 +25,12 @@ void xenfb_teardown(struct xenfb *xenfb)
int xenfb_attach_dom(struct xenfb *xenfb, int domid);
More information about the fedora-extras-commits
mailing list