[libvirt] [PATCH 2/4] qemu: Remove explicit VNC XML cleanup

Eric Blake eblake at redhat.com
Tue May 18 15:35:18 UTC 2010


On 05/17/2010 11:17 AM, Cole Robinson wrote:
> This only exists for a certain cleanup path in StartVMDaemon, but is
> unneeded since domain_conf.c handles this for us automatically.
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  src/qemu/qemu_driver.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 80f96b7..61aacfb 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -3581,10 +3581,6 @@ cleanup:
>          driver->securityDriver->domainReleaseSecurityLabel)
>          driver->securityDriver->domainReleaseSecurityLabel(vm);
>      qemuRemoveCgroup(driver, vm, 1);
> -    if ((vm->def->ngraphics == 1) &&
> -        vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
> -        vm->def->graphics[0]->data.vnc.autoport)
> -        vm->def->graphics[0]->data.vnc.port = -1;
>      if (logfile != -1)
>          close(logfile);
>      vm->def->id = -1;

ACK, after I read virDomainGraphicsDefParseXML to verify your claim.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

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


More information about the libvir-list mailing list