From f4c39256adbf1b53c65fdaab5dd35873e1218230 Mon Sep 17 00:00:00 2001 From: sf Date: Sun, 23 Nov 2025 10:32:47 +0000 Subject: [PATCH] Allow cd(4)/vioscsi(4) in confidential VM mode This is useful for installation and sometimes for cloud configuration data. Also, some VMs may use vioscsi(4) disks. Reasonable deraadt@ --- sys/dev/pv/vioscsi.c | 4 ++-- sys/scsi/cd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/pv/vioscsi.c b/sys/dev/pv/vioscsi.c index 02b95e823e2..904f22d7230 100644 --- a/sys/dev/pv/vioscsi.c +++ b/sys/dev/pv/vioscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioscsi.c,v 1.37 2025/08/01 14:41:03 sf Exp $ */ +/* $OpenBSD: vioscsi.c,v 1.38 2025/11/23 10:32:47 sf Exp $ */ /* * Copyright (c) 2013 Google Inc. * @@ -77,7 +77,7 @@ const struct cfattach vioscsi_ca = { }; struct cfdriver vioscsi_cd = { - NULL, "vioscsi", DV_DULL, + NULL, "vioscsi", DV_DULL, CD_COCOVM }; const struct scsi_adapter vioscsi_switch = { diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 7307f2d912c..0a8328704b0 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.266 2022/09/01 13:45:27 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.267 2025/11/23 10:32:47 sf Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -152,7 +152,7 @@ const struct cfattach cd_ca = { }; struct cfdriver cd_cd = { - NULL, "cd", DV_DISK + NULL, "cd", DV_DISK, CD_COCOVM }; const struct scsi_inquiry_pattern cd_patterns[] = {