From patchwork Fri Dec 20 18:23:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11306121 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDF58109A for ; Fri, 20 Dec 2019 18:24:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 AA7062146E for ; Fri, 20 Dec 2019 18:24:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="C8NrqhkV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA7062146E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iiMwH-0005Fq-Gn; Fri, 20 Dec 2019 18:23:49 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iiMwG-0005FQ-05 for xen-devel@lists.xenproject.org; Fri, 20 Dec 2019 18:23:48 +0000 X-Inumbo-ID: dcff1234-2355-11ea-93c3-12813bfff9fa Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id dcff1234-2355-11ea-93c3-12813bfff9fa; Fri, 20 Dec 2019 18:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1576866227; x=1608402227; h=from:to:cc:subject:date:message-id:mime-version; bh=M8Rb7Uj4mlvACH9CECpyK0cEnNQ74FfuC/oyjBVrOV8=; b=C8NrqhkVGXj/NSIqDgglPGTyaIxxLihF4Mdv253qcbPo3J3ng876weng 00DqK+TY8WmIEYS2KenYDVYP6x2ofj8ermXZiBwqv5TQJ0ZoBm6b51qCf TkVnaQdGZTZ4cbW4Nw5MooZ8AWfqSN/+A2EFGk/ZJi51FOS+uO4GMM94O k=; IronPort-SDR: lmsM4W1C/Iy7qxAV8M8OiLtl1Wy+IXSQaL56WP0Xy91l93L3vcjCyQ73hnAse69opkFx6ckpeP TyEmuYJVA3ng== X-IronPort-AV: E=Sophos;i="5.69,336,1571702400"; d="scan'208";a="8537850" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 20 Dec 2019 18:23:47 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com (Postfix) with ESMTPS id 132D6C1090; Fri, 20 Dec 2019 18:23:45 +0000 (UTC) Received: from EX13D05EUC003.ant.amazon.com (10.43.164.207) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Fri, 20 Dec 2019 18:23:45 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D05EUC003.ant.amazon.com (10.43.164.207) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 20 Dec 2019 18:23:43 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 20 Dec 2019 18:23:41 +0000 From: Pawel Wieczorkiewicz To: Date: Fri, 20 Dec 2019 18:23:39 +0000 Message-ID: <20191220182339.9094-1-wipawel@amazon.de> X-Mailer: git-send-email 2.16.5 MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH] livepatch: Fix typos and other errors in tests Makefile X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Pawel Wieczorkiewicz , Ross Lagerwall , Julien Grall , Konrad Rzeszutek Wilk Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There was a bunch of typos (s/actions/action/) as well as one missing config.h target dependency. Also, xen_expectation target has unnecessary cycle dependency. Signed-off-by: Pawel Wieczorkiewicz Tested-by: Julien Grall Reviewed-by: Konrad Rzeszutek Wilk --- xen/test/livepatch/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile index ebb343c314..82a076aac1 100644 --- a/xen/test/livepatch/Makefile +++ b/xen/test/livepatch/Makefile @@ -166,29 +166,31 @@ xen_prepost_hooks_fail.o: config.h $(LIVEPATCH_PREPOST_HOOKS_FAIL): xen_prepost_hooks_fail.o xen_hello_world_func.o note.o xen_note.o $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_PREPOST_HOOKS_FAIL) $^ -xen_actions_hooks.o: config.h +xen_action_hooks.o: config.h .PHONY: $(LIVEPATCH_ACTION_HOOKS) $(LIVEPATCH_ACTION_HOOKS): xen_action_hooks.o xen_hello_world_func.o note.o xen_note.o $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS) $^ +xen_action_hooks_nofunc.o: config.h + .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOFUNC) $(LIVEPATCH_ACTION_HOOKS_NOFUNC): xen_action_hooks_nofunc.o note.o xen_note.o $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_NOFUNC) $^ -xen_actions_hooks_marker.o: config.h +xen_action_hooks_marker.o: config.h .PHONY: $(LIVEPATCH_ACTION_HOOKS_MARKER) $(LIVEPATCH_ACTION_HOOKS_MARKER): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_MARKER) $^ -xen_actions_hooks_noapply.o: config.h +xen_action_hooks_noapply.o: config.h .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOAPPLY) $(LIVEPATCH_ACTION_HOOKS_NOAPPLY): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_NOAPPLY) $^ -xen_actions_hooks_norevert.o: config.h +xen_action_hooks_norevert.o: config.h .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOREVERT) $(LIVEPATCH_ACTION_HOOKS_NOREVERT): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o @@ -198,7 +200,7 @@ EXPECT_BYTES_COUNT := 8 CODE_GET_EXPECT=$(shell $(OBJDUMP) -d --insn-width=1 $(1) | sed -n -e '/<'$(2)'>:$$/,/^$$/ p' | tail -n +2 | head -n $(EXPECT_BYTES_COUNT) | awk '{$$0=$$2; printf "%s", substr($$0,length-1)}' | sed 's/.\{2\}/0x&,/g' | sed 's/^/{/;s/,$$/}/g') .PHONY: expect_config.h expect_config.h: EXPECT_BYTES=$(call CODE_GET_EXPECT,$(BASEDIR)/xen-syms,xen_extra_version) -expect_config.h: xen_expectations.o +expect_config.h: (set -e; \ echo "#define EXPECT_BYTES $(EXPECT_BYTES)"; \ echo "#define EXPECT_BYTES_COUNT $(EXPECT_BYTES_COUNT)") > $@