7:59 a.m.
v2->v3
rebase work.
v1->v2:
changed attribute name from 'policy' to 'sharePolicy'
renamed caps flag name: QEMU_CAPS_VNC_SHARE_POLICY
fixed issues pointed out in v1 review
have to keep hard-coded version probe after checking qemu -help and qmp command.
As there were some vnc patches recently, I chose do rebase work a little later.
These patches try to add a new attribute 'sharePolicy' to element graphics of
vnc type. This attribute has three values:
allow-exclusive,force-shared and ignore.
Guannan Ren(3)
[PATCH 1/3 v3] qemu: new vnc display sharing policy caps flag
[PATCH 2/3 v3] conf: add 'sharePolicy' attribute to graphics element for
[PATCH 3/3 v3] qemu: add ',share=<policy>' to qemu commandline
docs/formatdomain.html.in | 13 +++++++++++--
docs/schemas/domaincommon.rng | 9 +++++++++
src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++
src/conf/domain_conf.h | 11 +++++++++++
src/libvirt_private.syms | 2 ++
src/qemu/qemu_capabilities.c | 6 +++++-
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++++++++
tests/qemuargv2xmltest.c | 1 +
tests/qemuhelptest.c | 9 ++++++---
tests/qemuxml2argvtest.c | 1 +
11 files changed, 111 insertions(+), 6 deletions(-)
7:59 a.m.
New subject: [libvirt] [PATCH 1/3 v3] qemu: new vnc display sharing policy caps flag
QEMU_CAPS_VNC_SHARE_POLICY (qemu >= 1.1)
---
src/qemu/qemu_capabilities.c | 6 +++++-
src/qemu/qemu_capabilities.h | 1 +
tests/qemuhelptest.c | 9 ++++++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 488cbfe..c6face3 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -230,6 +230,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"mem-merge",
"vnc-websocket",
"drive-discard",
+ "vnc-share-policy",
);
struct _virQEMUCaps {
@@ -1187,8 +1188,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
if (version >= 11000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST);
- if (version >= 1001000)
+ if (version >= 1001000) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
+ }
if (version >= 1002000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
@@ -2431,6 +2434,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
}
/* Capabilities that are architecture depending
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 173ca77..772d905 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -187,6 +187,7 @@ enum virQEMUCapsFlags {
QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */
QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */
QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */
+ QEMU_CAPS_VNC_SHARE_POLICY = 149, /* set display sharing policy */
QEMU_CAPS_LAST, /* this must always be the last item */
};
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index f7f88d0..f6bf7dd 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -827,7 +827,8 @@ mymain(void)
QEMU_CAPS_IPV6_MIGRATION,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_SCSI_GENERIC,
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX,
+ QEMU_CAPS_VNC_SHARE_POLICY);
DO_TEST("qemu-1.2.0", 1002000, 0, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -933,7 +934,8 @@ mymain(void)
QEMU_CAPS_IPV6_MIGRATION,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_SCSI_GENERIC,
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX,
+ QEMU_CAPS_VNC_SHARE_POLICY);
DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -1044,7 +1046,8 @@ mymain(void)
QEMU_CAPS_IPV6_MIGRATION,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_SCSI_GENERIC,
- QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX,
+ QEMU_CAPS_VNC_SHARE_POLICY);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
--
1.8.1.4
8 a.m.
New subject: [libvirt] [PATCH 2/3 v3] conf: add 'sharePolicy' attribute to graphics element for vnc
-vnc :5900,share=allow-exclusive
allows clients to ask for exclusive access which is
implemented by dropping other connections Connecting
multiple clients in parallel requires all clients asking
for a shared session (vncviewer: -shared switch)
-vnc :5900,share=force-shared
disables exclusive client access. Useful for shared
desktop sessions, where you don't want someone forgetting
specify -shared disconnect everybody else.
-vnc :5900,share=ignore
completely ignores the shared flag and allows everybody
connect unconditionally
---
docs/formatdomain.html.in | 13 +++++++++++--
docs/schemas/domaincommon.rng | 9 +++++++++
src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++
src/conf/domain_conf.h | 11 +++++++++++
src/libvirt_private.syms | 2 ++
5 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 5e89a92..6d64698 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3604,7 +3604,7 @@ qemu-kvm -net nic,model=? /dev/null
...
<devices>
<graphics type='sdl' display=':0.0'/>
- <graphics type='vnc' port='5904'>
+ <graphics type='vnc' port='5904'
sharePolicy='allow-exclusive'>
<listen type='address' address='1.2.3.4'/>
</graphics>
<graphics type='rdp' autoport='yes' multiUser='yes'
/>
@@ -3647,7 +3647,16 @@ qemu-kvm -net nic,model=? /dev/null
allows control of connected client during password changes.
VNC accepts <code>keep</code> value only.
<span class="since">since 0.9.3</span>
- NB, this may not be supported by all hypervisors.<br/> <br/>
+ NB, this may not be supported by all hypervisors.<br/>
+ The optional <code>sharePolicy</code> attribute specifies vnc
server
+ display sharing policy. "allow-exclusive" allows clients to ask
+ for exclusive access by dropping other connections. Connecting
+ multiple clients in parallel requires all clients asking for a
+ shared session (vncviewer: -Shared switch). This is the default
+ value. "force-shared" disables exclusive client access, every
+ connection has to specify -Shared switch for vncviewer. "ignore"
+ welcomes every connection unconditionally
+ <span class="since">since 1.0.6</span>. <br/>
<br/>
Rather than using listen/port, QEMU supports a
<code>socket</code> attribute for listening on a unix
domain socket path.<span class="since">Since
0.8.8</span>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 361794e..1a53a4a 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2130,6 +2130,15 @@
<ref name="addrIPorName"/>
</attribute>
</optional>
+ <optional>
+ <attribute name='sharePolicy'>
+ <choice>
+ <value>allow-exclusive</value>
+ <value>force-shared</value>
+ <value>ignore</value>
+ </choice>
+ </attribute>
+ </optional>
</group>
<group>
<optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f0ca9d5..b0a05da 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -515,6 +515,13 @@ VIR_ENUM_IMPL(virDomainGraphicsAuthConnected,
"disconnect",
"keep")
+VIR_ENUM_IMPL(virDomainGraphicsVNCSharePolicy,
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_LAST,
+ "default",
+ "allow-exclusive",
+ "force-shared",
+ "ignore")
+
VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelName,
VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST,
"main",
@@ -7683,6 +7690,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
char *port = virXMLPropString(node, "port");
char *websocket = virXMLPropString(node, "websocket");
+ char *sharePolicy = virXMLPropString(node, "sharePolicy");
char *autoport;
if (port) {
@@ -7725,6 +7733,21 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
VIR_FREE(websocket);
}
+ if (sharePolicy) {
+ int policy =
+ virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy);
+
+ if (policy < 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("unknown vnc display sharing policy
'%s'"), sharePolicy);
+ VIR_FREE(sharePolicy);
+ goto error;
+ } else {
+ def->data.vnc.sharePolicy = policy;
+ }
+ VIR_FREE(sharePolicy);
+ }
+
def->data.vnc.socket = virXMLPropString(node, "socket");
def->data.vnc.keymap = virXMLPropString(node, "keymap");
@@ -15255,6 +15278,11 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
virBufferEscapeString(buf, " keymap='%s'",
def->data.vnc.keymap);
+ if (def->data.vnc.sharePolicy)
+ virBufferAsprintf(buf, " sharePolicy='%s'",
+ virDomainGraphicsVNCSharePolicyTypeToString(
+ def->data.vnc.sharePolicy));
+
virDomainGraphicsAuthDefFormatAttr(buf, &def->data.vnc.auth, flags);
break;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c176a4c..a58c6f7 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1286,6 +1286,15 @@ enum virDomainGraphicsType {
VIR_DOMAIN_GRAPHICS_TYPE_LAST
};
+enum virDomainGraphicsVNCSharePolicy {
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_DEFAULT = 0,
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_ALLOW_EXCLUSIVE,
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_FORCE_SHARED,
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_IGNORE,
+
+ VIR_DOMAIN_GRAPHICS_VNC_SHARE_LAST
+};
+
enum virDomainGraphicsAuthConnectedType {
VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DEFAULT = 0,
VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_FAIL,
@@ -1425,6 +1434,7 @@ struct _virDomainGraphicsDef {
char *keymap;
char *socket;
virDomainGraphicsAuthDef auth;
+ int sharePolicy;
} vnc;
struct {
char *display;
@@ -2525,6 +2535,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpicePlaybackCompression)
VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode)
VIR_ENUM_DECL(virDomainGraphicsSpiceClipboardCopypaste)
VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode)
+VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy)
VIR_ENUM_DECL(virDomainHyperv)
VIR_ENUM_DECL(virDomainRNGModel)
VIR_ENUM_DECL(virDomainRNGBackend)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cc734da..7aa20f7 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -202,6 +202,8 @@ virDomainGraphicsSpiceZlibCompressionTypeFromString;
virDomainGraphicsSpiceZlibCompressionTypeToString;
virDomainGraphicsTypeFromString;
virDomainGraphicsTypeToString;
+virDomainGraphicsVNCSharePolicyTypeFromString;
+virDomainGraphicsVNCSharePolicyTypeToString;
virDomainHasDiskMirror;
virDomainHostdevCapsTypeToString;
virDomainHostdevDefAlloc;
--
1.8.1.4
8 a.m.
New subject: [libvirt] [PATCH 3/3 v3] qemu: add ', share=<policy>' to qemu commandline
example: qemu ${otherargs} \
-vnc 127.0.0.1:0,share=allow-exclusive
---
src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++++++++
tests/qemuargv2xmltest.c | 1 +
tests/qemuxml2argvtest.c | 1 +
3 files changed, 38 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b95c07..a462153 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6098,6 +6098,19 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, ",websocket=%d",
graphics->data.vnc.websocket);
}
+ if (graphics->data.vnc.sharePolicy) {
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("vnc display sharing policy is not "
+ "supported with this QEMU"));
+ goto error;
+ }
+
+ virBufferAsprintf(&opt, ",share=%s",
+ virDomainGraphicsVNCSharePolicyTypeToString(
+ graphics->data.vnc.sharePolicy));
+ }
+
if (graphics->data.vnc.auth.passwd || cfg->vncPassword)
virBufferAddLit(&opt, ",password");
@@ -10013,6 +10026,29 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
vnc->data.vnc.websocket =
vnc->data.vnc.port + 5700;
}
+ } else if (STRPREFIX(opts, "share=")) {
+ char *sharePolicy = opts + strlen("share=");
+ if (sharePolicy && *sharePolicy) {
+ int policy =
+
virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy);
+
+ if (policy < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unknown vnc display sharing
policy '%s'"),
+ sharePolicy);
+ virDomainGraphicsDefFree(vnc);
+ VIR_FREE(orig_opts);
+ goto error;
+ } else {
+ vnc->data.vnc.sharePolicy = policy;
+ }
+ } else {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("missing vnc sharing
policy"));
+ virDomainGraphicsDefFree(vnc);
+ VIR_FREE(orig_opts);
+ goto error;
+ }
}
opts = nextopt;
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 58fabdb..652cd09 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -201,6 +201,7 @@ mymain(void)
DO_TEST("graphics-vnc");
DO_TEST("graphics-vnc-socket");
DO_TEST("graphics-vnc-websocket");
+ DO_TEST("graphics-vnc-policy");
DO_TEST("graphics-vnc-sasl");
DO_TEST("graphics-vnc-tls");
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c751440..e32f12d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -609,6 +609,7 @@ mymain(void)
DO_TEST("graphics-vnc", QEMU_CAPS_VNC);
DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC);
DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET);
+ DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_VNC_SHARE_POLICY);
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
--
1.8.1.4
7:49 a.m.
New subject: [libvirt] [PATCH 3/3 v3] qemu: add ', share=<policy>' to qemu commandline
On 05/16/2013 03:00 PM, Guannan Ren wrote:
example: qemu ${otherargs} \
-vnc 127.0.0.1:0,share=allow-exclusive
---
src/qemu/qemu_command.c | 36 ++++++++++++++++++++++++++++++++++++
tests/qemuargv2xmltest.c | 1 +
tests/qemuxml2argvtest.c | 1 +
You forgot to add the .args and .xml files.
3 files changed, 38 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b95c07..a462153 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6098,6 +6098,19 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, ",websocket=%d",
graphics->data.vnc.websocket);
}
+ if (graphics->data.vnc.sharePolicy) {
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("vnc display sharing policy is not "
+ "supported with this QEMU"));
+ goto error;
+ }
+
+ virBufferAsprintf(&opt, ",share=%s",
+ virDomainGraphicsVNCSharePolicyTypeToString(
+ graphics->data.vnc.sharePolicy));
+ }
+
if (graphics->data.vnc.auth.passwd || cfg->vncPassword)
virBufferAddLit(&opt, ",password");
@@ -10013,6 +10026,29 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
vnc->data.vnc.websocket =
vnc->data.vnc.port + 5700;
}
+ } else if (STRPREFIX(opts, "share=")) {
+ char *sharePolicy = opts + strlen("share=");
+ if (sharePolicy && *sharePolicy) {
sharePolicy is definitely non-NULL here.
+ int policy =
+
virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy);
+
+ if (policy < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unknown vnc display sharing
policy '%s'"),
+ sharePolicy);
+ virDomainGraphicsDefFree(vnc);
+ VIR_FREE(orig_opts);
+ goto error;
+ } else {
+ vnc->data.vnc.sharePolicy = policy;
+ }
+ } else {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
missing "%s" breaks syntax-check
+ _("missing vnc
sharing policy"));
+ virDomainGraphicsDefFree(vnc);
+ VIR_FREE(orig_opts);
+ goto error;
+ }
}
opts = nextopt;
Jan
4203
days inactive
4208
days old
4 comments
2 participants
participants (2)
-
Guannan Ren -
Ján Tomko