From nobody Sun Feb 8 21:32:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1548279208671404.31616697323534; Wed, 23 Jan 2019 13:33:28 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC18B80511; Wed, 23 Jan 2019 21:33:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A8E458B2; Wed, 23 Jan 2019 21:33:26 +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 5151C3F605; Wed, 23 Jan 2019 21:33:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0NLXMe0032297 for ; Wed, 23 Jan 2019 16:33:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 68961BA8B; Wed, 23 Jan 2019 21:33:22 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-120-34.rdu2.redhat.com [10.10.120.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E6D9BA50; Wed, 23 Jan 2019 21:33:21 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 23 Jan 2019 16:32:35 -0500 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 07/25] conf: Add virDomainDeviceSetData 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 23 Jan 2019 21:33:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This is essentially a wrapper for easily setting the variable name in virDomainDeviceDef that matches its associated VIR_DOMAIN_DEVICE_TYPE. Signed-off-by: Cole Robinson --- src/conf/domain_conf.c | 93 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + 3 files changed, 97 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcdb6b0a3a..8af1a4ae73 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3702,6 +3702,99 @@ virDomainSkipBackcompatConsole(virDomainDefPtr def, } =20 =20 +/** + * virDomainDeviceSetData + * @device: virDomainDeviceDefPtr with ->type filled in + * @data: *DefPtr data for a device. Ex: virDomainDiskDefPtr + * + * Set the data.X variable for the device->type value. Basically + * a mapping of virDomainDeviceType to the associated name in + * the virDomainDeviceDef union + */ +void +virDomainDeviceSetData(virDomainDeviceDefPtr device, + void *devicedata) +{ + switch ((virDomainDeviceType) device->type) { + case VIR_DOMAIN_DEVICE_DISK: + device->data.disk =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_NET: + device->data.net =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_SOUND: + device->data.sound =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_HOSTDEV: + device->data.hostdev =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_VIDEO: + device->data.video =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + device->data.controller =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_GRAPHICS: + device->data.graphics =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_SMARTCARD: + device->data.smartcard =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_CHR: + device->data.chr =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_INPUT: + device->data.input =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_FS: + device->data.fs =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_WATCHDOG: + device->data.watchdog =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_MEMBALLOON: + device->data.memballoon =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_RNG: + device->data.rng =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_NVRAM: + device->data.nvram =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_HUB: + device->data.hub =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_SHMEM: + device->data.shmem =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_TPM: + device->data.tpm =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_PANIC: + device->data.panic =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_MEMORY: + device->data.memory =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + device->data.redirdev =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_VSOCK: + device->data.vsock =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_IOMMU: + device->data.iommu =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_LEASE: + device->data.lease =3D devicedata; + break; + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_LAST: + break; + } +} + + enum { DOMAIN_DEVICE_ITERATE_ALL_CONSOLES =3D 1 << 0, DOMAIN_DEVICE_ITERATE_GRAPHICS =3D 1 << 1 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 218aa4dd94..536b02ad3d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2937,6 +2937,9 @@ virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomai= nDeviceDefPtr src, virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device= ); void virDomainTPMDefFree(virDomainTPMDefPtr def); =20 +void virDomainDeviceSetData(virDomainDeviceDefPtr device, + void *devicedata); + typedef int (*virDomainDeviceInfoCallback)(virDomainDefPtr def, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6f4809a68a..89b8ca3b4f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -307,6 +307,7 @@ virDomainDeviceDefParse; virDomainDeviceFindSCSIController; virDomainDeviceGetInfo; virDomainDeviceInfoIterate; +virDomainDeviceSetData; virDomainDeviceTypeToString; virDomainDeviceValidateAliasForHotplug; virDomainDiskBusTypeToString; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list