Message ID | 20191022133134.14487-5-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | a1f9a907eabcc0910e8dd06c5e87559fe97301b6 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4873383ill; Tue, 22 Oct 2019 06:34:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFKTmPQaxcH84UVP8oui2B+gtqQrOiEE9qvrDJEN9V2whR3ltMvvTESlxIwdu4UAhCheA7 X-Received: by 2002:a37:4c57:: with SMTP id z84mr2993865qka.208.1571751289604; Tue, 22 Oct 2019 06:34:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571751289; cv=none; d=google.com; s=arc-20160816; b=btOiSGqNlqubYMFOXIy0+TdRd88SuCStWd9B7FMQwsNQXjPER7rYJpEwmxzCkjtvXw 5euhM0R1scTjPeZwJHyTAd7soZnevDFbDATBiQ1Qliku8p/osV4G20b9/6KKszN4f6WL SK4gRsQzdJMbmqp4h8MjE9WhCv0on7Olb5kjgsQfsXF1JGWUZVkw20yXtbVlqJYsjYs0 1JMP0BdcrKqQ7E/CpEefnY0EAFpaMs6hrD9kLhFhWAPX3bNo2cFg2r9WxhTTSG4LOZ71 dIcpJ4Rkjiba6V6v1dbzkT79ya+1HHxZln7k2YErWwITPXroTcEoNQoWzG74cB0OjGAU UGtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RtZ6eDxdSnhFwcSQva9Dw3k0dUzdlcR17D7YwApDOzk=; b=rsvlfEvxlzYM4RCc13p3LeA9GBfDxWrW6eVs0z3heTaleUFkjwWJrkq5JD6Hfl86WD gu5lYS14wqtdX0OawOlvxQkCQTjm88x4v9cPjl/O8g7uCzpXwXh888sZSuGIfS6IYrzn QIN7uxDrjnGqTIcBQICEIz/OOgXaprmxOIAXU6AbNy6kypLfC2XCV1zXfHAw+pUs5qqO YmhTyuWjXHOAhwDcelunFs81xvpv7ZtEdDlbOVTCGq1xNol9e2PDHmnrjZG2fqPvRRgG jVXJWe8cVzZGmrqGnk0EC5MAzGCq6IHOmAg18PzGOCZsi3AenMbitY8sgjtFbiY4zc/M bZwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q5yOAHES; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y28si16352895qve.164.2019.10.22.06.34.49 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 06:34:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q5yOAHES; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1iMuJE-0004r9-KT for patch@linaro.org; Tue, 22 Oct 2019 09:34:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36627) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1iMuGS-0002Ie-PI for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:31:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iMuGN-0001AU-Qw for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:31:56 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iMuGN-0001A9-Kt for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:31:51 -0400 Received: by mail-wr1-x444.google.com with SMTP id r1so8296786wrs.9 for <qemu-devel@nongnu.org>; Tue, 22 Oct 2019 06:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RtZ6eDxdSnhFwcSQva9Dw3k0dUzdlcR17D7YwApDOzk=; b=Q5yOAHESFi/+2tpWoVFf1kKsk/j5mTzwL/GivZQCeaR7PneZez9LJhKxDRC3fgCPlO rB/zQaL71aTCyMa5bS9fyX3ETD8ukOGSjBO+MeF9g34Gi/bw+2LmM4nYiCjIhfrEylBR NoOBqm3D030JuaECNjxEi3zp52RoSCZTxgbs2xcweVib1Eijo4b6KXQ+pLdl9Sl88M7g mUFo2pzM/Ssjiu+AR0k3VJaZP5J0Cwt4d2ycbxLTFJp8cDdQIncUmS9jFOQwb9voIImO WJxV5D1sKYG5YaAuVor6v3OLQsnnPd4mbchKUw2JqAYR6IRvg3x5Ozd8dZhFLr8YpIbL 7U9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RtZ6eDxdSnhFwcSQva9Dw3k0dUzdlcR17D7YwApDOzk=; b=U99EkRLUQdhaeOrvBdPMjoOFNgPVuWaC9HB/CxWJQrhtG93eV1kLjt9ZsKbI9YaA0z E7k0VKGA29bqrybS4bE9L/qNihbKNBKSQrKSFtuoYnGSKS0AfTOjiwfIYtK1XTrjXIiz oETPuCfin9Hplv99weSq60iLgOaSAiajd6a458oK0QNnzD2olPmU2N0wl5+VytvjHP3J iZZ3/2JTXj/lv4KAHE0sfE4PyTYGlMSOJ5ZATLspPVzyUPbRg5HAUCabsCeFBjuJe0CP CjPVoCFFL1H+Vqapyr9Ib64zb0MPoFo9nNArBAIgEYfelmSsGgDwpc64VcDvB9hu7djU Z4xw== X-Gm-Message-State: APjAAAX2kY4RLMxNQL9ih5+Y4TyIPkHqU6IV6ilBnhndK+Lz6Y3P9+K3 lM5SmctkG2Yq96KQlr30D6QtR8sd6hg= X-Received: by 2002:a5d:4ace:: with SMTP id y14mr3654128wrs.131.1571751109762; Tue, 22 Oct 2019 06:31:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.31.47 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:31:47 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 04/41] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() Date: Tue, 22 Oct 2019 14:30:57 +0100 Message-Id: <20191022133134.14487-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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: <https://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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index fdf97d1800f..2bf11f788c3 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -237,7 +237,7 @@ static void arm_mptimer_reset(DeviceState *dev) } } -static void arm_mptimer_init_with_bh(Object *obj) +static void arm_mptimer_init(Object *obj) { ARMMPTimerState *s = ARM_MPTIMER(obj); @@ -319,7 +319,7 @@ static const TypeInfo arm_mptimer_info = { .name = TYPE_ARM_MPTIMER, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ARMMPTimerState), - .instance_init = arm_mptimer_init_with_bh, + .instance_init = arm_mptimer_init, .class_init = arm_mptimer_class_init, };