Re: [libvirt] [Patch]: spice agent-mouse support [v3]

[Osier Yang]

On 2012年03月07日 19:57, Zhou Peng wrote:

Sorry my git send-email failed to the list :-(

Signed-off-by: Zhou Peng<zhoup...@nfs.iscas.ac.cn>

spice agent-mouse support

Usage:
<graphics type='spice'>
   <mouse mode='client'|'server'/>
<graphics/>

Pushed with the attached diff squashed in. You are added
in the contributors list now, please let me known if you'd
like another name. Thanks for the patch!

Regards,
Osier


diff --git a/AUTHORS b/AUTHORS
index 954fd1a..e4bd51d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -224,6 +224,7 @@ Patches have also been contributed by:
   Peter Robinson       <pbrobin...@gmail.com>
   Benjamin Cama        <ben...@dolka.fr>
   Duncan Rance         <libv...@dunquino.com>
+  Peng Zhou            <ailvpen...@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index d8ced3a..bf0675e 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2851,6 +2851,7 @@ qemu-kvm -net nic,model=? /dev/null
     &lt;image compression='auto_glz'/&gt;
     &lt;streaming mode='filter'/&gt;
     &lt;clipboard copypaste='no'/&gt;
+    &lt;mouse mode='client'/&gt;
   &lt;/graphics&gt;</pre>
             <p>
               Spice supports variable compression settings for audio,
@@ -2888,7 +2889,7 @@ qemu-kvm -net nic,model=? /dev/null
               setting it's <code>mode<code/> attribute to one of
               <code>server</code> or <code>client</code> ,
               <span class="since">since 0.9.11</span>. If no mode is
-              specified, the spice default will be used (client mode).
+              specified, the qemu default will be used (client mode).
             </p>
           </dd>
           <dt><code>"rdp"</code></dt>
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 2238558..d7ec221 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -253,8 +253,6 @@ virDomainChrDefFree;
 virDomainChrDefNew;
 virDomainChrSourceDefCopy;
 virDomainChrSourceDefFree;
-virDomainGraphicsSpiceMouseModeTypeFromString;
-virDomainGraphicsSpiceMouseModeTypeToString;
 virDomainChrSpicevmcTypeFromString;
 virDomainChrSpicevmcTypeToString;
 virDomainChrTcpProtocolTypeFromString;
@@ -347,6 +345,8 @@ virDomainGraphicsSpiceImageCompressionTypeFromString;
 virDomainGraphicsSpiceImageCompressionTypeToString;
 virDomainGraphicsSpiceJpegCompressionTypeFromString;
 virDomainGraphicsSpiceJpegCompressionTypeToString;
+virDomainGraphicsSpiceMouseModeTypeFromString;
+virDomainGraphicsSpiceMouseModeTypeToString;
 virDomainGraphicsSpicePlaybackCompressionTypeFromString;
 virDomainGraphicsSpicePlaybackCompressionTypeToString;
 virDomainGraphicsSpiceStreamingModeTypeFromString;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
new file mode 100644
index 0000000..2c3ef06
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
@@ -0,0 +1,8 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
+/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \
+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
+-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
+-hda /dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent \
+-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
+-usb -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-spice-agentmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-spice-agentmouse.xml
rename to tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-spice-agentmouse.args
deleted file mode 100644
index 746c116..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-spice-agentmouse.args
+++ /dev/null
@@ -1,9 +0,0 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \
--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \
-virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -hda \
-/dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent -device \
-virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0\
-,name=com.redhat.spice.0 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
-agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 0abc9cf..3cfd69c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -511,6 +511,9 @@ mymain(void)
     DO_TEST("graphics-spice", false,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE);
+    DO_TEST("graphics-spice-agentmouse", false,
+            QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
+            QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE);
     DO_TEST("graphics-spice-compression", false,
             QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE);

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list