From nobody Sat Feb 7 09:36:52 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 1534432373025981.1577153142167; Thu, 16 Aug 2018 08:12:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F364921BB3; Thu, 16 Aug 2018 15:12:50 +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 B34AE20078BC; Thu, 16 Aug 2018 15:12:50 +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 5509F4A460; Thu, 16 Aug 2018 15:12:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7GFCXdY024322 for ; Thu, 16 Aug 2018 11:12:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8E7B82156714; Thu, 16 Aug 2018 15:12:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-135.ams2.redhat.com [10.36.117.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id E348B2156712; Thu, 16 Aug 2018 15:12:32 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 16 Aug 2018 16:12:26 +0100 Message-Id: <20180816151227.10886-3-berrange@redhat.com> In-Reply-To: <20180816151227.10886-1-berrange@redhat.com> References: <20180816151227.10886-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] qemu: rename method for getting preferred machine type 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: , Content-Type: text/plain; charset="utf-8" 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 16 Aug 2018 15:12:51 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 The virQEMUCapsGetDefaultMachine() method doesn't get QEMU's default machine any more, instead it gets the historical default that libvirt prefers for each arch. Rename it, so that the old name can be used for getting QEMU's default. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- src/qemu/qemu_capabilities.c | 8 ++++++-- src/qemu/qemu_capabilities.h | 2 +- tests/domaincapstest.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a0a1b97f1d..4e4f732889 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4876,7 +4876,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache, goto cleanup; } } else { - machine =3D virQEMUCapsGetDefaultMachine(qemuCaps); + machine =3D virQEMUCapsGetPreferredMachine(qemuCaps); } =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) @@ -4935,8 +4935,12 @@ virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCap= s, } =20 =20 +/* + * The preferred machine to use if none is listed explicitly + * Note that this may differ from QEMU's own default machine + */ const char * -virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps) +virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps) { if (!qemuCaps->nmachineTypes) return NULL; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 26813a908c..88e81be09b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -605,7 +605,7 @@ bool virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuC= aps, bool virQEMUCapsIsMachineSupported(virQEMUCapsPtr qemuCaps, const char *canonical_machine); =20 -const char *virQEMUCapsGetDefaultMachine(virQEMUCapsPtr qemuCaps); +const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps); =20 int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, const char *binary, diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 06e77fd586..3b94cad223 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -168,7 +168,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, =20 if (!domCaps->machine && VIR_STRDUP(domCaps->machine, - virQEMUCapsGetDefaultMachine(qemuCaps)) < 0) + virQEMUCapsGetPreferredMachine(qemuCaps)) < 0) goto cleanup; =20 if (virQEMUCapsFillDomainCaps(caps, domCaps, qemuCaps, --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list