From nobody Mon Feb 9 01:21:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153745725894324.34711147470398; Thu, 20 Sep 2018 08:27:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D3A7C3082126; Thu, 20 Sep 2018 15:27:36 +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 8E135309138F; Thu, 20 Sep 2018 15:27:36 +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 42B6A4A460; Thu, 20 Sep 2018 15:27:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8KFPhxr022231 for ; Thu, 20 Sep 2018 11:25:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id A56C82010D6D; Thu, 20 Sep 2018 15:25:43 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 278C32010D0D for ; Thu, 20 Sep 2018 15:25:41 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 20 Sep 2018 17:25:27 +0200 Message-Id: <20180920152529.25973-10-abologna@redhat.com> In-Reply-To: <20180920152529.25973-1-abologna@redhat.com> References: <20180920152529.25973-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/11] qemu: Rename qemubinCaps => qemuCaps 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 20 Sep 2018 15:27:37 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The latter is used throughout libvirt, so use it here as well for consistency. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 16 ++++++++-------- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 72fa19a2b7..b78b935404 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -747,7 +747,7 @@ virQEMUCapsInitGuest(virCapsPtr caps, virArch guestarch) { char *binary =3D NULL; - virQEMUCapsPtr qemubinCaps =3D NULL; + virQEMUCapsPtr qemuCaps =3D NULL; int ret =3D -1; =20 /* Check for existence of base emulator, or alternate base @@ -764,18 +764,18 @@ virQEMUCapsInitGuest(virCapsPtr caps, =20 /* Ignore binary if extracting version info fails */ if (binary) { - if (!(qemubinCaps =3D virQEMUCapsCacheLookup(cache, binary))) { + if (!(qemuCaps =3D virQEMUCapsCacheLookup(cache, binary))) { virResetLastError(); VIR_FREE(binary); } } =20 ret =3D virQEMUCapsInitGuestFromBinary(caps, - binary, qemubinCaps, + binary, qemuCaps, guestarch); =20 VIR_FREE(binary); - virObjectUnref(qemubinCaps); + virObjectUnref(qemuCaps); =20 return ret; } @@ -783,7 +783,7 @@ virQEMUCapsInitGuest(virCapsPtr caps, int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, const char *binary, - virQEMUCapsPtr qemubinCaps, + virQEMUCapsPtr qemuCaps, virArch guestarch) { virCapsGuestPtr guest; @@ -795,7 +795,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (!binary) return 0; =20 - if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines)= < 0) + if (virQEMUCapsGetMachineTypesCaps(qemuCaps, &nmachines, &machines) < = 0) goto cleanup; =20 /* We register kvm as the base emulator too, since we can @@ -820,7 +820,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (!virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false)) goto cleanup; =20 - if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_DISK_SNAPSHOT)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT)) hasdisksnapshot =3D true; =20 if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnap= shot, @@ -835,7 +835,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, NULL) =3D=3D NULL) goto cleanup; =20 - if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, NULL, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 94b3bbb2f6..253f19c2db 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -611,7 +611,7 @@ const char *virQEMUCapsGetPreferredMachine(virQEMUCapsP= tr qemuCaps); =20 int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, const char *binary, - virQEMUCapsPtr qemubinCaps, + virQEMUCapsPtr qemuCaps, virArch guestarch); =20 int virQEMUCapsFillDomainCaps(virCapsPtr caps, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list