From nobody Sun Feb 8 21:11:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1573543708; cv=none; d=zoho.com; s=zohoarc; b=d3IkoCHD4LCuvjQ20ZMy5tVLCBeJxsfFqcKD5zAheGG0euMTRqAwm6llvko6YGQR5husXMdx+wCDmYgfjNkbZ7Eu9mJBIC6fkSR2r48r5JPbTL0jNzAC4Lqq+HEZSt8vBRt2YqCDg2dL2NDVfQOa1pf98tX3GmnFpLuP9AV6Il0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573543708; 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=UAI0m4VSt7HGmk31a/WWlk1qC8yvSg4OCBiAFHI6GLE=; b=CytlzGAjDh/Z/peW1TduMN+F17oiUI5yF2P0ybMsU/xYVmP+3e4EQPp+lvZzgbTflWYlGZ4dlYBP6c8KYL/bV4WGKU+lq5XdAkIsYP31X4omeTOm8u6kJlVOxWKlpoAFGfSQfij43tG6PHVSHPvYwClVVvKhgeVHgY0hVBOqPmc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1573543708913103.04382488080728; Mon, 11 Nov 2019 23:28:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-238-xRh5wWI8Pi27dfjPIMlm-Q-1; Tue, 12 Nov 2019 02:28:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9613800686; Tue, 12 Nov 2019 07:28:21 +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 4628F61075; Tue, 12 Nov 2019 07:28:21 +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 C11D618089CF; Tue, 12 Nov 2019 07:28:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAC7RsUp011348 for ; Tue, 12 Nov 2019 02:27:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 28207BEA63; Tue, 12 Nov 2019 07:27:54 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A75D162671 for ; Tue, 12 Nov 2019 07:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573543707; 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=UAI0m4VSt7HGmk31a/WWlk1qC8yvSg4OCBiAFHI6GLE=; b=WT5NlVTm/CsYfE2Qy39CBlaqfahRKBQYWkANPGRIBrG0ANKkYF+WyZaTcrL2+oiFRx7h4d rxvVhaNWnLRFh7M+cua8gzC7Ng3xhEsm2XAE4zso7Pi3YP0SIu6bkTLysBsmZKc/+ttBS+ 22vySzQWqQcIg1QhbqKa2kbU4aYxJyQ= From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 12 Nov 2019 08:27:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/10] conf: domaincaps: Fix broken attempt at being const-correct 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.12 X-MC-Unique: xRh5wWI8Pi27dfjPIMlm-Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 'virBlahPtr const blah' results into modification to the value of 'blah' triggering compilation error rather than the modification of the virBlah struct the pointer points to. All of the domain capability formatting code was broken in this regard. Signed-off-by: Peter Krempa --- src/conf/domain_capabilities.c | 32 ++++++++++++++++---------------- src/conf/domain_capabilities.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 09bf047647..b9de4bfe5d 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -321,7 +321,7 @@ virDomainCapsEnumClear(virDomainCapsEnumPtr capsEnum) static int virDomainCapsEnumFormat(virBufferPtr buf, - virDomainCapsEnumPtr capsEnum, + const virDomainCapsEnum *capsEnum, const char *capsEnumName, virDomainCapsValToStr valToStr) { @@ -362,7 +362,7 @@ virDomainCapsEnumFormat(virBufferPtr buf, static void virDomainCapsStringValuesFormat(virBufferPtr buf, - virDomainCapsStringValuesPtr values) + const virDomainCapsStringValues *values) { size_t i; @@ -406,7 +406,7 @@ virDomainCapsStringValuesFormat(virBufferPtr buf, static void virDomainCapsLoaderFormat(virBufferPtr buf, - virDomainCapsLoaderPtr loader) + const virDomainCapsLoader *loader) { FORMAT_PROLOGUE(loader); @@ -420,9 +420,9 @@ virDomainCapsLoaderFormat(virBufferPtr buf, static void virDomainCapsOSFormat(virBufferPtr buf, - virDomainCapsOSPtr os) + const virDomainCapsOS *os) { - virDomainCapsLoaderPtr loader =3D &os->loader; + const virDomainCapsLoader *loader =3D &os->loader; FORMAT_PROLOGUE(os); @@ -453,7 +453,7 @@ virDomainCapsCPUCustomFormat(virBufferPtr buf, static void virDomainCapsCPUFormat(virBufferPtr buf, - virDomainCapsCPUPtr cpu) + const virDomainCapsCPU *cpu) { virBufferAddLit(buf, "\n"); virBufferAdjustIndent(buf, 2); @@ -492,7 +492,7 @@ virDomainCapsCPUFormat(virBufferPtr buf, static void virDomainCapsDeviceDiskFormat(virBufferPtr buf, - virDomainCapsDeviceDiskPtr const disk) + const virDomainCapsDeviceDisk *disk) { FORMAT_PROLOGUE(disk); @@ -506,7 +506,7 @@ virDomainCapsDeviceDiskFormat(virBufferPtr buf, static void virDomainCapsDeviceGraphicsFormat(virBufferPtr buf, - virDomainCapsDeviceGraphicsPtr const gra= phics) + const virDomainCapsDeviceGraphics *graph= ics) { FORMAT_PROLOGUE(graphics); @@ -518,7 +518,7 @@ virDomainCapsDeviceGraphicsFormat(virBufferPtr buf, static void virDomainCapsDeviceVideoFormat(virBufferPtr buf, - virDomainCapsDeviceVideoPtr const video) + const virDomainCapsDeviceVideo *video) { FORMAT_PROLOGUE(video); @@ -530,7 +530,7 @@ virDomainCapsDeviceVideoFormat(virBufferPtr buf, static void virDomainCapsDeviceHostdevFormat(virBufferPtr buf, - virDomainCapsDeviceHostdevPtr const hostd= ev) + const virDomainCapsDeviceHostdev *hostdev) { FORMAT_PROLOGUE(hostdev); @@ -546,7 +546,7 @@ virDomainCapsDeviceHostdevFormat(virBufferPtr buf, static void virDomainCapsDeviceRNGFormat(virBufferPtr buf, - virDomainCapsDeviceRNGPtr const rng) + const virDomainCapsDeviceRNG *rng) { FORMAT_PROLOGUE(rng); @@ -575,7 +575,7 @@ virDomainCapsDeviceRNGFormat(virBufferPtr buf, */ static void virDomainCapsFeatureGICFormat(virBufferPtr buf, - virDomainCapsFeatureGICPtr const gic) + const virDomainCapsFeatureGIC *gic) { FORMAT_PROLOGUE(gic); @@ -586,7 +586,7 @@ virDomainCapsFeatureGICFormat(virBufferPtr buf, static void virDomainCapsFeatureSEVFormat(virBufferPtr buf, - virSEVCapabilityPtr const sev) + const virSEVCapability *sev) { if (!sev) { virBufferAddLit(buf, "\n"); @@ -605,7 +605,7 @@ virDomainCapsFeatureSEVFormat(virBufferPtr buf, char * -virDomainCapsFormat(virDomainCapsPtr const caps) +virDomainCapsFormat(const virDomainCaps *caps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *virttype_str =3D virDomainVirtTypeToString(caps->virttype); @@ -669,7 +669,7 @@ virDomainCapsFormat(virDomainCapsPtr const caps) static int -virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr const caps, +virDomainCapsDeviceRNGDefValidate(const virDomainCaps *caps, const virDomainRNGDef *dev) { if (ENUM_VALUE_MISSING(caps->rng.model, dev->model)) { @@ -683,7 +683,7 @@ virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr cons= t caps, int -virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, +virDomainCapsDeviceDefValidate(const virDomainCaps *caps, const virDomainDeviceDef *dev, const virDomainDef *def G_GNUC_UNUSED) { diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index a31458c653..6b27eac11f 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -226,9 +226,9 @@ int virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum, unsigned int *values); void virDomainCapsEnumClear(virDomainCapsEnumPtr capsEnum); -char * virDomainCapsFormat(virDomainCapsPtr const caps); +char * virDomainCapsFormat(const virDomainCaps *caps); -int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, +int virDomainCapsDeviceDefValidate(const virDomainCaps *caps, const virDomainDeviceDef *dev, const virDomainDef *def); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list