From nobody Wed May 14 07:18:51 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 1527700075544471.6739562742156; Wed, 30 May 2018 10:07:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C64533E5F2; Wed, 30 May 2018 17:07:53 +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 2BC1F6017B; Wed, 30 May 2018 17:07:53 +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 AE41718033EF; Wed, 30 May 2018 17:07:52 +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 w4UH6wM0007359 for ; Wed, 30 May 2018 13:06:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6765B2026DEF; Wed, 30 May 2018 17:06:58 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CA1E2026DFD for ; Wed, 30 May 2018 17:06:57 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 30 May 2018 19:06:37 +0200 Message-Id: <8c6a89970328658fccd848abfd65644c2c160a4a.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 13/13] qemu: Delete old unused code for adding objects to qemu 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 30 May 2018 17:07:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/libvirt_private.syms | 1 - src/qemu/qemu_monitor.c | 34 ---------------------------------- src/qemu/qemu_monitor.h | 5 ----- src/util/virqemu.c | 22 ---------------------- src/util/virqemu.h | 4 ---- 5 files changed, 66 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 37922f8c84..6001635916 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2600,7 +2600,6 @@ virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildDriveCommandlineFromJSON; virQEMUBuildObjectCommandlineFromJSON; -virQEMUBuildObjectCommandlineFromJSONType; virQEMUBuildQemuImgKeySecretOpts; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fe8fdfaf9a..876157437a 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3093,40 +3093,6 @@ qemuMonitorAddObject(qemuMonitorPtr mon, } - -/** - * qemuMonitorAddObjectType: - * @mon: Pointer to monitor object - * @type: Type name of object to add - * @objalias: Alias of the new object - * @props: Optional arguments for the given type. The object is consumed a= nd - * should not be referenced by the caller after this function retu= rns. - * - * Returns 0 on success -1 on error. - */ -int -qemuMonitorAddObjectType(qemuMonitorPtr mon, - const char *type, - const char *objalias, - virJSONValuePtr props) -{ - virJSONValuePtr tmpprops =3D NULL; - int ret =3D -1; - - VIR_DEBUG("type=3D%s objalias=3D%s props=3D%p", type, objalias, props); - - if (!(tmpprops =3D qemuMonitorCreateObjectPropsWrap(type, objalias, &p= rops))) - goto cleanup; - - ret =3D qemuMonitorAddObject(mon, &tmpprops, NULL); - - cleanup: - virJSONValueFree(props); - virJSONValueFree(tmpprops); - return ret; -} - - int qemuMonitorDelObject(qemuMonitorPtr mon, const char *objalias) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 0c13391520..d6e5a2239e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -810,11 +810,6 @@ int qemuMonitorAddObject(qemuMonitorPtr mon, virJSONValuePtr *props, char **alias); -int qemuMonitorAddObjectType(qemuMonitorPtr mon, - const char *type, - const char *objalias, - virJSONValuePtr props); - int qemuMonitorDelObject(qemuMonitorPtr mon, const char *objalias); diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 1390b68b86..e16429d80d 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -264,28 +264,6 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBuffe= rPtr buf, } -char * -virQEMUBuildObjectCommandlineFromJSONType(const char *type, - const char *alias, - virJSONValuePtr props) -{ - virBuffer buf =3D VIR_BUFFER_INITIALIZER; - char *ret =3D NULL; - - if (virQEMUBuildObjectCommandlineFromJSONInternal(&buf, type, alias, p= rops) < 0) - goto cleanup; - - if (virBufferCheckError(&buf) < 0) - goto cleanup; - - ret =3D virBufferContentAndReset(&buf); - - cleanup: - virBufferFreeAndReset(&buf); - return ret; -} - - int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, virJSONValuePtr objprops) diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 0a4f4468f2..309be45761 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -43,10 +43,6 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value, virBufferPtr buf, virQEMUBuildCommandLineJSONArrayFormatFunc= array); -char *virQEMUBuildObjectCommandlineFromJSONType(const char *type, - const char *alias, - virJSONValuePtr props); - int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf, virJSONValuePtr objprops); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list