From nobody Mon Feb 9 16:45:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1651918330094452.63762142831865; Sat, 7 May 2022 03:12:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-fcnR1kvyP-KPaYUYnk1Uyw-1; Sat, 07 May 2022 06:12:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D856D811E7A; Sat, 7 May 2022 10:12:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2793C28117; Sat, 7 May 2022 10:12:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 882CB194705C; Sat, 7 May 2022 10:12:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CEB9A1947058 for ; Sat, 7 May 2022 10:11:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C26EB41616E; Sat, 7 May 2022 10:11:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEAC340314B for ; Sat, 7 May 2022 10:11:58 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 77D01185A79C for ; Sat, 7 May 2022 10:11:58 +0000 (UTC) Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by relay.mimecast.com with ESMTP id us-mta-663-GEdLURviPXydquOOgtk35A-1; Sat, 07 May 2022 06:11:55 -0400 Received: from zhangjl0200.home.langchao.com (unknown [223.104.194.177]) by smtp2 (Coremail) with SMTP id DMmowAA3QwaGPnZisf0UBQ--.6647S3; Sat, 07 May 2022 17:40:27 +0800 (CST) X-MC-Unique: fcnR1kvyP-KPaYUYnk1Uyw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: GEdLURviPXydquOOgtk35A-1 From: zhangjl02 To: libvir-list@redhat.com Subject: [PATCH 1/3] qemu_domain: introduce qemuDomainPostParseDataDefEmulator Date: Sat, 7 May 2022 17:40:14 +0800 Message-Id: <20220507094016.1991-2-jx8zjs@126.com> In-Reply-To: <20220507094016.1991-1-jx8zjs@126.com> References: <20220507094016.1991-1-jx8zjs@126.com> MIME-Version: 1.0 X-CM-TRANSID: DMmowAA3QwaGPnZisf0UBQ--.6647S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww4DGry5WF15Xr48AF4DCFg_yoW8WFWrpF 4kZ3yavr48XF4xWrsYka42vrW5Gryrtr1xZa1fGw40vF47G3Wkuws3Zry5ury3KFn7AFW7 A34fZrnrCFn0vFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U1Wl9UUUUU= X-Originating-IP: [223.104.194.177] X-CM-SenderInfo: dm0y6ybv6rjloofrz/1tbiFwv5SFpED3kDNwAAsx X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: shenjiatong@inspur.com, zhangjl02@inspur.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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-ZM-MESSAGEID: 1651918330810100001 Content-Type: text/plain; charset="utf-8"; x-default="true" From: zhangjl02 qemuDomainPostParseDataDefEmulator will try to get default emulator based on guest's arch from capabilities, and replace the emulator in definition. Signed-off-by: zhangjl02 --- src/qemu/qemu_domain.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7974cdb00b..98a4070226 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5972,6 +5972,23 @@ qemuDomainPostParseDataAlloc(const virDomainDef *def, } =20 =20 +static int +qemuDomainPostParseDataDefEmulator(virDomainDef *def) +{ + char *emulator =3D NULL; + struct stat sb; + virArch hostArch =3D virArchFromHost(); + emulator =3D virQEMUCapsGetDefaultEmulator(hostArch, def->os.arch); + if (stat(emulator, &sb) < 0) { + virReportSystemError(errno, _("Cannot check QEMU binary %s"), + emulator); + return 0; + } + def->emulator =3D emulator; + return 1; +} + + static void qemuDomainPostParseDataFree(void *parseOpaque) { @@ -5984,6 +6001,7 @@ qemuDomainPostParseDataFree(void *parseOpaque) virDomainDefParserConfig virQEMUDriverDomainDefParserConfig =3D { .domainPostParseBasicCallback =3D qemuDomainDefPostParseBasic, .domainPostParseDataAlloc =3D qemuDomainPostParseDataAlloc, + .domainPostParseDataDefEmulator =3D qemuDomainPostParseDataDefEmulator, .domainPostParseDataFree =3D qemuDomainPostParseDataFree, .devicesPostParseCallback =3D qemuDomainDeviceDefPostParse, .domainPostParseCallback =3D qemuDomainDefPostParse, --=20 2.35.1.windows.2