[libvirt] [PATCH 1/2] build: remove some dead assignments

Laine Stump laine at laine.org
Wed May 11 16:25:10 UTC 2011


On 05/04/2011 07:37 PM, Eric Blake wrote:
> No syntactic effect; this merely silences some clang warnings.
>
> * src/libxl/libxl_driver.c (libxlDomainSetVcpusFlags): Drop
> redundant ret=0 statement.
> * src/qemu/qemu_monitor_text.c (qemuMonitorTextDriveDel):
> Likewise.
> ---
>
> More clang fallout, found by switching over to rawhide.
>
>   src/libxl/libxl_driver.c     |    1 -
>   src/qemu/qemu_monitor_text.c |    1 -
>   2 files changed, 0 insertions(+), 2 deletions(-)

ACK.


> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
> index dec4f43..5355b57 100644
> --- a/src/libxl/libxl_driver.c
> +++ b/src/libxl/libxl_driver.c
> @@ -1659,7 +1659,6 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
>           def->maxvcpus = nvcpus;
>           if (nvcpus<  def->vcpus)
>               def->vcpus = nvcpus;
> -        ret = 0;
>           break;
>
>       case VIR_DOMAIN_VCPU_CONFIG:
> diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
> index 53781c8..7ace95f 100644
> --- a/src/qemu/qemu_monitor_text.c
> +++ b/src/qemu/qemu_monitor_text.c
> @@ -2396,7 +2396,6 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon,
>       } else if (STRPREFIX(reply, "Device '")&&  (strstr(reply, "not found"))) {
>           /* NB: device not found errors mean the drive was auto-deleted and we
>            * ignore the error */
> -        ret = 0;
>       } else if (STRNEQ(reply, "")) {
>           qemuReportError(VIR_ERR_OPERATION_FAILED,
>                           _("deleting %s drive failed: %s"), drivestr, reply);




More information about the libvir-list mailing list