From nobody Mon Feb 9 00:56:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571736482; cv=none; d=zoho.com; s=zohoarc; b=DsyUbX5OvXgU/UhyIif9f4S4jnPnR6uBhMke4N78MdW0tkljlHmtw9KBrR8NFmg9JHYb4mElkKGpBV7Y81BO5nXamla9DFwq1fCpxZCo1oDSids9Gj3VCzd440z/5XW/FsRj0Xlo91GO3DOsQaVtmqePcQEojds/8S4eX/SH2vI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571736482; 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=IpdaPzQQUlG8fQ7M/FFhii7pJg9YY8YRMBZ8G9288KE=; b=LevIuEYoNN3xC1m6eqBow5ay6kjrGqxutXH5VAWblVBFf72Md32QgfxBJ6mx/vcl8+hyeHvBrgiKNEnGJ5x16uvKbrG/1RLrX5KlMkSP85W8R7h+D4LIJDH8bODOGqvWz7QTlzjzW7ZJFghLhvWM1HZjJGTgSeqoM45PE7RDs2Y= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157173648282648.9499224291601; Tue, 22 Oct 2019 02:28:02 -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-248-0xUio6vKP1uIcoXiK2CSRQ-1; Tue, 22 Oct 2019 05:27:50 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 226EE1800D6A; Tue, 22 Oct 2019 09:27:45 +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 D7B6860BBF; Tue, 22 Oct 2019 09:27:44 +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 AAB6618089DC; Tue, 22 Oct 2019 09:27:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9L812rp002423 for ; Mon, 21 Oct 2019 04:01:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 93C2D10016EB; Mon, 21 Oct 2019 08:01:02 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 128CF1001B11 for ; Mon, 21 Oct 2019 08:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571736481; 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=IpdaPzQQUlG8fQ7M/FFhii7pJg9YY8YRMBZ8G9288KE=; b=HIYFnMlFKAVJSqVgRmt6Sidi7fC7fz2ON8SaP+YeZO1fG82m60uU+0mPaUOdo0hwz/w4yA LbTmrt5T+dRRSN6Ue5cbDSTHxg5GQA1F8k7sY59qgOrjqfBQrwJN3ropjcN4YdyHbvCZ1I jipYsjy3e8q30YzWE/dRspvLwihq5AE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 10:00:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/25] remote: unify rpc server dispatch generated files 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.11 X-MC-Unique: 0xUio6vKP1uIcoXiK2CSRQ-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" Our naming was not consistent. Use the protocol name as prefix for all generated files. Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- build-aux/syntax-check.mk | 6 +++--- po/POTFILES | 2 +- src/remote/Makefile.inc.am | 12 ++++++------ src/remote/remote_daemon_dispatch.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..c88c1991f4 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2163,14 +2163,14 @@ group-qemu-caps: # sc_po_check can fail if generated files are not built first sc_po_check: \ $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \ - $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \ + $(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h \ $(srcdir)/src/remote/remote_client_bodies.h \ $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ $(srcdir)/src/admin/admin_client.h $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h: $(srcdir)/src/remote/= remote_protocol.x $(MAKE) -C src remote/remote_daemon_dispatch_stubs.h -$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/src/re= mote/qemu_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h +$(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/src/remote/qe= mu_protocol.x + $(MAKE) -C src remote/qemu_daemon_dispatch_stubs.h $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_p= rotocol.x $(MAKE) -C src remote/remote_client_bodies.h $(srcdir)/src/admin/admin_server_dispatch_stubs.h: $(srcdir)/src/admin/adm= in_protocol.x diff --git a/po/POTFILES b/po/POTFILES index 9385fc4e15..8a6df49eeb 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -146,12 +146,12 @@ src/qemu/qemu_monitor_json.c src/qemu/qemu_monitor_text.c src/qemu/qemu_process.c src/qemu/qemu_qapi.c +src/remote/qemu_daemon_dispatch_stubs.h src/remote/remote_client_bodies.h src/remote/remote_daemon.c src/remote/remote_daemon_config.c src/remote/remote_daemon_dispatch.c src/remote/remote_daemon_dispatch_stubs.h -src/remote/remote_daemon_dispatch_qemu_stubs.h src/remote/remote_daemon_stream.c src/remote/remote_driver.c src/rpc/virkeepalive.c diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 071d19d26a..acea567abe 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -20,8 +20,8 @@ REMOTE_DRIVER_SOURCES =3D \ =20 REMOTE_DAEMON_GENERATED =3D \ remote/remote_daemon_dispatch_stubs.h \ - remote/remote_daemon_dispatch_lxc_stubs.h \ - remote/remote_daemon_dispatch_qemu_stubs.h \ + remote/lxc_daemon_dispatch_stubs.h \ + remote/qemu_daemon_dispatch_stubs.h \ $(NULL) =20 REMOTE_DAEMON_SOURCES =3D \ @@ -438,17 +438,17 @@ remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/= gendispatch.pl \ --mode=3Dserver remote REMOTE $(REMOTE_PROTOCOL) \ > $(srcdir)/remote/remote_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_lxc_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver lxc LXC $(LXC_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h + > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h =20 -remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/rpc/gendispatch.pl \ +remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=3Dserver qemu QEMU $(QEMU_PROTOCOL) \ - > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h + > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h =20 libvirtd.8.in: remote/libvirtd.pod $(AM_V_GEN)$(POD2MAN) --section=3D8 $< $@-t1 && \ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 56a46a13be..3d834e2718 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -131,8 +131,8 @@ remoteGetStorageConn(virNetServerClientPtr client); =20 =20 #include "remote_daemon_dispatch_stubs.h" -#include "remote_daemon_dispatch_qemu_stubs.h" -#include "remote_daemon_dispatch_lxc_stubs.h" +#include "qemu_daemon_dispatch_stubs.h" +#include "lxc_daemon_dispatch_stubs.h" =20 =20 /* Prototypes */ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list