From nobody Sun May 19 09:08:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1591663613; cv=none; d=zohomail.com; s=zohoarc; b=eRSApJknAITXovESWnUDH5pW8O0/QT4Jri8J08fV9JLgPr2voqREHnkdl/NFkrkOC/yWNFFeP2OjEr0KUSkKrRwDfpSPXCHQZukIn0A6pNMZxUN6PPg9KAuZwFA2y024j1bM2bnLC+xZf3jZGBKxp+fpEqeCe7GikeKy4HvYmSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591663613; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=2MH33teEvtTSMqTQvgxpiXqvwB99oLGJJjl2PL+fpN4=; b=mYIA5o7Y3/oWF9R1B5brxRkrnwyLL8Duv2+5rUbPTy1YPo20CIv1H1UKzAiNKauHoMjGlT7lKDJhudjFf60eqi1avjwhI9N5dxXXTKVrDeqaNJ+Bg0S2PLnGzK2AqSplowudalVY1X/XBTC8WuCXObpO6emhoaKWSrz/SnKkBvg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159166361323526.534391411057527; Mon, 8 Jun 2020 17:46:53 -0700 (PDT) Received: from localhost ([::1]:53230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiSPi-0001Qp-TN for importer@patchew.org; Mon, 08 Jun 2020 20:46:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiSOV-0000qc-0E for qemu-devel@nongnu.org; Mon, 08 Jun 2020 20:45:35 -0400 Received: from mx7.zte.com.cn ([202.103.147.169]:64341 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiSOQ-00010T-LQ for qemu-devel@nongnu.org; Mon, 08 Jun 2020 20:45:34 -0400 Received: from mse-fl2.zte.com.cn (unknown [10.30.14.239]) by Forcepoint Email with ESMTPS id 8D8C31F3473D10F26082 for ; Tue, 9 Jun 2020 08:45:20 +0800 (CST) Received: from notes_smtp.zte.com.cn (notessmtp.zte.com.cn [10.30.1.239]) by mse-fl2.zte.com.cn with ESMTP id 0590jJHk020096 for ; Tue, 9 Jun 2020 08:45:19 +0800 (GMT-8) (envelope-from wang.yi59@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2020060908452979-3868041 ; Tue, 9 Jun 2020 08:45:29 +0800 From: Yi Wang To: qemu-devel@nongnu.org Subject: [PATCH] Makefile: Install qemu-[qmp/ga]-ref.* into the directory "interop" Date: Tue, 9 Jun 2020 08:47:50 +0800 Message-Id: <1591663670-47712-1-git-send-email-wang.yi59@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2020-06-09 08:45:29, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2020-06-09 08:45:21, Serialize complete at 2020-06-09 08:45:21 X-MAIL: mse-fl2.zte.com.cn 0590jJHk020096 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=202.103.147.169; envelope-from=wang.yi59@zte.com.cn; helo=mxct.zte.com.cn X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 20:45:21 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wang.yi59@zte.com.cn, Liao Pingfang , wang.liang82@zte.com.cn, xue.zhihong@zte.com.cn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Liao Pingfang We need install qemu-[qmp/ga]-ref.* files into the subdirectory of qemu doc= s: interop. If we visit the following address and click the link to qemu-qmp-ref.html: https://www.qemu.org/docs/master/interop/bitmaps.html#basic-qmp-usage It will report following error: " Not Found The requested URL /docs/master/interop/qemu-qmp-ref.html was not found on t= his server. " Signed-off-by: Liao Pingfang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 10 ++++++---- docs/index.html.in | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 40e4f76..49dbe7a 100644 --- a/Makefile +++ b/Makefile @@ -879,8 +879,9 @@ install-sphinxdocs: sphinxdocs install-doc: $(DOCS) install-sphinxdocs $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)/= interop" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/i= nterop" ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man= 1" @@ -898,8 +899,9 @@ ifdef CONFIG_TRACE_SYSTEMTAP endif ifneq (,$(findstring qemu-ga,$(TOOLS))) $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)= /man8" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/interop" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)/i= nterop" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/in= terop" $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" endif endif diff --git a/docs/index.html.in b/docs/index.html.in index e9a1603..6736fa4 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -12,8 +12,8 @@
  • Tools Guide
  • System Emulation Management= and Interoperability Guide
  • System Emulation Guest Hardwa= re Specifications
    • -
  • QMP Reference Manual
    • -
  • Guest Agent Protocol Referenc= e
    • +
  • QMP Reference Manual=
    • +
  • Guest Agent Protocol = Reference
    • --=20 2.9.5