Message ID | 1552323335-46779-17-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q+Dx0xNR"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44J4Mn5wVzz9s4V for <incoming@patchwork.ozlabs.org>; Tue, 12 Mar 2019 04:09:23 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1h3OQS-0000bv-Lv for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2019 13:09:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODZ-000757-DO for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODY-000359-7X for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:01 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:38941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h3ODW-00031z-8x for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:55:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id p8so4334262wrq.6 for <qemu-devel@nongnu.org>; Mon, 11 Mar 2019 09:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=bPmWozRpF+GF+4OY5aOPErBQNJZqUrJaP5ePOQdGsu0=; b=Q+Dx0xNRSJ7+qOiyiaxarctGiziuxaV4pHzoGwIGE1fc8t3/rXvFvILfoY+1iZLXA/ hnnVVBegD8Y9QULJsmeE69/kA4cU+IV8niV51F9Kxjb2g269kvEF5J7B19zgZdLkbOXm L+W/usbbSui5L1oHcBgw8O3HyPur5Mq2II7d1ivpI7+aVFDmJJJQ6NGnhQEr6PvTQ0tG TGHrRJsKHDrXJcVkIP4wnnRqnUUpS/l4vZ36UHPJnjwoYmO5zKw/oSx3bK7CRA8xANxj crUijyiDxbi8cl0H1mhSLjYcPPxCiLztnA4nnPpvypxJriS8QV3dZtIJXUyuoqE0QMIv ICoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=bPmWozRpF+GF+4OY5aOPErBQNJZqUrJaP5ePOQdGsu0=; b=q4mGiWVVh/7+f/Sl6vphT9daHToDWU4VGTZgXaKS7sARjg1dodruxinDgkwy5S4ta4 5WZFA/oBccQ8Dw2eePhjNrELJJ/agA/lKvLHpIp40qoiCUTaQ/v790ChfEHBsguztmxv FlGLZKpFI5D4RZGM3SpjtuhBQsSPPbg11OBZVWYflIefA4MppsEqgaxwVpLEgo7u3toF vd0YDaBwQMXH1E1FsxtgikxS8isGLghilRJ21/+h6LGNtsnpUhpDSb0XihNevofcGO0D ZElMNfQTWMwO5gu3xRzXTGXXzUHfMDqmHGw7klRjs527HEaLittL7+g1xc6KWmADwbLc xsiA== X-Gm-Message-State: APjAAAUbN+R/TNl2wcwZrM895DcZJIYAq9f3VKMBW4mf5lB9oGb6tT/D 9nQ5R1BvDg3xJenqjTVnKHsxcW/o X-Google-Smtp-Source: APXvYqyBvQxpGMoBs8mAnol40HMP/8eFgliTQZZXBoeXkI6Xs4uEfGsMUULxfq65dnn73lzQyXmkWQ== X-Received: by 2002:adf:f089:: with SMTP id n9mr14810488wro.313.1552323355924; Mon, 11 Mar 2019 09:55:55 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id e12sm6484836wrs.91.2019.03.11.09.55.54 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 09:55:55 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 17:55:20 +0100 Message-Id: <1552323335-46779-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> References: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL v2 16/31] build: remove unnecessary assignments from Makefile.target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/31] memory: Do not update coalesced IO range in the case of NOP
|
expand
|
diff --git a/Makefile.objs b/Makefile.objs index acc53aa..31a84b7 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -13,7 +13,7 @@ authz-obj-y = authz/ ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img -block-obj-y += nbd/ +block-obj-y = nbd/ block-obj-y += block.o blockjob.o job.o block-obj-y += block/ scsi/ block-obj-y += qemu-io-cmds.o diff --git a/Makefile.target b/Makefile.target index a458506..441ace6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -175,9 +175,6 @@ endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y) all-obj-y := $(obj-y) -block-obj-y := -common-obj-y := -chardev-obj-y := include $(SRC_PATH)/Makefile.objs dummy := $(call unnest-vars,.., \ authz-obj-y \
It is only necessary to clear block-obj-y because Makefile.objs uses "+=" instead of "="; fix that and remove the assignment. The other variables need not be cleared at all. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Makefile.objs | 2 +- Makefile.target | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)