From nobody Thu May 2 07:28:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603295116; cv=none; d=zohomail.com; s=zohoarc; b=aIFxkrswFn5WCKbRxNnfgG1mxE25T8f4rCM59128x3YF+DvGvlY0hOtV1lCNIcGLVx6XM6FoR1FdW+l/YgW4/KqmdKLNp/MGgO0mI4blV0ov+KCMDdZPvZQ275NlWphm9M1mVPhNQnbUNSPNAjDBvUf9cDfdf4aMh8h2eoR+HoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603295116; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=31YE3rhYUQLqB2JphuSGXn6J9HQPBQcvxlW7oI2XSY0=; b=JJNZ/oyUcxadiVUMB/75CRYRIKwIIxB9LglrPsxDZvAH1Y9UjhBffkaNlCNxNLNBFXVDwKY1N7gQ7DZubv3zY2iHEsIebgSRsAfGJUWf3qhpeI0vqMxO0ubvZArLVz2ZnyxE+A6GEnJ3wrPcSimX1pgRNy69Bckrfsdh2kH2pF0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603295116253598.2460229471758; Wed, 21 Oct 2020 08:45:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-5JTP4JssMd2VjcCyDTsMRA-1; Wed, 21 Oct 2020 11:45:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EFCFA804B6E; Wed, 21 Oct 2020 15:45:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B49E27CD5; Wed, 21 Oct 2020 15:45:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 57AA3181A06C; Wed, 21 Oct 2020 15:45:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09LFix3W032096 for ; Wed, 21 Oct 2020 11:44:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 73F815C26A; Wed, 21 Oct 2020 15:44:59 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9AA25C269 for ; Wed, 21 Oct 2020 15:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603295115; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=31YE3rhYUQLqB2JphuSGXn6J9HQPBQcvxlW7oI2XSY0=; b=Cq7B0tMLpSyoMvH6W2Cy8Uy5Y0PmIumhz2hfXowQS5gwzJ+WB2PM98k6/oYpS5V3LUcyBq YQjWRDMohVk7JpUehEsiKU7qw0n1SDRsoauIc8h2DRlr6rTgfi5QuKLrXhMNhMUdE2Ziyb RY7ANburlWc3/YYAmuAZV4IO6S6BfPU= X-MC-Unique: 5JTP4JssMd2VjcCyDTsMRA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/4] hyperv: Don't overwrite errors from hypervCreateInvokeParamsList() Date: Wed, 21 Oct 2020 17:44:50 +0200 Message-Id: <17013e8bfde0c7842b7f4cedc9af8555996a6cab.1603295018.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The hypervCreateInvokeParamsList() function sets an error on a failure, therefore there is no need to report another error in callers. Signed-off-by: Michal Privoznik Reviewed-by: Neal Gompa --- src/hyperv/hyperv_driver.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d938c223dc..4b198f5b95 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1004,6 +1004,8 @@ hypervDomainShutdownFlags(virDomainPtr domain, unsign= ed int flags) =20 params =3D hypervCreateInvokeParamsList(priv, "InitiateShutdown", sele= ctor, Msvm_ShutdownComponent_WmiInfo); + if (!params) + goto cleanup; =20 hypervAddSimpleParam(params, "Force", "False"); =20 @@ -1484,10 +1486,8 @@ hypervDomainSetAutostart(virDomainPtr domain, int au= tostart) MSVM_VIRTUALSYSTEMMANAGEMENTSERV= ICE_SELECTOR, Msvm_VirtualSystemManagementServ= ice_WmiInfo); =20 - if (!params) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create p= arams")); + if (!params) goto cleanup; - } =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) { virBufferEscapeSQL(&eprQuery, @@ -1915,12 +1915,10 @@ hypervDomainSendKey(virDomainPtr domain, unsigned i= nt codeset, g_snprintf(keycodeStr, sizeof(keycodeStr), "%d", translatedKeycode= s[i]); =20 params =3D hypervCreateInvokeParamsList(priv, "PressKey", selector, - Msvm_Keyboard_WmiInfo); + Msvm_Keyboard_WmiInfo); =20 - if (!params) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not crea= te param")); + if (!params) goto cleanup; - } =20 if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) goto cleanup; @@ -1940,12 +1938,10 @@ hypervDomainSendKey(virDomainPtr domain, unsigned i= nt codeset, for (i =3D 0; i < nkeycodes; i++) { g_snprintf(keycodeStr, sizeof(keycodeStr), "%d", translatedKeycode= s[i]); params =3D hypervCreateInvokeParamsList(priv, "ReleaseKey", select= or, - Msvm_Keyboard_WmiInfo); + Msvm_Keyboard_WmiInfo); =20 - if (!params) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not crea= te param")); + if (!params) goto cleanup; - } =20 if (hypervAddSimpleParam(params, "keyCode", keycodeStr) < 0) goto cleanup; @@ -1998,13 +1994,11 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, uns= igned long memory, =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) { params =3D hypervCreateInvokeParamsList(priv, "ModifyVirtualSystem= Resources", - MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR, - Msvm_VirtualSystemManagementService_WmiInfo); + MSVM_VIRTUALSYSTEMMANAGEMENT= SERVICE_SELECTOR, + Msvm_VirtualSystemManagement= Service_WmiInfo); =20 - if (!params) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not crea= te params")); + if (!params) goto cleanup; - } =20 virBufferAddLit(&eprQuery, MSVM_COMPUTERSYSTEM_WQL_SELECT); virBufferEscapeSQL(&eprQuery, "where Name =3D \"%s\"", uuid_string= ); @@ -2014,13 +2008,11 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, uns= igned long memory, goto cleanup; } else if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V2) { params =3D hypervCreateInvokeParamsList(priv, "ModifyResourceSetti= ngs", - MSVM_VIRTUALSYSTEMMANAGEMENTSERVICE_SELECTOR, - Msvm_VirtualSystemManagementService_WmiInfo); + MSVM_VIRTUALSYSTEMMANAGEMENT= SERVICE_SELECTOR, + Msvm_VirtualSystemManagement= Service_WmiInfo); =20 - if (!params) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not crea= te params")); + if (!params) goto cleanup; - } } =20 memResource =3D hypervCreateEmbeddedParam(priv, Msvm_MemorySettingData= _WmiInfo); --=20 2.26.2 From nobody Thu May 2 07:28:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603295167; cv=none; d=zohomail.com; s=zohoarc; b=SvlWHOL8rEzgJm4EBvGstMmEhH0B7LOeeh7/iXSTDt88qDVV7OWfqL3QQ271xKFXy0MTAikPDlRrsBYVbzDqcGhwmu2EpoEYIQzLmgapBgiqf/TtLbxt/1/LC+b2zV50XK1wceX2dwNmx5aWr3XauFYEruminrI4oDlwNFOoPaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603295167; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U0plIM1/OJAa+dTCn2YFUTyLeCoVCZMOBdG5++pED4k=; b=gRuqSyUUDHPooKBaywTD5gw6XOhfkitmebCTGAEO3bTAOsINikPzni2Ps7T31u9FyMtbc2p0HYTrEq2AqSZcnuV2e3zueP5WriNO2KYfwLVeLOIYLPYi4/a5fDOB/9gqcAL/43gaaAl7EltQX7EA7wJgPmzBXNsG+P3V1Mq/pto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603295167195738.7522457242104; Wed, 21 Oct 2020 08:46:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-DdhjOvezP1qK6SxkF-C9Mw-1; Wed, 21 Oct 2020 11:45:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAA12AD746; Wed, 21 Oct 2020 15:45:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3290A1002C0C; Wed, 21 Oct 2020 15:45:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB953922E1; Wed, 21 Oct 2020 15:45:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09LFj09X032103 for ; Wed, 21 Oct 2020 11:45:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 519A55C26A; Wed, 21 Oct 2020 15:45:00 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id C78E55C269 for ; Wed, 21 Oct 2020 15:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603295166; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=U0plIM1/OJAa+dTCn2YFUTyLeCoVCZMOBdG5++pED4k=; b=Jnf7C+vJd3Hbjnb8qmvWn2bpbM69f+El4wmLDvYFTFhDuM10orDOf5QgZiqAhkAuWYDkD/ OUqMEzqIACF3916WCxUB6+qD9hJG2lYrXo8p5dtKStEjgRsi8HXolylRShFkZhsJB1L2VA 5WS9HFCOPzes6DWO+/yVhoJ9V0AB+1A= X-MC-Unique: DdhjOvezP1qK6SxkF-C9Mw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/4] hyperv: Use hypervRequestStateChange() in hypervDomainSuspend() Date: Wed, 21 Oct 2020 17:44:51 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" A few commits ago, hypervRequestStateChange() helper was introduced which has exactly the same code as a part of hypervDomainSuspend(). Deduplicate by calling the helper. Signed-off-by: Michal Privoznik Reviewed-by: Neal Gompa --- src/hyperv/hyperv_driver.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 4b198f5b95..d08b6cff2e 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -893,9 +893,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char= *name) static int hypervDomainSuspend(virDomainPtr domain) { - int result =3D -1; hypervPrivate *priv =3D domain->conn->privateData; - Msvm_ComputerSystem *computerSystem =3D NULL; int requestedState =3D -1; =20 switch (priv->wmiVersion) { @@ -907,20 +905,7 @@ hypervDomainSuspend(virDomainPtr domain) break; } =20 - if (hypervMsvmComputerSystemFromDomain(domain, &computerSystem) < 0) - goto cleanup; - - if (computerSystem->data.common->EnabledState !=3D MSVM_COMPUTERSYSTEM= _ENABLEDSTATE_ENABLED) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not a= ctive")); - goto cleanup; - } - - result =3D hypervInvokeMsvmComputerSystemRequestStateChange(domain, re= questedState); - - cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); - - return result; + return hypervRequestStateChange(domain, requestedState); } =20 =20 --=20 2.26.2 From nobody Thu May 2 07:28:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603295170; cv=none; d=zohomail.com; s=zohoarc; b=nzWZs/PkHUbbEx0jm4GQeJ7WCXaMj5t1uvIx30qs2QEVa/jahg+dLrZAWhHFiL+0Chzk2iy5Wlin+GXi1aT1CAfPzsx1weR7+NiEri3d8kP3ClMCB82uLeejjeGbKApkPDvqIvRKIZ3nu5y+sr4v2lIa6Zmn9oYgsBe5okk6m10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603295170; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZjzFmTIW9Ghm3NP690w1+MLIwdsB+z/Y1hQr2zzcRYM=; b=YCLSZQYarGysaZRz6ZNqc0Nmac+YojSg2xmmq/Bkj22InikImzXl7GA0ztzOpdpA3JeTx4yglrYk6VoF0avpAW8PwWWOzu9GLTKsC0EhwzPUCgYp5setING3MnUDUtOgILwgEsds4zbU5BcpfUgFfsIHXJx0ntGvQuFV2k7PL4Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603295170339402.4622000099646; Wed, 21 Oct 2020 08:46:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-522-79IR6a1rPS-crWhgH7jgRA-1; Wed, 21 Oct 2020 11:45:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10D14AD766; Wed, 21 Oct 2020 15:45:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2EC975123; Wed, 21 Oct 2020 15:45:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ABC8A922E9; Wed, 21 Oct 2020 15:45:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09LFj196032115 for ; Wed, 21 Oct 2020 11:45:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 572335C26A; Wed, 21 Oct 2020 15:45:01 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3F475C269 for ; Wed, 21 Oct 2020 15:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603295169; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZjzFmTIW9Ghm3NP690w1+MLIwdsB+z/Y1hQr2zzcRYM=; b=RYt7guhna4/QghoFVqoHXf/NnfZQ8FXj0KIQtEo36F+xh+8kGAaCn5cwe3h8upsgJU0d+j 8e2IHR0VMbi3aEro2ONqbBndWnEYQiYazksDGwiAk6Pdv7qsg5lqNlP6u4rPPwLzqGJC+G D/JTLu/JcaSZCkuQ38IGIisImeQu7GY= X-MC-Unique: 79IR6a1rPS-crWhgH7jgRA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/4] hyperv: Use two empty lines between functions Date: Wed, 21 Oct 2020 17:44:52 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In some places we separate functions with only one line, in others with three lines and the rest uses two lines. Signed-off-by: Michal Privoznik Reviewed-by: Neal Gompa --- src/hyperv/hyperv_driver.c | 50 +++++++++----------------------------- src/hyperv/hyperv_util.c | 1 - src/hyperv/hyperv_wmi.c | 20 +++++++++++++-- 3 files changed, 30 insertions(+), 41 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d08b6cff2e..b8cd213758 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -86,6 +86,7 @@ hypervGetProcessorsByName(hypervPrivate *priv, const char= *name, return 0; } =20 + static int hypervGetActiveVirtualSystemList(hypervPrivate *priv, Msvm_ComputerSystem **computerSystemList) @@ -106,6 +107,7 @@ hypervGetActiveVirtualSystemList(hypervPrivate *priv, return 0; } =20 + /* gets all the vms including the ones that are marked inactive. */ static int hypervGetInactiveVirtualSystemList(hypervPrivate *priv, @@ -127,6 +129,7 @@ hypervGetInactiveVirtualSystemList(hypervPrivate *priv, return 0; } =20 + static int hypervGetPhysicalSystemList(hypervPrivate *priv, Win32_ComputerSystem **computerSystemList) @@ -145,6 +148,7 @@ hypervGetPhysicalSystemList(hypervPrivate *priv, return 0; } =20 + static int hypervGetVirtualSystemByID(hypervPrivate *priv, int id, Msvm_ComputerSystem **computerSystemList) @@ -167,6 +171,7 @@ hypervGetVirtualSystemByID(hypervPrivate *priv, int id, return 0; } =20 + static int hypervGetVirtualSystemByUUID(hypervPrivate *priv, const char *uuid, Msvm_ComputerSystem **computerSystemList) @@ -214,6 +219,7 @@ hypervGetVirtualSystemByName(hypervPrivate *priv, const= char *name, return 0; } =20 + static int hypervGetVSSDFromUUID(hypervPrivate *priv, const char *uuid, Msvm_VirtualSystemSettingData **data) @@ -238,6 +244,7 @@ hypervGetVSSDFromUUID(hypervPrivate *priv, const char *= uuid, return 0; } =20 + static int hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv, const char *id, Msvm_ProcessorSettingData **data) @@ -262,6 +269,7 @@ hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv, co= nst char *id, return 0; } =20 + static int hypervGetMemSDByVSSDInstanceId(hypervPrivate *priv, const char *id, Msvm_MemorySettingData **data) @@ -333,6 +341,7 @@ hypervParseVersionString(const char *str, unsigned int = *major, return 0; } =20 + static int hypervLookupHostSystemBiosUuid(hypervPrivate *priv, unsigned char *uuid) { @@ -358,6 +367,7 @@ hypervLookupHostSystemBiosUuid(hypervPrivate *priv, uns= igned char *uuid) return result; } =20 + static virCapsPtr hypervCapsInit(hypervPrivate *priv) { @@ -397,8 +407,6 @@ hypervCapsInit(hypervPrivate *priv) return NULL; } =20 - - /* * Driver functions */ @@ -419,6 +427,7 @@ hypervFreePrivate(hypervPrivate **priv) VIR_FREE(*priv); } =20 + static int hypervInitConnection(virConnectPtr conn, hypervPrivate *priv, char *username, char *password) @@ -478,6 +487,7 @@ hypervInitConnection(virConnectPtr conn, hypervPrivate = *priv, return ret; } =20 + static virDrvOpenStatus hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, virConfPtr conf G_GNUC_UNUSED, @@ -543,7 +553,6 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr= auth, } =20 =20 - static int hypervConnectClose(virConnectPtr conn) { @@ -557,7 +566,6 @@ hypervConnectClose(virConnectPtr conn) } =20 =20 - static const char * hypervConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { @@ -565,7 +573,6 @@ hypervConnectGetType(virConnectPtr conn G_GNUC_UNUSED) } =20 =20 - static int hypervConnectGetVersion(virConnectPtr conn, unsigned long *version) { @@ -628,7 +635,6 @@ hypervConnectGetVersion(virConnectPtr conn, unsigned lo= ng *version) } =20 =20 - static char * hypervConnectGetHostname(virConnectPtr conn) { @@ -648,7 +654,6 @@ hypervConnectGetHostname(virConnectPtr conn) } =20 =20 - static char* hypervConnectGetCapabilities(virConnectPtr conn) { @@ -658,7 +663,6 @@ hypervConnectGetCapabilities(virConnectPtr conn) } =20 =20 - static int hypervConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSE= D) { @@ -691,7 +695,6 @@ hypervConnectGetMaxVcpus(virConnectPtr conn, const char= *type G_GNUC_UNUSED) } =20 =20 - static int hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) { @@ -766,7 +769,6 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr in= fo) } =20 =20 - static int hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids) { @@ -799,7 +801,6 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, = int maxids) } =20 =20 - static int hypervConnectNumOfDomains(virConnectPtr conn) { @@ -826,7 +827,6 @@ hypervConnectNumOfDomains(virConnectPtr conn) } =20 =20 - static virDomainPtr hypervDomainLookupByID(virConnectPtr conn, int id) { @@ -846,7 +846,6 @@ hypervDomainLookupByID(virConnectPtr conn, int id) } =20 =20 - static virDomainPtr hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { @@ -869,7 +868,6 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsi= gned char *uuid) } =20 =20 - static virDomainPtr hypervDomainLookupByName(virConnectPtr conn, const char *name) { @@ -889,7 +887,6 @@ hypervDomainLookupByName(virConnectPtr conn, const char= *name) } =20 =20 - static int hypervDomainSuspend(virDomainPtr domain) { @@ -909,7 +906,6 @@ hypervDomainSuspend(virDomainPtr domain) } =20 =20 - static int hypervDomainResume(virDomainPtr domain) { @@ -1019,7 +1015,6 @@ hypervDomainShutdown(virDomainPtr domain) } =20 =20 - static int hypervDomainReboot(virDomainPtr domain, unsigned int flags) { @@ -1028,7 +1023,6 @@ hypervDomainReboot(virDomainPtr domain, unsigned int = flags) } =20 =20 - static int hypervDomainReset(virDomainPtr domain, unsigned int flags) { @@ -1037,7 +1031,6 @@ hypervDomainReset(virDomainPtr domain, unsigned int f= lags) } =20 =20 - static int hypervDomainDestroyFlags(virDomainPtr domain, unsigned int flags) { @@ -1068,7 +1061,6 @@ hypervDomainDestroyFlags(virDomainPtr domain, unsigne= d int flags) } =20 =20 - static int hypervDomainDestroy(virDomainPtr domain) { @@ -1076,7 +1068,6 @@ hypervDomainDestroy(virDomainPtr domain) } =20 =20 - static char * hypervDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { @@ -1087,7 +1078,6 @@ hypervDomainGetOSType(virDomainPtr domain G_GNUC_UNUS= ED) } =20 =20 - static int hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { @@ -1143,7 +1133,6 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInf= oPtr info) } =20 =20 - static int hypervDomainGetState(virDomainPtr domain, int *state, int *reason, unsigned int flags) @@ -1171,7 +1160,6 @@ hypervDomainGetState(virDomainPtr domain, int *state,= int *reason, } =20 =20 - static char * hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { @@ -1284,7 +1272,6 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned = int flags) } =20 =20 - static int hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, in= t maxnames) { @@ -1327,7 +1314,6 @@ hypervConnectListDefinedDomains(virConnectPtr conn, c= har **const names, int maxn } =20 =20 - static int hypervConnectNumOfDefinedDomains(virConnectPtr conn) { @@ -1354,7 +1340,6 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn) } =20 =20 - static int hypervDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { @@ -1383,7 +1368,6 @@ hypervDomainCreateWithFlags(virDomainPtr domain, unsi= gned int flags) } =20 =20 - static int hypervDomainCreate(virDomainPtr domain) { @@ -1391,7 +1375,6 @@ hypervDomainCreate(virDomainPtr domain) } =20 =20 - static int hypervDomainGetAutostart(virDomainPtr domain, int *autostart) { @@ -1549,7 +1532,6 @@ hypervConnectIsEncrypted(virConnectPtr conn) } =20 =20 - static int hypervConnectIsSecure(virConnectPtr conn) { @@ -1563,7 +1545,6 @@ hypervConnectIsSecure(virConnectPtr conn) } =20 =20 - static int hypervConnectIsAlive(virConnectPtr conn) { @@ -1580,7 +1561,6 @@ hypervConnectIsAlive(virConnectPtr conn) } =20 =20 - static int hypervDomainIsActive(virDomainPtr domain) { @@ -1600,7 +1580,6 @@ hypervDomainIsActive(virDomainPtr domain) } =20 =20 - static int hypervDomainIsPersistent(virDomainPtr domain G_GNUC_UNUSED) { @@ -1609,7 +1588,6 @@ hypervDomainIsPersistent(virDomainPtr domain G_GNUC_U= NUSED) } =20 =20 - static int hypervDomainIsUpdated(virDomainPtr domain G_GNUC_UNUSED) { @@ -1617,7 +1595,6 @@ hypervDomainIsUpdated(virDomainPtr domain G_GNUC_UNUS= ED) } =20 =20 - static int hypervDomainManagedSave(virDomainPtr domain, unsigned int flags) { @@ -1657,7 +1634,6 @@ hypervDomainManagedSave(virDomainPtr domain, unsigned= int flags) } =20 =20 - static int hypervDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) { @@ -1680,7 +1656,6 @@ hypervDomainHasManagedSaveImage(virDomainPtr domain, = unsigned int flags) } =20 =20 - static int hypervDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) { @@ -2099,7 +2074,6 @@ static virHypervisorDriver hypervHypervisorDriver =3D= { }; =20 =20 - static void hypervDebugHandler(const char *message, debug_level_e level, void *user_data G_GNUC_UNUSED) diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 56c9e8bebd..d8a6e6cf5c 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -82,7 +82,6 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) } =20 =20 - void hypervFreeParsedUri(hypervParsedUri **parsedUri) { diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 29447b8f0f..8c30370a7b 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -85,6 +85,7 @@ hypervGetWmiClassInfo(hypervPrivate *priv, hypervWmiClass= InfoListPtr list, return -1; } =20 + int hypervGetWmiClassList(hypervPrivate *priv, hypervWmiClassInfoListPtr wmiIn= fo, virBufferPtr query, hypervObject **wmiClass) @@ -97,6 +98,7 @@ hypervGetWmiClassList(hypervPrivate *priv, hypervWmiClass= InfoListPtr wmiInfo, return hypervEnumAndPull(priv, &wqlQuery, wmiClass); } =20 + int hypervVerifyResponse(WsManClient *client, WsXmlDocH response, const char *detail) @@ -192,6 +194,7 @@ hypervCreateInvokeParamsList(hypervPrivate *priv, const= char *method, return params; } =20 + /* * hypervFreeInvokeParams: * @params: Params object to be freed @@ -228,6 +231,7 @@ hypervFreeInvokeParams(hypervInvokeParamsListPtr params) VIR_FREE(params); } =20 + static inline int hypervCheckParams(hypervInvokeParamsListPtr params) { @@ -239,6 +243,7 @@ hypervCheckParams(hypervInvokeParamsListPtr params) return 0; } =20 + /* * hypervAddSimpleParam: * @params: Params object to add to @@ -270,6 +275,7 @@ hypervAddSimpleParam(hypervInvokeParamsListPtr params, = const char *name, return 0; } =20 + /* * hypervAddEprParam: * @params: Params object to add to @@ -302,6 +308,7 @@ hypervAddEprParam(hypervInvokeParamsListPtr params, con= st char *name, return 0; } =20 + /* * hypervCreateEmbeddedParam: * @priv: hypervPrivate object associated with the connection @@ -368,6 +375,7 @@ hypervSetEmbeddedProperty(virHashTablePtr table, return virHashUpdateEntry(table, name, (void*) value); } =20 + /* * hypervAddEmbeddedParam: * @params: Params list to add to @@ -410,6 +418,7 @@ hypervAddEmbeddedParam(hypervInvokeParamsListPtr params, return 0; } =20 + /* * hypervFreeEmbeddedParam: * @param: Pointer to embedded param to free @@ -422,10 +431,10 @@ hypervFreeEmbeddedParam(virHashTablePtr p) virHashFree(p); } =20 + /* * Serializing parameters to XML and invoking methods */ - static int hypervGetCimTypeInfo(hypervCimTypePtr typemap, const char *name, hypervCimTypePtr *property) @@ -480,6 +489,7 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr para= ms, WsXmlDocH *docRoot) return result; } =20 + static int hypervSerializeSimpleParam(hypervParamPtr p, const char *resourceUri, WsXmlNodeH *methodNode) @@ -497,6 +507,7 @@ hypervSerializeSimpleParam(hypervParamPtr p, const char= *resourceUri, return 0; } =20 + static int hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, const char *resourceUri, WsXmlNodeH *methodNode) @@ -620,6 +631,7 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate= *priv, return result; } =20 + static int hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, WsXmlNodeH *methodNode) @@ -1124,6 +1136,7 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQuery= Ptr wqlQuery, return result; } =20 + void hypervFreeObject(hypervPrivate *priv G_GNUC_UNUSED, hypervObject *object) { @@ -1236,7 +1249,6 @@ hypervReturnCodeToString(int returnCode) } =20 =20 - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *= * * * Msvm_ComputerSystem */ @@ -1385,6 +1397,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virD= omainPtr domain, return result; } =20 + int hypervMsvmComputerSystemEnabledStateToDomainState (Msvm_ComputerSystem *computerSystem) @@ -1422,6 +1435,7 @@ hypervMsvmComputerSystemEnabledStateToDomainState } } =20 + bool hypervIsMsvmComputerSystemActive(Msvm_ComputerSystem *computerSystem, bool *in_transition) @@ -1461,6 +1475,7 @@ hypervIsMsvmComputerSystemActive(Msvm_ComputerSystem = *computerSystem, } } =20 + int hypervMsvmComputerSystemToDomain(virConnectPtr conn, Msvm_ComputerSystem *computerSystem, @@ -1489,6 +1504,7 @@ hypervMsvmComputerSystemToDomain(virConnectPtr conn, return *domain ? 0 : -1; } =20 + int hypervMsvmComputerSystemFromDomain(virDomainPtr domain, Msvm_ComputerSystem **computerSystem) --=20 2.26.2 From nobody Thu May 2 07:28:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603295134; cv=none; d=zohomail.com; s=zohoarc; b=eUsM4Q3xIe2Xrt3dpL4TcZN50SgoHcbXPVSLWJyDL4IxdAnj4lPkMEEAKZW8nqUA6+kvElnCXkXPykTupjVceioVgRXmLwQXdts9uQP9R4Ytm5ylodarTlIVxODAu9QfMWbxfylCIXHYlg6cYOF9ar1SpSCBtNrhRTgrOIQtC0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603295134; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0mqdDvfAQ8y/tH0/Cl8iP51CpQOkFQxKV0OANmEUTM8=; b=Ii97C+Fa1EKhghTnVX7LK4ixt2+a0fx5WdfJFsbFgYjlsQWo8d2TDDD7k967zHbgLlwyy1i4WD5+QghQFq5mcYOSeZxnRu4Zl2UY4o8AgutH1iotH+CUbD7cRc8sxqT2XrrlDpcOFBsCTZ6ZoaWQbdGFtUaNFrq7MPrnTXh3QMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603295134325481.9044840498045; Wed, 21 Oct 2020 08:45:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-ZkfEPwZFPnO67mfJYdgQ-Q-1; Wed, 21 Oct 2020 11:45:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB437835BAE; Wed, 21 Oct 2020 15:45:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C32325D9F7; Wed, 21 Oct 2020 15:45:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 88307922E8; Wed, 21 Oct 2020 15:45:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09LFj5pb032141 for ; Wed, 21 Oct 2020 11:45:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id B04F85C26B; Wed, 21 Oct 2020 15:45:05 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06DA35C26A for ; Wed, 21 Oct 2020 15:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603295133; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0mqdDvfAQ8y/tH0/Cl8iP51CpQOkFQxKV0OANmEUTM8=; b=YZR+mFoS+5nR3HZaByd79lqgRooxk3GezONClqjxOTT1JAPJC+MC+sDMEr+pf8YbqgdAFW Nb9MjjV3hPgNU4ttSrBdndj890ezl1jxOSTI1HmBMi+wgfA4b+d4NOpneJDRSjWYXnN061 lgEO7++FplVUGl1iZanTY9t78ZA+bCU= X-MC-Unique: ZkfEPwZFPnO67mfJYdgQ-Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/4] hyperv: Reformat Date: Wed, 21 Oct 2020 17:44:53 +0200 Message-Id: <95f20deae8c9853bdc89bdb43ead7da1d55f0c28.1603295018.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This is mostly opening hyperv driver sources in vim, selecting everything, hitting reformat and then fixing a very few places. Signed-off-by: Michal Privoznik Reviewed-by: Neal Gompa --- src/hyperv/hyperv_driver.c | 85 ++++++------ src/hyperv/hyperv_wmi.c | 268 ++++++++++++++++++------------------- src/hyperv/hyperv_wmi.h | 15 ++- 3 files changed, 185 insertions(+), 183 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index b8cd213758..002434c56a 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -932,8 +932,8 @@ hypervDomainResume(virDomainPtr domain) goto cleanup; } =20 - result =3D hypervInvokeMsvmComputerSystemRequestStateChange - (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); + result =3D hypervInvokeMsvmComputerSystemRequestStateChange(domain, + MSVM_COMPUTE= RSYSTEM_REQUESTEDSTATE_ENABLED); =20 cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); @@ -1051,8 +1051,8 @@ hypervDomainDestroyFlags(virDomainPtr domain, unsigne= d int flags) goto cleanup; } =20 - result =3D hypervInvokeMsvmComputerSystemRequestStateChange - (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); + result =3D hypervInvokeMsvmComputerSystemRequestStateChange(domain, + MSVM_COMPUTE= RSYSTEM_REQUESTEDSTATE_DISABLED); =20 cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); @@ -1103,14 +1103,14 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainI= nfoPtr info) } =20 if (hypervGetProcSDByVSSDInstanceId(priv, - virtualSystemSettingData->data.common->Instanc= eID, - &processorSettingData) < 0) { + virtualSystemSettingData->data.com= mon->InstanceID, + &processorSettingData) < 0) { goto cleanup; } =20 if (hypervGetMemSDByVSSDInstanceId(priv, - virtualSystemSettingData->data.common->Instance= ID, - &memorySettingData) < 0) { + virtualSystemSettingData->data.comm= on->InstanceID, + &memorySettingData) < 0) { goto cleanup; } =20 @@ -1189,14 +1189,14 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigne= d int flags) } =20 if (hypervGetProcSDByVSSDInstanceId(priv, - virtualSystemSettingData->data.common->Instance= ID, - &processorSettingData) < 0) { + virtualSystemSettingData->data.com= mon->InstanceID, + &processorSettingData) < 0) { goto cleanup; } =20 if (hypervGetMemSDByVSSDInstanceId(priv, - virtualSystemSettingData->data.common->Instance= ID, - &memorySettingData) < 0) { + virtualSystemSettingData->data.comm= on->InstanceID, + &memorySettingData) < 0) { goto cleanup; } =20 @@ -1358,8 +1358,8 @@ hypervDomainCreateWithFlags(virDomainPtr domain, unsi= gned int flags) goto cleanup; } =20 - result =3D hypervInvokeMsvmComputerSystemRequestStateChange - (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); + result =3D hypervInvokeMsvmComputerSystemRequestStateChange(domain, + MSVM_COMPUTE= RSYSTEM_REQUESTEDSTATE_ENABLED); =20 cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); @@ -1405,7 +1405,7 @@ hypervDomainGetAutostart(virDomainPtr domain, int *au= tostart) result =3D 0; } =20 - cleanup: + cleanup: hypervFreeObject(priv, (hypervObject *) vsgsd); hypervFreeObject(priv, (hypervObject *) vssd); =20 @@ -1675,8 +1675,8 @@ hypervDomainManagedSaveRemove(virDomainPtr domain, un= signed int flags) goto cleanup; } =20 - result =3D hypervInvokeMsvmComputerSystemRequestStateChange - (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); + result =3D hypervInvokeMsvmComputerSystemRequestStateChange(domain, + MSVM_COMPUTE= RSYSTEM_REQUESTEDSTATE_DISABLED); =20 cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); @@ -1816,8 +1816,8 @@ hypervConnectListAllDomains(virConnectPtr conn, =20 static int hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, - unsigned int holdtime, unsigned int *keycodes, int nkeycodes, - unsigned int flags) + unsigned int holdtime, unsigned int *keycodes, int nke= ycodes, + unsigned int flags) { int result =3D -1; size_t i =3D 0; @@ -1840,11 +1840,11 @@ hypervDomainSendKey(virDomainPtr domain, unsigned i= nt codeset, goto cleanup; =20 virBufferEscapeSQL(&query, - "associators of " - "{Msvm_ComputerSystem.CreationClassName=3D\"Msvm_ComputerSyste= m\"," - "Name=3D\"%s\"} " - "where ResultClass =3D Msvm_Keyboard", - uuid_string); + "associators of " + "{Msvm_ComputerSystem.CreationClassName=3D\"Msvm_Co= mputerSystem\"," + "Name=3D\"%s\"} " + "where ResultClass =3D Msvm_Keyboard", + uuid_string); =20 if (hypervGetWmiClass(Msvm_Keyboard, &keyboard) < 0) goto cleanup; @@ -1854,12 +1854,13 @@ hypervDomainSendKey(virDomainPtr domain, unsigned i= nt codeset, /* translate keycodes to win32 and generate keyup scancodes. */ for (i =3D 0; i < nkeycodes; i++) { if (codeset !=3D VIR_KEYCODE_SET_WIN32) { - keycode =3D virKeycodeValueTranslate(codeset, VIR_KEYCODE_SET_= WIN32, - keycodes[i]); + keycode =3D virKeycodeValueTranslate(codeset, + VIR_KEYCODE_SET_WIN32, + keycodes[i]); =20 if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not translate keycode")); + _("Could not translate keycode")); goto cleanup; } translatedKeycodes[i] =3D keycode; @@ -1907,8 +1908,8 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, goto cleanup; =20 if (hypervInvokeMethod(priv, ¶ms, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not release ke= y %s"), - keycodeStr); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not release key %s"), keycodeStr); goto cleanup; } } @@ -1926,7 +1927,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, =20 static int hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, - unsigned int flags) + unsigned int flags) { int result =3D -1; char uuid_string[VIR_UUID_STRING_BUFLEN]; @@ -1949,7 +1950,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, goto cleanup; =20 if (hypervGetMsvmMemorySettingDataFromVSSD(priv, vssd->data.common->In= stanceID, - &memsd) < 0) + &memsd) < 0) goto cleanup; =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) { @@ -1964,7 +1965,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, virBufferEscapeSQL(&eprQuery, "where Name =3D \"%s\"", uuid_string= ); =20 if (hypervAddEprParam(params, "ComputerSystem", priv, &eprQuery, - Msvm_ComputerSystem_WmiInfo) < 0) + Msvm_ComputerSystem_WmiInfo) < 0) goto cleanup; } else if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V2) { params =3D hypervCreateInvokeParamsList(priv, "ModifyResourceSetti= ngs", @@ -1983,7 +1984,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, goto cleanup; =20 if (hypervSetEmbeddedProperty(memResource, "InstanceID", - memsd->data.common->InstanceID) < 0) { + memsd->data.common->InstanceID) < 0) { goto cleanup; } =20 @@ -2079,30 +2080,30 @@ hypervDebugHandler(const char *message, debug_level= _e level, void *user_data G_GNUC_UNUSED) { switch (level) { - case DEBUG_LEVEL_ERROR: - case DEBUG_LEVEL_CRITICAL: - case DEBUG_LEVEL_ALWAYS: + case DEBUG_LEVEL_ERROR: + case DEBUG_LEVEL_CRITICAL: + case DEBUG_LEVEL_ALWAYS: VIR_ERROR(_("openwsman: %s"), message); break; =20 - case DEBUG_LEVEL_WARNING: + case DEBUG_LEVEL_WARNING: VIR_WARN("openwsman: %s", message); break; =20 - case DEBUG_LEVEL_MESSAGE: + case DEBUG_LEVEL_MESSAGE: VIR_INFO("openwsman: %s", message); break; =20 - case DEBUG_LEVEL_INFO: + case DEBUG_LEVEL_INFO: VIR_INFO("openwsman: %s", message); break; =20 - case DEBUG_LEVEL_DEBUG: + case DEBUG_LEVEL_DEBUG: VIR_DEBUG("openwsman: %s", message); break; =20 - case DEBUG_LEVEL_NONE: - default: + case DEBUG_LEVEL_NONE: + default: /* Ignore the rest */ break; } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 8c30370a7b..2b2ae76573 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -72,10 +72,10 @@ hypervGetWmiClassInfo(hypervPrivate *priv, hypervWmiCla= ssInfoListPtr list, version =3D "v1"; =20 for (i =3D 0; i < list->count; i++) { - if (STRCASEEQ(list->objs[i]->version, version)) { - *info =3D list->objs[i]; - return 0; - } + if (STRCASEEQ(list->objs[i]->version, version)) { + *info =3D list->objs[i]; + return 0; + } } =20 virReportError(VIR_ERR_INTERNAL_ERROR, @@ -172,7 +172,7 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH res= ponse, */ hypervInvokeParamsListPtr hypervCreateInvokeParamsList(hypervPrivate *priv, const char *method, - const char *selector, hypervWmiClassInfoListPtr obj) + const char *selector, hypervWmiClassInfoListP= tr obj) { hypervInvokeParamsListPtr params =3D NULL; hypervWmiClassInfoPtr info =3D NULL; @@ -213,17 +213,17 @@ hypervFreeInvokeParams(hypervInvokeParamsListPtr para= ms) p =3D &(params->params[i]); =20 switch (p->type) { - case HYPERV_SIMPLE_PARAM: - break; - case HYPERV_EPR_PARAM: - virBufferFreeAndReset(p->epr.query); - break; - case HYPERV_EMBEDDED_PARAM: - hypervFreeEmbeddedParam(p->embedded.table); - break; - default: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid parameter type passed to free")); + case HYPERV_SIMPLE_PARAM: + break; + case HYPERV_EPR_PARAM: + virBufferFreeAndReset(p->epr.query); + break; + case HYPERV_EMBEDDED_PARAM: + hypervFreeEmbeddedParam(p->embedded.table); + break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid parameter type passed to free")); } } =20 @@ -257,7 +257,7 @@ hypervCheckParams(hypervInvokeParamsListPtr params) */ int hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *name, - const char *value) + const char *value) { hypervParamPtr p =3D NULL; =20 @@ -288,14 +288,14 @@ hypervAddSimpleParam(hypervInvokeParamsListPtr params= , const char *name, */ int hypervAddEprParam(hypervInvokeParamsListPtr params, const char *name, - hypervPrivate *priv, virBufferPtr query, - hypervWmiClassInfoListPtr eprInfo) + hypervPrivate *priv, virBufferPtr query, + hypervWmiClassInfoListPtr eprInfo) { hypervParamPtr p =3D NULL; hypervWmiClassInfoPtr classInfo =3D NULL; =20 if (hypervGetWmiClassInfo(priv, eprInfo, &classInfo) < 0 || - hypervCheckParams(params) < 0) + hypervCheckParams(params) < 0) return -1; =20 p =3D ¶ms->params[params->nbParams]; @@ -437,7 +437,7 @@ hypervFreeEmbeddedParam(virHashTablePtr p) */ static int hypervGetCimTypeInfo(hypervCimTypePtr typemap, const char *name, - hypervCimTypePtr *property) + hypervCimTypePtr *property) { size_t i =3D 0; while (typemap[i].name[0] !=3D '\0') { @@ -464,14 +464,14 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr pa= rams, WsXmlDocH *docRoot) *docRoot =3D ws_xml_create_doc(NULL, method); if (*docRoot =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not instantiate XML document")); + _("Could not instantiate XML document")); goto cleanup; } =20 xmlNodeMethod =3D xml_parser_get_root(*docRoot); if (xmlNodeMethod =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not get root node of XML document")); + _("Could not get root node of XML document")); goto cleanup; } =20 @@ -492,15 +492,15 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr pa= rams, WsXmlDocH *docRoot) =20 static int hypervSerializeSimpleParam(hypervParamPtr p, const char *resourceUri, - WsXmlNodeH *methodNode) + WsXmlNodeH *methodNode) { WsXmlNodeH xmlNodeParam =3D NULL; =20 xmlNodeParam =3D ws_xml_add_child(*methodNode, resourceUri, - p->simple.name, p->simple.value); + p->simple.name, p->simple.value); if (xmlNodeParam =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not create simple param")); + _("Could not create simple param")); return -1; } =20 @@ -510,7 +510,7 @@ hypervSerializeSimpleParam(hypervParamPtr p, const char= *resourceUri, =20 static int hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv, - const char *resourceUri, WsXmlNodeH *methodNode) + const char *resourceUri, WsXmlNodeH *methodNode) { int result =3D -1; WsXmlNodeH xmlNodeParam =3D NULL, @@ -542,7 +542,7 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate= *priv, =20 /* enumerate based on the filter from this query */ xmlDocResponse =3D wsmc_action_enumerate(priv->client, p->epr.info->ro= otUri, - options, filter); + options, filter); if (hypervVerifyResponse(priv->client, xmlDocResponse, "enumeration") = < 0) goto cleanup; =20 @@ -552,7 +552,7 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate= *priv, =20 /* Pull using filter and enum context */ xmlDocResponse =3D wsmc_action_pull(priv->client, resourceUri, options, - filter, enumContext); + filter, enumContext); =20 if (hypervVerifyResponse(priv->client, xmlDocResponse, "pull") < 0) goto cleanup; @@ -564,7 +564,7 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate= *priv, } =20 if (!(xmlNodeTemp =3D ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ENUMERAT= ION, - WSENUM_PULL_RESP))) { + WSENUM_PULL_RESP))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not get resp= onse")); goto cleanup; } @@ -580,37 +580,37 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPriva= te *priv, } =20 if (!(xmlNodeAddr =3D ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSI= NG, - WSA_ADDRESS))) { + WSA_ADDRESS))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not get EPR = address")); goto cleanup; } =20 if (!(xmlNodeRef =3D ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSIN= G, - WSA_REFERENCE_PARAMETERS))) { + WSA_REFERENCE_PARAMETERS))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not lookup EPR item reference parameters")); + _("Could not lookup EPR item reference parameters")= ); goto cleanup; } =20 /* now build a new xml doc with the EPR node children */ if (!(xmlNodeParam =3D ws_xml_add_child(*methodNode, resourceUri, - p->epr.name, NULL))) { + p->epr.name, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child node to methodNode")); + _("Could not add child node to methodNode")); goto cleanup; } =20 if (!(ns =3D ws_xml_ns_add(xmlNodeParam, - "http://schemas.xmlsoap.org/ws/2004/08/addressing", "a= "))) { + "http://schemas.xmlsoap.org/ws/2004/08/addres= sing", "a"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not set namespace address for xmlNodeParam")); + _("Could not set namespace address for xmlNodeParam= ")); goto cleanup; } =20 if (!(ns =3D ws_xml_ns_add(xmlNodeParam, - "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd", "w")= )) { + "http://schemas.dmtf.org/wbem/wsman/1/wsman.x= sd", "w"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not set wsman namespace address for xmlNodeParam"= )); + _("Could not set wsman namespace address for xmlNod= eParam")); goto cleanup; } =20 @@ -634,7 +634,7 @@ hypervSerializeEprParam(hypervParamPtr p, hypervPrivate= *priv, =20 static int hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, - WsXmlNodeH *methodNode) + WsXmlNodeH *methodNode) { int result =3D -1; WsXmlNodeH xmlNodeInstance =3D NULL, @@ -652,9 +652,9 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const ch= ar *resourceUri, int len =3D 0, i =3D 0; =20 if (!(xmlNodeParam =3D ws_xml_add_child(*methodNode, resourceUri, p->e= mbedded.name, - NULL))) { + NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not add child node= %s"), - p->embedded.name); + p->embedded.name); goto cleanup; } =20 @@ -663,21 +663,21 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const = char *resourceUri, /* start with the INSTANCE node */ if (!(xmlDocTemp =3D ws_xml_create_doc(NULL, "INSTANCE"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not create temporary xml doc")); + _("Could not create temporary xml doc")); goto cleanup; } =20 if (!(xmlNodeInstance =3D xml_parser_get_root(xmlDocTemp))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not get temp xml doc root")); + _("Could not get temp xml doc root")); goto cleanup; } =20 /* add CLASSNAME node to INSTANCE node */ if (!(ws_xml_add_node_attr(xmlNodeInstance, NULL, "CLASSNAME", - classInfo->name))) { + classInfo->name))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add attribute to node")); + _("Could not add attribute to node")); goto cleanup; } =20 @@ -686,7 +686,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const ch= ar *resourceUri, items =3D virHashGetItems(p->embedded.table, NULL); if (!items) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not read embedded param hash table")); + _("Could not read embedded param hash table")); goto cleanup; } =20 @@ -697,47 +697,47 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const = char *resourceUri, =20 if (value !=3D NULL) { if (hypervGetCimTypeInfo(classInfo->propertyInfo, name, - &property) < 0) { + &property) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not read type information")); + _("Could not read type information")); goto cleanup; } =20 if (!(xmlNodeProperty =3D ws_xml_add_child(xmlNodeInstance, NU= LL, - property->isArray ? "PROPERTY.ARRAY" : "PROPER= TY", - NULL))) { + property->isArray ? "= PROPERTY.ARRAY" : "PROPERTY", + NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to XML node")); + _("Could not add child to XML node")); goto cleanup; } =20 if (!(ws_xml_add_node_attr(xmlNodeProperty, NULL, "NAME", name= ))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add attribute to XML node")); + _("Could not add attribute to XML node")); goto cleanup; } =20 if (!(ws_xml_add_node_attr(xmlNodeProperty, NULL, "TYPE", prop= erty->type))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add attribute to XML node")); + _("Could not add attribute to XML node")); goto cleanup; } =20 /* If this attribute is an array, add VALUE.ARRAY node */ if (property->isArray) { if (!(xmlNodeArray =3D ws_xml_add_child(xmlNodeProperty, N= ULL, - "VALUE.ARRAY", NULL))) { + "VALUE.ARRAY", NULL)= )) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to XML node")); + _("Could not add child to XML node")); goto cleanup; } } =20 /* add the child */ if (!(ws_xml_add_child(property->isArray ? xmlNodeArray : xmlN= odeProperty, - NULL, "VALUE", value))) { + NULL, "VALUE", value))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add child to XML node")); + _("Could not add child to XML node")); goto cleanup; } =20 @@ -750,9 +750,9 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const ch= ar *resourceUri, ws_xml_dump_memory_node_tree(xmlNodeInstance, &cdataContent, &len); =20 if (!(xmlNodeCdata =3D xmlNewCDataBlock((xmlDocPtr) xmlDocCdata, - (xmlChar *)cdataContent, len))) { + (xmlChar *)cdataContent, len))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not create CDATA element")); + _("Could not create CDATA element")); goto cleanup; } =20 @@ -764,7 +764,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const ch= ar *resourceUri, */ if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not add CDATA to doc root")); + _("Could not add CDATA to doc root")); goto cleanup; } =20 @@ -1177,73 +1177,73 @@ const char * hypervReturnCodeToString(int returnCode) { switch (returnCode) { - case CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR: + case CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR: return _("Completed with no error"); =20 - case CIM_RETURNCODE_NOT_SUPPORTED: + case CIM_RETURNCODE_NOT_SUPPORTED: return _("Not supported"); =20 - case CIM_RETURNCODE_UNKNOWN_ERROR: + case CIM_RETURNCODE_UNKNOWN_ERROR: return _("Unknown error"); =20 - case CIM_RETURNCODE_CANNOT_COMPLETE_WITHIN_TIMEOUT_PERIOD: + case CIM_RETURNCODE_CANNOT_COMPLETE_WITHIN_TIMEOUT_PERIOD: return _("Cannot complete within timeout period"); =20 - case CIM_RETURNCODE_FAILED: + case CIM_RETURNCODE_FAILED: return _("Failed"); =20 - case CIM_RETURNCODE_INVALID_PARAMETER: + case CIM_RETURNCODE_INVALID_PARAMETER: return _("Invalid parameter"); =20 - case CIM_RETURNCODE_IN_USE: + case CIM_RETURNCODE_IN_USE: return _("In use"); =20 - case CIM_RETURNCODE_TRANSITION_STARTED: + case CIM_RETURNCODE_TRANSITION_STARTED: return _("Transition started"); =20 - case CIM_RETURNCODE_INVALID_STATE_TRANSITION: + case CIM_RETURNCODE_INVALID_STATE_TRANSITION: return _("Invalid state transition"); =20 - case CIM_RETURNCODE_TIMEOUT_PARAMETER_NOT_SUPPORTED: + case CIM_RETURNCODE_TIMEOUT_PARAMETER_NOT_SUPPORTED: return _("Timeout parameter not supported"); =20 - case CIM_RETURNCODE_BUSY: + case CIM_RETURNCODE_BUSY: return _("Busy"); =20 - case MSVM_RETURNCODE_FAILED: + case MSVM_RETURNCODE_FAILED: return _("Failed"); =20 - case MSVM_RETURNCODE_ACCESS_DENIED: + case MSVM_RETURNCODE_ACCESS_DENIED: return _("Access denied"); =20 - case MSVM_RETURNCODE_NOT_SUPPORTED: + case MSVM_RETURNCODE_NOT_SUPPORTED: return _("Not supported"); =20 - case MSVM_RETURNCODE_STATUS_IS_UNKNOWN: + case MSVM_RETURNCODE_STATUS_IS_UNKNOWN: return _("Status is unknown"); =20 - case MSVM_RETURNCODE_TIMEOUT: + case MSVM_RETURNCODE_TIMEOUT: return _("Timeout"); =20 - case MSVM_RETURNCODE_INVALID_PARAMETER: + case MSVM_RETURNCODE_INVALID_PARAMETER: return _("Invalid parameter"); =20 - case MSVM_RETURNCODE_SYSTEM_IS_IN_USE: + case MSVM_RETURNCODE_SYSTEM_IS_IN_USE: return _("System is in use"); =20 - case MSVM_RETURNCODE_INVALID_STATE_FOR_THIS_OPERATION: + case MSVM_RETURNCODE_INVALID_STATE_FOR_THIS_OPERATION: return _("Invalid state for this operation"); =20 - case MSVM_RETURNCODE_INCORRECT_DATA_TYPE: + case MSVM_RETURNCODE_INCORRECT_DATA_TYPE: return _("Incorrect data type"); =20 - case MSVM_RETURNCODE_SYSTEM_IS_NOT_AVAILABLE: + case MSVM_RETURNCODE_SYSTEM_IS_NOT_AVAILABLE: return _("System is not available"); =20 - case MSVM_RETURNCODE_OUT_OF_MEMORY: + case MSVM_RETURNCODE_OUT_OF_MEMORY: return _("Out of memory"); =20 - default: + default: return _("Unknown return code"); } } @@ -1343,30 +1343,30 @@ hypervInvokeMsvmComputerSystemRequestStateChange(vi= rDomainPtr domain, } =20 switch (concreteJob->data.common->JobState) { - case MSVM_CONCRETEJOB_JOBSTATE_NEW: - case MSVM_CONCRETEJOB_JOBSTATE_STARTING: - case MSVM_CONCRETEJOB_JOBSTATE_RUNNING: - case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN: + case MSVM_CONCRETEJOB_JOBSTATE_NEW: + case MSVM_CONCRETEJOB_JOBSTATE_STARTING: + case MSVM_CONCRETEJOB_JOBSTATE_RUNNING: + case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN: hypervFreeObject(priv, (hypervObject *)concreteJob); concreteJob =3D NULL; =20 g_usleep(100 * 1000); continue; =20 - case MSVM_CONCRETEJOB_JOBSTATE_COMPLETED: + case MSVM_CONCRETEJOB_JOBSTATE_COMPLETED: completed =3D true; break; =20 - case MSVM_CONCRETEJOB_JOBSTATE_TERMINATED: - case MSVM_CONCRETEJOB_JOBSTATE_KILLED: - case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION: - case MSVM_CONCRETEJOB_JOBSTATE_SERVICE: + case MSVM_CONCRETEJOB_JOBSTATE_TERMINATED: + case MSVM_CONCRETEJOB_JOBSTATE_KILLED: + case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION: + case MSVM_CONCRETEJOB_JOBSTATE_SERVICE: virReportError(VIR_ERR_INTERNAL_ERROR, _("Concrete job for %s invocation is in err= or state"), "RequestStateChange"); goto cleanup; =20 - default: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Concrete job for %s invocation is in unk= nown state"), "RequestStateChange"); @@ -1400,37 +1400,37 @@ hypervInvokeMsvmComputerSystemRequestStateChange(vi= rDomainPtr domain, =20 int hypervMsvmComputerSystemEnabledStateToDomainState - (Msvm_ComputerSystem *computerSystem) +(Msvm_ComputerSystem *computerSystem) { switch (computerSystem->data.common->EnabledState) { - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_UNKNOWN: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_UNKNOWN: return VIR_DOMAIN_NOSTATE; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED: return VIR_DOMAIN_RUNNING; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_DISABLED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_DISABLED: return VIR_DOMAIN_SHUTOFF; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED: return VIR_DOMAIN_PAUSED; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED: /* managed save */ + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED: /* managed save */ return VIR_DOMAIN_SHUTOFF; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STARTING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SNAPSHOTTING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SAVING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STARTING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SNAPSHOTTING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SAVING: return VIR_DOMAIN_RUNNING; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STOPPING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STOPPING: return VIR_DOMAIN_SHUTDOWN; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_RESUMING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_RESUMING: return VIR_DOMAIN_RUNNING; =20 - default: + default: return VIR_DOMAIN_NOSTATE; } } @@ -1444,33 +1444,33 @@ hypervIsMsvmComputerSystemActive(Msvm_ComputerSyste= m *computerSystem, *in_transition =3D false; =20 switch (computerSystem->data.common->EnabledState) { - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_UNKNOWN: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_UNKNOWN: return false; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_ENABLED: return true; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_DISABLED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_DISABLED: return false; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSED: return true; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED: /* managed save */ + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED: /* managed save */ return false; =20 - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STARTING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SNAPSHOTTING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SAVING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STOPPING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSING: - case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_RESUMING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STARTING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SNAPSHOTTING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SAVING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_STOPPING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_PAUSING: + case MSVM_COMPUTERSYSTEM_ENABLEDSTATE_RESUMING: if (in_transition !=3D NULL) *in_transition =3D true; =20 return true; =20 - default: + default: return false; } } @@ -1545,20 +1545,20 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr dom= ain, =20 int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, - const char *uuid_string, Msvm_VirtualSystemSettingData **list) + const char *uuid_string, Msv= m_VirtualSystemSettingData **list) { g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&query, - "associators of " - "{Msvm_ComputerSystem.CreationClassName=3D\"Msvm_ComputerSyste= m\"," - "Name=3D\"%s\"} " - "where AssocClass =3D Msvm_SettingsDefineState " - "ResultClass =3D Msvm_VirtualSystemSettingData", - uuid_string); + "associators of " + "{Msvm_ComputerSystem.CreationClassName=3D\"Msvm_Com= puterSystem\"," + "Name=3D\"%s\"} " + "where AssocClass =3D Msvm_SettingsDefineState " + "ResultClass =3D Msvm_VirtualSystemSettingData", + uuid_string); =20 if (hypervGetWmiClassList(priv, Msvm_VirtualSystemSettingData_WmiInfo,= &query, - (hypervObject **)list) < 0 || *list =3D=3D NULL) + (hypervObject **)list) < 0 || *list =3D=3D N= ULL) return -1; =20 return 0; @@ -1571,19 +1571,19 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hyper= vPrivate *priv, =20 int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, - const char *vssd_instanceid, Msvm_MemorySettingData **list) + const char *vssd_instanceid, Msvm_M= emorySettingData **list) { g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&query, - "associators of " - "{Msvm_VirtualSystemSettingData.InstanceID=3D\"%s\"} " - "where AssocClass =3D Msvm_VirtualSystemSettingDataComponent " - "ResultClass =3D Msvm_MemorySettingData", - vssd_instanceid); + "associators of " + "{Msvm_VirtualSystemSettingData.InstanceID=3D\"%s\"}= " + "where AssocClass =3D Msvm_VirtualSystemSettingDataC= omponent " + "ResultClass =3D Msvm_MemorySettingData", + vssd_instanceid); =20 if (hypervGetWmiClassList(priv, Msvm_MemorySettingData_WmiInfo, &query, - (hypervObject **)list) < 0 || *list =3D=3D NULL) + (hypervObject **)list) < 0 || *list =3D=3D N= ULL) return -1; =20 return 0; diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index 3a623e99fa..570aa07eb8 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -132,20 +132,22 @@ typedef hypervInvokeParamsList *hypervInvokeParamsLis= tPtr; =20 =20 hypervInvokeParamsListPtr hypervCreateInvokeParamsList(hypervPrivate *priv, - const char *method, const char *selector, hypervWmiClassInfoListPt= r obj); + const char *method, + const char *selecto= r, + hypervWmiClassInfoL= istPtr obj); =20 void hypervFreeInvokeParams(hypervInvokeParamsListPtr params); G_DEFINE_AUTOPTR_CLEANUP_FUNC(hypervInvokeParamsList, hypervFreeInvokePara= ms); =20 int hypervAddSimpleParam(hypervInvokeParamsListPtr params, const char *nam= e, - const char *value); + const char *value); =20 int hypervAddEprParam(hypervInvokeParamsListPtr params, const char *name, - hypervPrivate *priv, virBufferPtr query, - hypervWmiClassInfoListPtr eprInfo); + hypervPrivate *priv, virBufferPtr query, + hypervWmiClassInfoListPtr eprInfo); =20 virHashTablePtr hypervCreateEmbeddedParam(hypervPrivate *priv, - hypervWmiClassInfoListPtr info); + hypervWmiClassInfoListPtr info); =20 int hypervSetEmbeddedProperty(virHashTablePtr table, const char *name, @@ -222,8 +224,7 @@ int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivat= e *priv, int hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, int requestedState); =20 -int hypervMsvmComputerSystemEnabledStateToDomainState - (Msvm_ComputerSystem *computerSystem); +int hypervMsvmComputerSystemEnabledStateToDomainState(Msvm_ComputerSystem = *computerSystem); =20 bool hypervIsMsvmComputerSystemActive(Msvm_ComputerSystem *computerSystem, bool *in_transition); --=20 2.26.2