[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] Fix modifying disk devices in qemu driver



Am Mittwoch 18 Mai 2011 09:22:43 schrieb Markus Groß:
> v2:
> - free dev before using it again.
> 
> When modifying the disk devices of a live domain and the domain
> configuration, the function qemuDomainAttachDeviceConfig
> first sets dev->data->disk to NULL. Later qemuDomainAttachDeviceLive
> accesses dev->data.disk and causes a segfault.
> ---
>  src/qemu/qemu_driver.c |   16 ++++++++++++----
>  1 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index fdb3b30..ee06c73 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -4408,12 +4408,13 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
>                           "%s", _("cannot modify device on transient domain"));
>           goto endjob;
>      }
> -    dev = virDomainDeviceDefParse(driver->caps, vm->def, xml,
> -                                  VIR_DOMAIN_XML_INACTIVE);
> -    if (dev == NULL)
> -        goto endjob;
>  
>      if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
> +        dev = virDomainDeviceDefParse(driver->caps, vm->def, xml,
> +                                      VIR_DOMAIN_XML_INACTIVE);
> +        if (dev == NULL)
> +            goto endjob;
> +
>          /* Make a copy for updated domain. */
>          vmdef = virDomainObjCopyPersistentDef(driver->caps, vm);
>          if (!vmdef)
> @@ -4437,6 +4438,13 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
>          ret = 0;
>  
>      if (!ret && (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE)) {
> +        /* If dev exists it was created to modify the domain config. Free it, */

s/,/./

> +        virDomainDeviceDefFree(dev);
> +        dev = virDomainDeviceDefParse(driver->caps, vm->def, xml,
> +                                      VIR_DOMAIN_XML_INACTIVE);
> +        if (dev == NULL)
> +            goto endjob;
> +
>          switch (action) {
>          case QEMU_DEVICE_ATTACH:
>              ret = qemuDomainAttachDeviceLive(vm, dev, dom);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]