From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CB9AC433DF for ; Mon, 15 Jun 2020 16:13:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 441292078A for ; Mon, 15 Jun 2020 16:13:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XfN4s6Vz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 441292078A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkrk0-0002E8-DS for qemu-devel@archiver.kernel.org; Mon, 15 Jun 2020 12:13:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkrjE-0001ZE-0j for qemu-devel@nongnu.org; Mon, 15 Jun 2020 12:12:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49256 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jkrjB-00039f-MH for qemu-devel@nongnu.org; Mon, 15 Jun 2020 12:12:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592237572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ko1KrOE+/ewbMu5m1pZCerV3BD24wxFHyxapXL1bllo=; b=XfN4s6Vzs7RsJy1s6+fp9cyA3inRFqhg/5BZ1vyIiv0LV4L8eWlN0par0zzh9m6JS5aP0D VNVdoOxgnHVkN2ceSFUZoZUQ+fhfRfN6t0eyGSzZF4NIyoFr8PG95ybJ32niAyIaBLKZ7V JO91/yJsUwli6Ky0ZjNX/mt4mMVhQB0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-0bq9tNyaOnSO36DHAHthYQ-1; Mon, 15 Jun 2020 12:12:48 -0400 X-MC-Unique: 0bq9tNyaOnSO36DHAHthYQ-1 Received: by mail-wr1-f71.google.com with SMTP id c14so7168233wrw.11 for ; Mon, 15 Jun 2020 09:12:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ko1KrOE+/ewbMu5m1pZCerV3BD24wxFHyxapXL1bllo=; b=Zi09jUVeZy4gscrCA0+1XrTMs3bxLfOWcvWUGB1IcCNdurw4oJzWWjISvtJBD8kQse gsat29voCw/GHFizuZ4Ix26CtW/RviD4O+L0HKBC0OUTC/z+H3x+v9Q5z1heFSmjWUD5 nwetjx+3/BgzTOIIGuSFD7an57aNxO0gF2Yec9haets2QPnEtNT9++OPjEo1yCQypDzm /WZgdBdOvA1suAdIo2kl3dR/LYhk9bCd9LkEyhnc3MOJuMhFzTt6EYsfgxM5Rvfz21sO mak69WfMTEBLn7brqoI0EV6RaR2iYmyg33tTXHV/l5OXbCxl1E02B098HmY2mq2AcO5N uXFA== X-Gm-Message-State: AOAM5328Pbz+tKEOAiWilNI/o0eWkEobz3Cbe8gryjT90jJtOMJoeRDR kr7XjauBgT5CEWQ08PihG1YJCEOpucZwo/SbQup2VDQdizmIlJ7wycecfXKOBG1nSMB43M9p1vx uy5yLaRpd6NqKHWA= X-Received: by 2002:adf:bac8:: with SMTP id w8mr28417629wrg.47.1592237567377; Mon, 15 Jun 2020 09:12:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiQOXjqQQ1aVV/DMBBwdCBUIXzmVfkbVaKfgy1+7guKzFN4POZrpQ2VrFAH3n/uZqI3s32oA== X-Received: by 2002:adf:bac8:: with SMTP id w8mr28417601wrg.47.1592237567022; Mon, 15 Jun 2020 09:12:47 -0700 (PDT) Received: from [192.168.178.58] ([151.48.99.33]) by smtp.gmail.com with ESMTPSA id w1sm53537wmi.13.2020.06.15.09.12.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Jun 2020 09:12:46 -0700 (PDT) Subject: Re: [PATCH] Makefile: Install qemu-[qmp/ga]-ref.* into the directory "interop" To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Yi Wang , qemu-devel@nongnu.org References: <1591663670-47712-1-git-send-email-wang.yi59@zte.com.cn> <94e456a8-0b4f-e1fd-7baa-8f81f36c6872@redhat.com> From: Paolo Bonzini Message-ID: <31290c21-01bb-e191-a166-1595f4fc8549@redhat.com> Date: Mon, 15 Jun 2020 18:12:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <94e456a8-0b4f-e1fd-7baa-8f81f36c6872@redhat.com> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 01:17:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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: xue.zhihong@zte.com.cn, QEMU Trivial , wang.liang82@zte.com.cn, Liao Pingfang Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 09/06/20 06:28, Philippe Mathieu-Daudé wrote: > On 6/9/20 2:47 AM, Yi Wang wrote: >> From: Liao Pingfang >> >> We need install qemu-[qmp/ga]-ref.* files into the subdirectory of qemu docs: 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 this server. >> " >> > > Fixes: d59157ea058b5 ('docs: create interop/ subdirectory') > Reviewed-by: Philippe Mathieu-Daudé > >> Signed-off-by: Liao Pingfang >> --- >> 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)/interop" >> ifdef CONFIG_POSIX >> $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" >> $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1" >> @@ -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)/interop" >> + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)/interop" >> $(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 Hardware Specifications
    • >> -
  • QMP Reference Manual
    • >> -
  • Guest Agent Protocol Reference
    • >> +
  • QMP Reference Manual
    • >> +
  • Guest Agent Protocol Reference
    • >> >> >> >> > Queued, thanks. Paolo