From nobody Sun Feb 8 17:36:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1602515647; cv=none; d=zohomail.com; s=zohoarc; b=USwy0V2tP7kvVtnG7796tJRGeqxsR9KJ+BYteelTSpDwR6S3iIoeEru4jv8vs9i++VEgns8YjD0vj7w31YfqySTyyjlycLxU8D5l1XCdb5QTssF75ciIePHqz4OzwIX0yM5E0vcgdYR+StSq64tMyKneEGvodc+El3fC8Rwugm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602515647; 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=5CQZhkQ5t1KD8r44tE3omMbzxB7ErY6WqBGqkNQJ+8M=; b=Y/vLlrGFDMjzLO7ypWuDzKgsiFKZi0MQAZT1VSJNA8DhGSpOdCz1Fr0T8fbZ/isl7dXj4T4aggAihysUjHFJHhHLqZ2QsCRVgbxNCPWYYCSbhBY/WuGJlPCxJV3opmjgHHCQoklfjONRnCZczw+/voAfBLOWoneGNW8xNDOh5kI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602515647585741.7003998254867; Mon, 12 Oct 2020 08:14:07 -0700 (PDT) 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-408-hBBu9dYZNVyPw0pJfGN1OA-1; Mon, 12 Oct 2020 11:14:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0A57805EFA; Mon, 12 Oct 2020 15:13:58 +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 AD50873665; Mon, 12 Oct 2020 15:13:58 +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 D7112183D021; Mon, 12 Oct 2020 15:13:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09CFDtsE014614 for ; Mon, 12 Oct 2020 11:13:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id C502B5C22D; Mon, 12 Oct 2020 15:13:55 +0000 (UTC) Received: from lindworm.usersys.redhat.com (unknown [10.34.247.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9F435C225 for ; Mon, 12 Oct 2020 15:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602515646; 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=5CQZhkQ5t1KD8r44tE3omMbzxB7ErY6WqBGqkNQJ+8M=; b=hXPDyYJz/QeB8LA6eCp1ALo3o1m7b3NDWxGPIvQ4oUkkJ2KYGFbdxm989rpaXYoAmtGwkh +l1CMdQk7RgckOI3pz2ZaXH/Q9EwN+KoKl2yenDGfCFkrYYDPEUWGM0M9RSb6kPIcMAUcR eRvjqb2+2TxzdzPwW9jtPp2kWXL+yjw= X-MC-Unique: hBBu9dYZNVyPw0pJfGN1OA-1 From: Pino Toscano To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] vmx: hide private helpers Date: Mon, 12 Oct 2020 17:13:45 +0200 Message-Id: <20201012151348.4067266-2-ptoscano@redhat.com> In-Reply-To: <20201012151348.4067266-1-ptoscano@redhat.com> References: <20201012151348.4067266-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move all the private helpers for parsing and formatting of domain elements as private static functions in vmx.c, to avoid using them directly. Signed-off-by: Pino Toscano --- src/libvirt_vmx.syms | 12 --------- src/vmx/vmx.c | 62 ++++++++++++++++++++++++++++++++------------ src/vmx/vmx.h | 44 ------------------------------- 3 files changed, 46 insertions(+), 72 deletions(-) diff --git a/src/libvirt_vmx.syms b/src/libvirt_vmx.syms index e673923bd9..9d723c6de4 100644 --- a/src/libvirt_vmx.syms +++ b/src/libvirt_vmx.syms @@ -7,19 +7,7 @@ virVMXConvertToUTF8; virVMXDomainXMLConfInit; virVMXEscapeHex; virVMXFormatConfig; -virVMXFormatDisk; -virVMXFormatEthernet; -virVMXFormatFloppy; -virVMXFormatParallel; -virVMXFormatSerial; -virVMXFormatVNC; virVMXParseConfig; -virVMXParseDisk; -virVMXParseEthernet; -virVMXParseParallel; -virVMXParseSCSIController; -virVMXParseSerial; -virVMXParseVNC; virVMXUnescapeHex; =20 # Let emacs know we want case-insensitive sorting diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index e0777a9ddd..70f4d78e8a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -521,6 +521,35 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, "UNUSED virtio-non-transitional", ); =20 +static int virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); +static int virVMXParseSCSIController(virConfPtr conf, int controller, bool= *present, + int *virtualDev); +static int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlop= t, + virConfPtr conf, int device, int busType, + int controllerOrBus, int unit, virDomainDiskDef= Ptr *def, + virDomainDefPtr vmdef); +static int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSD= efPtr *def); +static int virVMXParseEthernet(virConfPtr conf, int controller, virDomainN= etDefPtr *def); +static int virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, + virDomainChrDefPtr *def); +static int virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int po= rt, + virDomainChrDefPtr *def); +static int virVMXParseSVGA(virConfPtr conf, virDomainVideoDefPtr *def); + +static int virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffe= r); +static int virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, + virBufferPtr buffer); +static int virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, + virBufferPtr buffer, bool floppy_present[2]); +static int virVMXFormatFileSystem(virDomainFSDefPtr def, int number, + virBufferPtr buffer); +static int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, + virBufferPtr buffer, int virtualHW_version= ); +static int virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, + virBufferPtr buffer); +static int virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, + virBufferPtr buffer); +static int virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer); =20 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *= * * * Helpers @@ -1852,7 +1881,7 @@ virVMXParseConfig(virVMXContext *ctx, =20 =20 =20 -int +static int virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def) { bool enabled =3D false; @@ -1916,7 +1945,7 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefP= tr *def) =20 =20 =20 -int +static int virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int *virtualDev) { @@ -1986,7 +2015,7 @@ virVMXParseSCSIController(virConfPtr conf, int contro= ller, bool *present, =20 =20 =20 -int +static int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfP= tr conf, int device, int busType, int controllerOrBus, int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef) @@ -2406,7 +2435,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con =20 =20 =20 -int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *= def) +static int +virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *def) { int result =3D -1; char prefix[48] =3D ""; @@ -2493,7 +2523,7 @@ int virVMXParseFileSystem(virConfPtr conf, int number= , virDomainFSDefPtr *def) =20 =20 =20 -int +static int virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *d= ef) { int result =3D -1; @@ -2723,7 +2753,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, = virDomainNetDefPtr *def) =20 =20 =20 -int +static int virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def) { @@ -2905,7 +2935,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf= , int port, =20 =20 =20 -int +static int virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port, virDomainChrDefPtr *def) { @@ -3007,7 +3037,7 @@ virVMXParseParallel(virVMXContext *ctx, virConfPtr co= nf, int port, =20 =20 =20 -int +static int virVMXParseSVGA(virConfPtr conf, virDomainVideoDefPtr *def) { int result =3D -1; @@ -3448,7 +3478,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tionPtr xmlopt, virDomainDe =20 =20 =20 -int +static int virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) { virDomainGraphicsListenDefPtr glisten; @@ -3492,7 +3522,7 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBuffe= rPtr buffer) return 0; } =20 -int +static int virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferPtr buffer) { @@ -3639,7 +3669,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= Ptr def, return 0; } =20 -int +static int virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferPtr buffer, bool floppy_present[2]) { @@ -3696,7 +3726,7 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskD= efPtr def, =20 =20 =20 -int +static int virVMXFormatFileSystem(virDomainFSDefPtr def, int number, virBufferPtr buf= fer) { if (def->type !=3D VIR_DOMAIN_FS_TYPE_MOUNT) { @@ -3721,7 +3751,7 @@ virVMXFormatFileSystem(virDomainFSDefPtr def, int num= ber, virBufferPtr buffer) =20 =20 =20 -int +static int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, virBufferPtr buffer, int virtualHW_version) { @@ -3877,7 +3907,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int cont= roller, =20 =20 =20 -int +static int virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, virBufferPtr buffer) { @@ -3983,7 +4013,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDe= fPtr def, =20 =20 =20 -int +static int virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, virBufferPtr buffer) { @@ -4035,7 +4065,7 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChr= DefPtr def, =20 =20 =20 -int +static int virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer) { unsigned long long vram; diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index 7069a50b6e..df5d39157b 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -88,28 +88,6 @@ virDomainDefPtr virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx); =20 -int virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); - -int virVMXParseSCSIController(virConfPtr conf, int controller, bool *prese= nt, - int *virtualDev); - -int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, - virConfPtr conf, int device, int busType, - int controllerOrBus, int unit, virDomainDiskDefPtr *de= f, - virDomainDefPtr vmdef); - -int virVMXParseFileSystem(virConfPtr conf, int number, virDomainFSDefPtr *= def); - -int virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPt= r *def); - -int virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, - virDomainChrDefPtr *def); - -int virVMXParseParallel(virVMXContext *ctx, virConfPtr conf, int port, - virDomainChrDefPtr *def); - -int virVMXParseSVGA(virConfPtr conf, virDomainVideoDefPtr *def); - =20 =20 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *= * * @@ -118,25 +96,3 @@ int virVMXParseSVGA(virConfPtr conf, virDomainVideoDefP= tr *def); =20 char *virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDefPtr def, int virtualHW_version); - -int virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); - -int virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, - virBufferPtr buffer); - -int virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, - virBufferPtr buffer, bool floppy_present[2]); - -int virVMXFormatFileSystem(virDomainFSDefPtr def, int number, - virBufferPtr buffer); - -int virVMXFormatEthernet(virDomainNetDefPtr def, int controller, - virBufferPtr buffer, int virtualHW_version); - -int virVMXFormatSerial(virVMXContext *ctx, virDomainChrDefPtr def, - virBufferPtr buffer); - -int virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, - virBufferPtr buffer); - -int virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer); --=20 2.26.2