From nobody Thu May 15 10:11:00 2025 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 1527700040230631.822298590101; Wed, 30 May 2018 10:07:20 -0700 (PDT) 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 67968C0E07E9; Wed, 30 May 2018 17:07:18 +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 233F217004; Wed, 30 May 2018 17:07:18 +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 7F1924CA89; Wed, 30 May 2018 17:07:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4UH6pDx007288 for ; Wed, 30 May 2018 13:06:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id A042C2026DEF; Wed, 30 May 2018 17:06:51 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4542A2026DFD for ; Wed, 30 May 2018 17:06:51 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 30 May 2018 19:06:26 +0200 Message-Id: <936708b455b5e3595fe2da74f8dd41d98456a733.1527699462.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/13] qemu: monitor: Rename qemuMonitorAddObject to qemuMonitorAddObjectType 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: , MIME-Version: 1.0 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.31]); Wed, 30 May 2018 17:07:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The function adds the object of a certain type. Change the name so that we make room for the generic function. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 50 ++++++++++++++++++++++++---------------------= ---- src/qemu/qemu_monitor.c | 10 +++++----- src/qemu/qemu_monitor.h | 8 ++++---- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3aa694de12..922603a7a3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5819,7 +5819,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); - rc =3D qemuMonitorAddObject(priv->mon, "iothread", alias, NULL); + rc =3D qemuMonitorAddObjectType(priv->mon, "iothread", alias, NULL); exp_niothreads++; if (rc < 0) goto exit_monitor; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7ce427be0d..10735622d1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -487,28 +487,28 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, qemuDomainObjEnterMonitor(driver, vm); if (secobjProps) { - rv =3D qemuMonitorAddObject(priv->mon, "secret", secinfo->s.aes.al= ias, - secobjProps); - secobjProps =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, "secret", secinfo->s.ae= s.alias, + secobjProps); + secobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; secobjAdded =3D true; } if (encobjProps) { - rv =3D qemuMonitorAddObject(priv->mon, "secret", encinfo->s.aes.al= ias, - encobjProps); - encobjProps =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, "secret", encinfo->s.ae= s.alias, + encobjProps); + encobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; encobjAdded =3D true; } if (prmgrProps) { - rv =3D qemuMonitorAddObject(priv->mon, "pr-manager-helper", - disk->src->pr->mgralias, - prmgrProps); - prmgrProps =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, "pr-manager-helper", + disk->src->pr->mgralias, + prmgrProps); + prmgrProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; prmgrAdded =3D true; @@ -1465,17 +1465,17 @@ qemuDomainAddTLSObjects(virQEMUDriverPtr driver, return -1; if (secAlias) { - rc =3D qemuMonitorAddObject(priv->mon, "secret", - secAlias, *secProps); - *secProps =3D NULL; /* qemuMonitorAddObject consumes */ + rc =3D qemuMonitorAddObjectType(priv->mon, "secret", + secAlias, *secProps); + *secProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rc < 0) goto error; } if (tlsAlias) { - rc =3D qemuMonitorAddObject(priv->mon, "tls-creds-x509", - tlsAlias, *tlsProps); - *tlsProps =3D NULL; /* qemuMonitorAddObject consumes */ + rc =3D qemuMonitorAddObjectType(priv->mon, "tls-creds-x509", + tlsAlias, *tlsProps); + *tlsProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rc < 0) goto error; } @@ -2037,8 +2037,8 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, goto exit_monitor; chardevAdded =3D true; - rv =3D qemuMonitorAddObject(priv->mon, type, objAlias, props); - props =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, type, objAlias, props); + props =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; objAdded =3D true; @@ -2168,8 +2168,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, goto removedef; qemuDomainObjEnterMonitor(driver, vm); - rv =3D qemuMonitorAddObject(priv->mon, backendType, objalias, props); - props =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, backendType, objalias, prop= s); + props =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; objAdded =3D true; @@ -2407,9 +2407,9 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr drive= r, qemuDomainObjEnterMonitor(driver, vm); if (secobjProps) { - rv =3D qemuMonitorAddObject(priv->mon, "secret", secinfo->s.aes.al= ias, - secobjProps); - secobjProps =3D NULL; /* qemuMonitorAddObject consumes */ + rv =3D qemuMonitorAddObjectType(priv->mon, "secret", secinfo->s.ae= s.alias, + secobjProps); + secobjProps =3D NULL; /* qemuMonitorAddObjectType consumes */ if (rv < 0) goto exit_monitor; secobjAdded =3D true; @@ -2780,8 +2780,8 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, &shmem->server.chr) < 0) goto exit_monitor; } else { - if (qemuMonitorAddObject(priv->mon, "memory-backend-file", - memAlias, props) < 0) { + if (qemuMonitorAddObjectType(priv->mon, "memory-backend-file", + memAlias, props) < 0) { props =3D NULL; goto exit_monitor; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 43f1d2f816..77ad47cb74 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2992,7 +2992,7 @@ qemuMonitorAddDeviceArgs(qemuMonitorPtr mon, /** - * qemuMonitorAddObject: + * qemuMonitorAddObjectType: * @mon: Pointer to monitor object * @type: Type name of object to add * @objalias: Alias of the new object @@ -3002,10 +3002,10 @@ qemuMonitorAddDeviceArgs(qemuMonitorPtr mon, * Returns 0 on success -1 on error. */ int -qemuMonitorAddObject(qemuMonitorPtr mon, - const char *type, - const char *objalias, - virJSONValuePtr props) +qemuMonitorAddObjectType(qemuMonitorPtr mon, + const char *type, + const char *objalias, + virJSONValuePtr props) { VIR_DEBUG("type=3D%s objalias=3D%s props=3D%p", type, objalias, props); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c28db1a52b..77a26d4a8a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -797,10 +797,10 @@ int qemuMonitorAddDeviceWithFd(qemuMonitorPtr mon, int qemuMonitorDelDevice(qemuMonitorPtr mon, const char *devalias); -int qemuMonitorAddObject(qemuMonitorPtr mon, - const char *type, - const char *objalias, - virJSONValuePtr props); +int qemuMonitorAddObjectType(qemuMonitorPtr mon, + const char *type, + const char *objalias, + virJSONValuePtr props); int qemuMonitorDelObject(qemuMonitorPtr mon, const char *objalias); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list