From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89D74393 for ; Thu, 7 Mar 2024 00:14:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709770468; cv=none; b=EvSJ3vaBdl3SS/AoERMji5vYR5zsS1s4WMk7DVECtFHEM6QR/NvGowrut0Z7+NG1a4NbLVQJiz3FfxrrDhFStIrAqF4yYKa5H2Q2qCtxtva2CLXT9alm+tz7uVFUcrc5+TerHmbjQp/FIMStOAq4saNEQchXnbVmoCbIo9tOzRQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709770468; c=relaxed/simple; bh=AwmrnaRRzQ3E7J/rO0NX1liRy7DOJDE371ntcodOTUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bn2oenS16eaAvrbStQhB3kM5lfqoeHTTxB3yQ2GInEvdbyCDxln0zzE74F8cPlvSPQoXLGYFGtNuAHAeQRiejKcEqyzxTGumPtkphq3y1GID1tuFj1xp8ISwu/j1ea+/QqHgoW1cuT1mN9YAOSsPqTWdZqhDU1HZBoPNpNpQnCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=kyH4SaEY; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="kyH4SaEY" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=j7oaSBz+DWlMIvgclLfkUCN3XpL2hjrlvIh6Ex2YqBU=; b=kyH4SaEYGhm+oCa93mqqoqw9ew eqhdFS2oaDFkImyMrqVLrzfmKh6AwGsDvxS+cKIzvQcY/TgQSFg3WwluhfShrTrnJQ9n+zpQjV2d5 OYnR6f3XvtNCMIA6eRkCU9IkTOSJ4N3xngNqYpzonkMw2mWw2e8xkHNQmqtef11YzJ/VrL8/aendx 297Q9P2e13x4XIXaIak2fgvl4uglrY1rjdD/V51IAeWzWcxGdefFxJ2EAE8nmEi+4FhE7TZg5M2Ps cHe9+MAvR8PIQfpYtPvq2RKbHM0hcsfdOIIwO4iMwu0M/ka/YA8E4o7X6kCi5OGB2GFAabua39mT7 ri8KGiiA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1ri1P1-00000002N5Z-0Ket; Thu, 07 Mar 2024 00:14:27 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 3/5] guestfs_q35: use libvirt_extra_storage_nvme_logical_block_size Date: Wed, 6 Mar 2024 16:14:24 -0800 Message-ID: <20240307001426.565390-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240307001426.565390-1-mcgrof@kernel.org> References: <20240307001426.565390-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain The libvirt_extra_storage_nvme_logical_block_size was not being used, so fix that. Also clarify on the defaults why only one variable is set. Signed-off-by: Luis Chamberlain --- playbooks/roles/gen_nodes/defaults/main.yml | 2 ++ playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml index 0e41e0ad..5f46a7da 100644 --- a/playbooks/roles/gen_nodes/defaults/main.yml +++ b/playbooks/roles/gen_nodes/defaults/main.yml @@ -63,6 +63,8 @@ libvirt_extra_storage_drive_virtio: False libvirt_extra_storage_drive_ide: False libvirt_extra_storage_aio_mode: "native" libvirt_extra_storage_aio_cache_mode: "none" +# Note that NVMe on qemu does not allow the physical block size +# to differ from the logical block size so we just have one variable. libvirt_extra_storage_nvme_logical_block_size: 512 libvirt_extra_storage_virtio_logical_block_size: 512 libvirt_extra_storage_virtio_physical_block_size: 512 diff --git a/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml index ee340aca..266ced32 100644 --- a/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml +++ b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml @@ -204,7 +204,7 @@ - + {% endfor %} {% endif %} {% if bootlinux_9p %} -- 2.43.0