From nobody Mon Feb 9 06:05:44 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; 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=1698234000; cv=none; d=zohomail.com; s=zohoarc; b=SwaU0zjUb2v14KWaz0ZOnZkozmki5fqXXED9rpIl4Sd3sopEC6cZiOflTXvaebrb8kCuk47PSN/6hUfxT3En6DVGC4c+sKgzg2OlXJyGVTds/gdj8m2KmUFHzfF+w138TXHWchIeGRdkb6EyvRGsQBxPoB3K6byfX0tqjl99QYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698234000; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3gsCO2nzqR3+4wPfP2vJKUG9K8qh07Nly3ZrEhnItIA=; b=UK3hG6ZuQZkvjG028bLywhnGJImfulBdQjwBn9J+pT6SzxI240yjyfTbtCXcso8UeKphmiCS8GgWbLwo75UFOxASkktj9F7rrFuUkrl0fhesDDRwuU9zDoiOFYbDCB9B/3Euhl/SIPZUYycGpgm9Phhapts4XHWpwkLe1UrXX2U= 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 1698234000166285.1731479229777; Wed, 25 Oct 2023 04:40:00 -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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-203-QvshuT_iPUaaBHmMmbWJYQ-1; Wed, 25 Oct 2023 07:39:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 98C4B101B04B; Wed, 25 Oct 2023 11:39:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E39B40C6F79; Wed, 25 Oct 2023 11:39:48 +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 461EC194658C; Wed, 25 Oct 2023 11:39:48 +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 AA89C19465BD for ; Wed, 25 Oct 2023 11:39:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B1F7492BFB; Wed, 25 Oct 2023 11:39:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 248CF492BFA for ; Wed, 25 Oct 2023 11:39:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698233999; 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=3gsCO2nzqR3+4wPfP2vJKUG9K8qh07Nly3ZrEhnItIA=; b=WXtgAcfi2sry9RpC0Wa9keG6mIrGuM1vKu96LuWxnAB2GBNXgUJImnjSNyZDnUT69lLMGT /T3RI33gja7VJd+wnuOtujq/x8DLmuWLP4OzhWywcy+hWzF0mKEDBJtyvQeHWbng96jbUM AklCspeuK/nN7pAJqe/jFcGgZoz9g2A= X-MC-Unique: QvshuT_iPUaaBHmMmbWJYQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/22] conf: Move definition of some disk type enums to a common header Date: Wed, 25 Oct 2023 13:39:15 +0200 Message-ID: <90022a9d93b1d567bca967bd5310ec2927f5f8ac.1698233503.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1698234001302100002 Content-Type: text/plain; charset="utf-8" Certain disk config fields are mirrored between the disk and storage source definitions. We nee Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.h | 37 ------------------------------------- src/conf/virconftypes.h | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9e6dd930fa..98f99721f0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -413,17 +413,6 @@ typedef enum { VIR_DOMAIN_DISK_BUS_LAST } virDomainDiskBus; -typedef enum { - VIR_DOMAIN_DISK_CACHE_DEFAULT, - VIR_DOMAIN_DISK_CACHE_DISABLE, - VIR_DOMAIN_DISK_CACHE_WRITETHRU, - VIR_DOMAIN_DISK_CACHE_WRITEBACK, - VIR_DOMAIN_DISK_CACHE_DIRECTSYNC, - VIR_DOMAIN_DISK_CACHE_UNSAFE, - - VIR_DOMAIN_DISK_CACHE_LAST -} virDomainDiskCache; - typedef enum { VIR_DOMAIN_DISK_ERROR_POLICY_DEFAULT, VIR_DOMAIN_DISK_ERROR_POLICY_STOP, @@ -451,32 +440,6 @@ typedef enum { VIR_DOMAIN_DISK_TRANS_LAST } virDomainDiskGeometryTrans; -typedef enum { - VIR_DOMAIN_DISK_IO_DEFAULT =3D 0, - VIR_DOMAIN_DISK_IO_NATIVE, - VIR_DOMAIN_DISK_IO_THREADS, - VIR_DOMAIN_DISK_IO_URING, - - VIR_DOMAIN_DISK_IO_LAST -} virDomainDiskIo; - -typedef enum { - VIR_DOMAIN_DISK_DISCARD_DEFAULT =3D 0, - VIR_DOMAIN_DISK_DISCARD_UNMAP, - VIR_DOMAIN_DISK_DISCARD_IGNORE, - - VIR_DOMAIN_DISK_DISCARD_LAST -} virDomainDiskDiscard; - -typedef enum { - VIR_DOMAIN_DISK_DETECT_ZEROES_DEFAULT =3D 0, - VIR_DOMAIN_DISK_DETECT_ZEROES_OFF, - VIR_DOMAIN_DISK_DETECT_ZEROES_ON, - VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP, - - VIR_DOMAIN_DISK_DETECT_ZEROES_LAST -} virDomainDiskDetectZeroes; - typedef enum { VIR_DOMAIN_DISK_MODEL_DEFAULT =3D 0, VIR_DOMAIN_DISK_MODEL_VIRTIO, diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h index e07f967814..26cb966194 100644 --- a/src/conf/virconftypes.h +++ b/src/conf/virconftypes.h @@ -1,5 +1,5 @@ /* - * virconftypes.h: struct typedefs to avoid circular inclusion + * virconftypes.h: struct and enum type definitions to avoid circular incl= usion * * Copyright (C) 2006-2019 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange @@ -261,3 +261,40 @@ typedef struct _virDomainXMLOption virDomainXMLOption; typedef struct _virDomainXMLPrivateDataCallbacks virDomainXMLPrivateDataCa= llbacks; typedef struct _virDomainXenbusControllerOpts virDomainXenbusControllerOpt= s; + +typedef enum { + VIR_DOMAIN_DISK_IO_DEFAULT =3D 0, + VIR_DOMAIN_DISK_IO_NATIVE, + VIR_DOMAIN_DISK_IO_THREADS, + VIR_DOMAIN_DISK_IO_URING, + + VIR_DOMAIN_DISK_IO_LAST +} virDomainDiskIo; + +typedef enum { + VIR_DOMAIN_DISK_CACHE_DEFAULT =3D 0, + VIR_DOMAIN_DISK_CACHE_DISABLE, + VIR_DOMAIN_DISK_CACHE_WRITETHRU, + VIR_DOMAIN_DISK_CACHE_WRITEBACK, + VIR_DOMAIN_DISK_CACHE_DIRECTSYNC, + VIR_DOMAIN_DISK_CACHE_UNSAFE, + + VIR_DOMAIN_DISK_CACHE_LAST +} virDomainDiskCache; + +typedef enum { + VIR_DOMAIN_DISK_DISCARD_DEFAULT =3D 0, + VIR_DOMAIN_DISK_DISCARD_UNMAP, + VIR_DOMAIN_DISK_DISCARD_IGNORE, + + VIR_DOMAIN_DISK_DISCARD_LAST +} virDomainDiskDiscard; + +typedef enum { + VIR_DOMAIN_DISK_DETECT_ZEROES_DEFAULT =3D 0, + VIR_DOMAIN_DISK_DETECT_ZEROES_OFF, + VIR_DOMAIN_DISK_DETECT_ZEROES_ON, + VIR_DOMAIN_DISK_DETECT_ZEROES_UNMAP, + + VIR_DOMAIN_DISK_DETECT_ZEROES_LAST +} virDomainDiskDetectZeroes; --=20 2.41.0