From nobody Thu Apr 25 21:01:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1642096088; cv=none; d=zohomail.com; s=zohoarc; b=KYxWxEye7CoWHWz6D4Pm63UdhCvshFVTyOK4PGcgAocUtoYgkluOlsd3+hqwXzir5MJ7Ez+nPzXM+0j44hM1h1Akg0k6WVfFl2lCQ+b7xoeM2RoITprTVHPVpGTLP24DKG1n4LYTik584pC3GGdKF7i17e0Fn2lYBfUpaTcIOpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642096088; 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=MF6YYKcACQOLxlqyasWsCKFmQlsk0gPxIp0Ls8/JXCA=; b=M/4t1u2KSWdgH1PIsTLyRDQzwRwpZwSflAwWfnRwawcM55LAlMBQ/qvQcs1NLo2URRP71CRumb9MHNwkVhoQKpzyuNrVDUcc/VVPhZzIJ9A7/eQ4omxwgYseydm8oI4Fhvj4PmgNsrVGwYN29VaVVkF6AsdQkkpKn9e8gSwyq+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642096088555552.5988066312913; Thu, 13 Jan 2022 09:48:08 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-206--qO7ouCyNGC9MnlcahQecw-1; Thu, 13 Jan 2022 12:48:04 -0500 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 9CEBE81EE61; Thu, 13 Jan 2022 17:47:59 +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 401B31091ED5; Thu, 13 Jan 2022 17:47:59 +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 1E0401809CB9; Thu, 13 Jan 2022 17:47:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20DHlulD004963 for ; Thu, 13 Jan 2022 12:47:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id F40A12E053; Thu, 13 Jan 2022 17:47:55 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57449348E0 for ; Thu, 13 Jan 2022 17:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642096087; 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=MF6YYKcACQOLxlqyasWsCKFmQlsk0gPxIp0Ls8/JXCA=; b=ERxE/kZ6lvdAN5+/cjJQgsN619AaWMeDAe9KPgDEc53c6iEh+YCn+MixbnRQfi5i84NwCw C6Yms5auvcgW2MJdsmeyVHbRpxx+qIOTPRhikGMBieByn2bdhuMpQnwam1CCIUpdThLOHQ iIpFQzvX5MX3TC2YMrH0Es263TjhP/Q= X-MC-Unique: -qO7ouCyNGC9MnlcahQecw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/7] util: remove virGetUnprivSGIOSysfsPath Date: Thu, 13 Jan 2022 18:47:36 +0100 Message-Id: <889cb6e7f05663c971ad0af21c964e5701a89566.1642095763.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642096089687100003 unpriv_sgio was a downstream-only feature in certain RHEL versions. The libvirt support was merged upstream by mistake. Remove the function that constructs the sysfs path and assume it does not exist in all the callers. Signed-off-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 - src/qemu/qemu_conf.c | 43 ++---------------- src/util/virutil.c | 96 +++++----------------------------------- src/util/virutil.h | 2 - 4 files changed, 16 insertions(+), 126 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b76e66e61..932dbf4f72 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3521,7 +3521,6 @@ virGetPassword; virGetSelfLastChanged; virGetSystemPageSize; virGetSystemPageSizeKB; -virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; virGetUserDirectory; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 6077457ff4..73497ad848 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1484,42 +1484,11 @@ qemuGetSharedDeviceKey(const char *device_path) * being used and in the future the hostdev information. */ static int -qemuCheckUnprivSGIO(GHashTable *sharedDevices, - const char *device_path, - int sgio) +qemuCheckUnprivSGIO(GHashTable *sharedDevices G_GNUC_UNUSED, + const char *device_path G_GNUC_UNUSED, + int sgio G_GNUC_UNUSED) { - g_autofree char *sysfs_path =3D NULL; - g_autofree char *key =3D NULL; - int val; - - if (!(sysfs_path =3D virGetUnprivSGIOSysfsPath(device_path, NULL))) - return -1; - /* It can't be conflict if unpriv_sgio is not supported by kernel. */ - if (!virFileExists(sysfs_path)) - return 0; - - if (!(key =3D qemuGetSharedDeviceKey(device_path))) - return -1; - - /* It can't be conflict if no other domain is sharing it. */ - if (!(virHashLookup(sharedDevices, key))) - return 0; - - if (virGetDeviceUnprivSGIO(device_path, NULL, &val) < 0) - return -1; - - /* Error message on failure needs to be handled in caller - * since there is more specific knowledge of device - */ - if (!((val =3D=3D 0 && - (sgio =3D=3D VIR_DOMAIN_DEVICE_SGIO_FILTERED || - sgio =3D=3D VIR_DOMAIN_DEVICE_SGIO_DEFAULT)) || - (val =3D=3D 1 && - sgio =3D=3D VIR_DOMAIN_DEVICE_SGIO_UNFILTERED))) { - return -2; - } - return 0; } =20 @@ -1840,7 +1809,6 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) { virDomainDiskDef *disk =3D NULL; virDomainHostdevDef *hostdev =3D NULL; - g_autofree char *sysfs_path =3D NULL; const char *path =3D NULL; int val =3D -1; =20 @@ -1873,9 +1841,6 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) return 0; } =20 - if (!(sysfs_path =3D virGetUnprivSGIOSysfsPath(path, NULL))) - return -1; - /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. = */ val =3D (disk->sgio =3D=3D VIR_DOMAIN_DEVICE_SGIO_UNFILTERED); =20 @@ -1883,7 +1848,7 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) * whitelist is enabled. But if requesting unfiltered access, always = call * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_s= gio. */ - if (virFileExists(sysfs_path) || val =3D=3D 1) { + if (val =3D=3D 1) { int curr_val; =20 if (virGetDeviceUnprivSGIO(path, NULL, &curr_val) < 0) diff --git a/src/util/virutil.c b/src/util/virutil.c index e04f1343d8..0acdc052c3 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1354,96 +1354,24 @@ virGetDeviceID(const char *path G_GNUC_UNUSED, } #endif =20 -#define SYSFS_DEV_BLOCK_PATH "/sys/dev/block" - -char * -virGetUnprivSGIOSysfsPath(const char *path, - const char *sysfs_dir) -{ - int maj, min; - int rc; - - if ((rc =3D virGetDeviceID(path, &maj, &min)) < 0) { - virReportSystemError(-rc, - _("Unable to get device ID '%s'"), - path); - return NULL; - } - - return g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, m= aj, - min); -} - int -virSetDeviceUnprivSGIO(const char *path, - const char *sysfs_dir, - int unpriv_sgio) +virSetDeviceUnprivSGIO(const char *path G_GNUC_UNUSED, + const char *sysfs_dir G_GNUC_UNUSED, + int unpriv_sgio G_GNUC_UNUSED) { - char *sysfs_path =3D NULL; - char *val =3D NULL; - int ret =3D -1; - int rc; - - if (!(sysfs_path =3D virGetUnprivSGIOSysfsPath(path, sysfs_dir))) - return -1; - - if (!virFileExists(sysfs_path)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("unpriv_sgio is not supported by this kernel")); - goto cleanup; - } - - val =3D g_strdup_printf("%d", unpriv_sgio); - - if ((rc =3D virFileWriteStr(sysfs_path, val, 0)) < 0) { - virReportSystemError(-rc, _("failed to set %s"), sysfs_path); - goto cleanup; - } - - ret =3D 0; - cleanup: - VIR_FREE(sysfs_path); - VIR_FREE(val); - return ret; + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unpriv_sgio is not supported by this kernel")); + return -1; } =20 int -virGetDeviceUnprivSGIO(const char *path, - const char *sysfs_dir, - int *unpriv_sgio) +virGetDeviceUnprivSGIO(const char *path G_GNUC_UNUSED, + const char *sysfs_dir G_GNUC_UNUSED, + int *unpriv_sgio G_GNUC_UNUSED) { - char *sysfs_path =3D NULL; - char *buf =3D NULL; - char *tmp =3D NULL; - int ret =3D -1; - - if (!(sysfs_path =3D virGetUnprivSGIOSysfsPath(path, sysfs_dir))) - return -1; - - if (!virFileExists(sysfs_path)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("unpriv_sgio is not supported by this kernel")); - goto cleanup; - } - - if (virFileReadAll(sysfs_path, 1024, &buf) < 0) - goto cleanup; - - if ((tmp =3D strchr(buf, '\n'))) - *tmp =3D '\0'; - - if (virStrToLong_i(buf, NULL, 10, unpriv_sgio) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse value of %s"), sysfs_path); - goto cleanup; - } - - ret =3D 0; - cleanup: - VIR_FREE(sysfs_path); - VIR_FREE(buf); - return ret; + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unpriv_sgio is not supported by this kernel")); + return -1; } =20 =20 diff --git a/src/util/virutil.h b/src/util/virutil.h index 854b494890..bd2c69bfaa 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -125,8 +125,6 @@ int virSetDeviceUnprivSGIO(const char *path, int virGetDeviceUnprivSGIO(const char *path, const char *sysfs_dir, int *unpriv_sgio); -char *virGetUnprivSGIOSysfsPath(const char *path, - const char *sysfs_dir); =20 int virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr); =20 --=20 2.31.1 From nobody Thu Apr 25 21:01:45 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1642096230; cv=none; d=zohomail.com; s=zohoarc; b=Wsd/WXfUhZuu3w03r8GLZBbQxMUPGS+ZqvIfOWJTWy2lUkhDPhekyGGU9TOnWTxYrXn+LKJxfGIs15jfB9zIDjbQ9GSLwNLdwn+8tkXluqTIsCd0sJVpJkuAIkfgJZWhZgqmOKZTUgQA0hMb2SN3Pq0xsiKfaUgJYWLTTQAvNW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642096230; 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=hD4mpG6pYCaJmr9QGdaKghCr2BGtFekwwwrrgYvzpdE=; b=UfYfAtBy6/UN2yaRWh0cNEsmdp9F+SGUfeTcqZf1iIecHiFn3B4vZygwE3jvAKVICpQ6lFJNRZA1VnHjBVIlszf8MVSIejYfAvUeuSjpNk6g/NEJwRx0up2mNJ7Wj0sQgbWaMi2iC0V4gptxydjPtntvnj10L/5o8RYfB68xPp4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1642096230584914.9163782154919; Thu, 13 Jan 2022 09:50:30 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-1-7TOd9PGVOeSiWeN48_cyYQ-1; Thu, 13 Jan 2022 12:50:26 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 482FD81EE96; Thu, 13 Jan 2022 17:50:20 +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 2126E5DBA9; Thu, 13 Jan 2022 17:50:20 +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 DE3111806D03; Thu, 13 Jan 2022 17:50:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20DHluP4004974 for ; Thu, 13 Jan 2022 12:47:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id EB9FD2ED67; Thu, 13 Jan 2022 17:47:56 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E69B2E053 for ; Thu, 13 Jan 2022 17:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642096229; 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=hD4mpG6pYCaJmr9QGdaKghCr2BGtFekwwwrrgYvzpdE=; b=S3yauECuqwBoQfQpcPpfJLFvdSR9D9oyeSukN+9zdKRGjq1MRV+phCnvZG2o2w9gROADr9 4ZYzFK8TAvgU529AH7ToTvfvSi/LNNkx7vSVfIrnGsjCRikhIBJF5xab1ecOfIvxl+acfY Cmc+We7Z7hDMZojWxVSI9eEFJWLiT1g= X-MC-Unique: 7TOd9PGVOeSiWeN48_cyYQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/7] conf: reject unfiltered sgio on validation Date: Thu, 13 Jan 2022 18:47:37 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.11 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642096231084100001 No kernels supported by upstream libvirt have the feature. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_validate.c | 11 +++++ .../disk-scsi-lun-passthrough-sgio.xml | 35 -------------- tests/qemuxml2argvdata/hostdev-scsi-rawio.xml | 37 --------------- tests/qemuxml2argvdata/hostdev-scsi-sgio.xml | 37 --------------- .../disk-scsi-lun-passthrough-sgio.xml | 46 ------------------ .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 47 ------------------- .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 47 ------------------- tests/qemuxml2xmltest.c | 11 ----- 8 files changed, 11 insertions(+), 260 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.x= ml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-rawio.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-sgio.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio= .xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index a4271f1247..e9baf1d41a 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -621,6 +621,12 @@ virDomainDiskDefValidate(const virDomainDef *def, if (virDomainDiskDefValidateSource(disk->src) < 0) return -1; =20 + if (disk->sgio =3D=3D VIR_DOMAIN_DEVICE_SGIO_UNFILTERED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unfiltered sgio is no longer supported")); + return -1; + } + /* Validate LUN configuration */ if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) { if (virDomainDiskDefSourceLUNValidate(disk->src) < 0) @@ -1917,6 +1923,11 @@ virDomainHostdevDefValidate(const virDomainHostdevDe= f *hostdev) "address type")); return -1; } + if (hostdev->source.subsys.u.scsi.sgio =3D=3D VIR_DOMAIN_DEVIC= E_SGIO_UNFILTERED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unfiltered sgio is no longer supported")= ); + return -1; + } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: if (hostdev->info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NO= NE && diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml b/te= sts/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml deleted file mode 100644 index 3e561642a3..0000000000 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - -
- - - - - - - - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml b/tests/qemuxml2= argvdata/hostdev-scsi-rawio.xml deleted file mode 100644 index eb60e550f0..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml +++ /dev/null @@ -1,37 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - -
- -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml b/tests/qemuxml2a= rgvdata/hostdev-scsi-sgio.xml deleted file mode 100644 index bfc5346807..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml +++ /dev/null @@ -1,37 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - -
- -
- - - - diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml b/= tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml deleted file mode 100644 index 2b62595805..0000000000 --- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml +++ /dev/null @@ -1,46 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - - - - -
- - -
- - -
- - -
- - - - -