From nobody Mon Feb 9 08:31:27 2026 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=1621601344; cv=none; d=zohomail.com; s=zohoarc; b=HpaDxtMMJdkolJULbIWwNZta1aqkD0Emk1ok2VjtzHP1uHC07Y6+05KrlaReNJbOoL9Oik9tfAklsCskgY0ASOwA9pYigLsY6XfVmq00dWf2UYHUuT8t7o8cdr03XqPfH4Fq7/5/GlqrIh/b73FWV8gSUxPXYgw6qLWYUAGmNKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621601344; 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=bmd+esMwtrTnBGj4rHC+tvJ5rrB6nJaHAJh50yhbJgo=; b=SSApP/VqIEHyIAFR0wspvprY19w30w7+xelxAvJ6+vuHDmTy2KyE2crWjSbMaB4t33BwI28D0uSWx3FNcKGPKHX0UKVfZe66y9IuqWTUR1qaVicEj1d/sJon7Eqkppg8JIWOEIguebPPjdUQ2vIUy2ihTfQ35a70vgLrm86EHjA= 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 1621601344812241.38637338224885; Fri, 21 May 2021 05:49:04 -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-5lSrBEkLNFqX4nnfSstNXg-1; Fri, 21 May 2021 08:48:08 -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 1EB8C108BD0C; Fri, 21 May 2021 12:48:03 +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 BB08D1037F2D; Fri, 21 May 2021 12:48:02 +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 855AF1801265; Fri, 21 May 2021 12:48:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14LCm1kT031048 for ; Fri, 21 May 2021 08:48:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D335421F; Fri, 21 May 2021 12:48:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8DC11964B for ; Fri, 21 May 2021 12:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621601343; 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=bmd+esMwtrTnBGj4rHC+tvJ5rrB6nJaHAJh50yhbJgo=; b=NpyljNBFqjXBDXRfMMFnSAZXibDAccyrRbr0J4+R1mZNkUorox//nwaDTH2zNIyE8oNAt3 J0ylRNEVNmodAZ0KGXOv1ZOHyQDcvtkEENoH0yVrTYVDyhftO1Bwhcq303OZGO36GzVwKu zBC5h444ZzkHzzHS1ow2Bc2Wfs7sxaE= X-MC-Unique: 5lSrBEkLNFqX4nnfSstNXg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/35] qemu: Move bootindex usage logic into qemuBuildDiskDeviceStr Date: Fri, 21 May 2021 14:47:10 +0200 Message-Id: <11d2d9d36258971b74250eff3544c0e510568f60.1621601160.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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" We can skip the formatting of the bootindex for floppies directly at the place where it's being formatted. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 23 ++++++++--------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b01421f61b..200f9a04b1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1659,9 +1659,9 @@ qemuBuildDriveDevCacheStr(virDomainDiskDef *disk, char * qemuBuildDiskDeviceStr(const virDomainDef *def, virDomainDiskDef *disk, - unsigned int bootindex, virQEMUCaps *qemuCaps) { + qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *contAlias; g_autofree char *backendAlias =3D NULL; @@ -1876,8 +1876,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, } virBufferAsprintf(&opt, ",id=3D%s", disk->info.alias); - if (bootindex) - virBufferAsprintf(&opt, ",bootindex=3D%u", bootindex); + /* bootindex for floppies is configured via the fdc controller */ + if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY && + diskPriv->effectiveBootindex > 0) + virBufferAsprintf(&opt, ",bootindex=3D%u", diskPriv->effectiveBoot= index); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKIO)) { if (disk->blockio.logical_block_size > 0) virBufferAsprintf(&opt, ",logical_block_size=3D%u", @@ -2164,8 +2166,7 @@ static int qemuBuildDiskCommandLine(virCommand *cmd, const virDomainDef *def, virDomainDiskDef *disk, - virQEMUCaps *qemuCaps, - unsigned int bootindex) + virQEMUCaps *qemuCaps) { g_autofree char *optstr =3D NULL; @@ -2188,8 +2189,7 @@ qemuBuildDiskCommandLine(virCommand *cmd, virCommandAddArg(cmd, "-device"); - if (!(optstr =3D qemuBuildDiskDeviceStr(def, disk, bootindex, - qemuCaps))) + if (!(optstr =3D qemuBuildDiskDeviceStr(def, disk, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); @@ -2213,15 +2213,8 @@ qemuBuildDisksCommandLine(virCommand *cmd, for (i =3D 0; i < def->ndisks; i++) { virDomainDiskDef *disk =3D def->disks[i]; - qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - unsigned int bootindex =3D 0; - - /* The floppy device itself does not support the bootindex property - * so we need to set it up for the controller */ - if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) - bootindex =3D diskPriv->effectiveBootindex; - if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps, bootindex) = < 0) + if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps) < 0) return -1; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 4f1d2bf755..188e63ea1f 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -146,7 +146,6 @@ qemuBuildStorageSourceChainAttachPrepareBlockdevTop(vir= StorageSource *top, char *qemuBuildDiskDeviceStr(const virDomainDef *def, virDomainDiskDef *disk, - unsigned int bootindex, virQEMUCaps *qemuCaps); /* Current, best practice */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a64cddb9e7..7a1b413be0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -734,7 +734,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, goto cleanup; } - if (!(devstr =3D qemuBuildDiskDeviceStr(vm->def, disk, 0, priv->qemuCa= ps))) + if (!(devstr =3D qemuBuildDiskDeviceStr(vm->def, disk, priv->qemuCaps)= )) goto cleanup; VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1); --=20 2.31.1