[libvirt] [PATCH 2/2] qemu: Don't blindly assume VNC is supported

[Eric Blake]

On 10/22/2012 03:33 AM, Osier Yang wrote:
> On 2012年10月20日 03:40, Doug Goldstein wrote:
>> Currently its assumed that qemu always supports VNC, however it is
> 
> s/its/it's/
> 
>> definitely possible to compile qemu without VNC support so we should at
>> the very least check for it and handle that correctly.
>> ---

>> +++ b/src/qemu/qemu_capabilities.h
>> @@ -150,6 +150,7 @@ enum qemuCapsFlags {
>>       QEMU_CAPS_REBOOT_TIMEOUT     = 110, /* -boot reboot-timeout */
>>       QEMU_CAPS_DUMP_GUEST_CORE    = 111, /* dump-guest-core-parameter */
>>       QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for
>> SPICE */
>> +    QEMU_CAPS_VNC                = 113, /* Is -vnc avail */
> 
> To keep consistent, better to use "available?".

Also, this will have a merge conflict with my block-commit stuff, but
you should be able to resolve that.

>> +        if (!qemuCapsGet(caps, QEMU_CAPS_VNC)) {
>> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
>> +                           _("vnc graphics are not supported with
>> this QEMU"));
> 
> I'd reword it like:
> 
> "vnc graphic is not supported by this QEMU". Plural is no need here.

Actually, this is one case where the trailing 's' IS needed; we use the
term 'graphics' and not 'graphic' because the display is a sequence of
ever-changing images, and not a static image.  Besides, our XML uses
<graphics>.  Keep the term 'graphics'.

> 
> The rest looks just fine, ACK with the changes.
> 

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20121022/ada7f9a0/attachment-0001.sig>