From nobody Sat Feb 7 06:55:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505825967679897.4492462115969; Tue, 19 Sep 2017 05:59:27 -0700 (PDT) Received: from localhost ([::1]:42692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duI7a-0003Bn-RL for importer@patchew.org; Tue, 19 Sep 2017 08:59:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHfN-0004As-Qy for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHfH-0005Rm-Ud for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:17 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHfH-0005RD-Oy for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:11 -0400 Received: by mail-wm0-x241.google.com with SMTP id r136so3738282wmf.3 for ; Tue, 19 Sep 2017 05:30:11 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id k18sm1292878wmd.22.2017.09.19.05.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qFWXCi8DiI8dwa0Q5Jys4V6A+x2aYZNi09lm6+u24Uc=; b=He1Ks7X6a7FuZeB8NT5YXbDO+AAAJuTrJ1LtnM69lop+iwsxi1m8C0Ln3XmmYqbaZU gIiNP6qANZbPyHsmyeWdY7/MHEd6bYBD84tP8j7GEWAAHm/qgb4bDHyOBa8wGut6AlTq bHzhP5A/HH1tTF9B9f/XzEil5tR3JSICdDtx8EQkz39IVwGpF5qZfNRw/GKZJcC0YpiN iDI1oZHbXIpqKBqwUoUGO2M0aX74SnlvdKMB9Qk1RXjTPU9ePTD3788m/KEf3Vf0UGUu qlLo2a/JqdhGZQdzrbsEodS40bDXTA3Z18otsxeiDwEbfnLxtTXjPjwx7qvUdSgmxeRy vdug== 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:cc:subject:date:message-id :in-reply-to:references; bh=qFWXCi8DiI8dwa0Q5Jys4V6A+x2aYZNi09lm6+u24Uc=; b=RIbU/wjKE1m3WGBDAx0dZnJMRlTBWeuAp4WJZ2jHBeVASuve+G3LiAszOxUdvhnmVO 7yyAJcQDA48UrSJJKZIjKI0i5I1ULrnjVOQYea2OSz5wIwdCxAsx6Ezv+7PxkW4izaIA E3GHC/rVCWLWiUjpPFaOQrJRRiNaW2zaHCbbfbkdaiC///21QHgFC7FAXhHOxc24KywA n7CZgFiBUjRkEPuHV1Q2t+NjCmf3BK7j9gVW9skXO3gpwrjiC9/NWALhceGn+BoYDkwA YqTD5JYzCTKRpDfbJFis183qq2KqMXme8CmFPNp1A9Qn5wV/GfERYhUVEgVecwPJxQgt UA1w== X-Gm-Message-State: AHPjjUhaEaunS0p+kr4rfEBLFd8Finr7lLO9UfoE4okb6YjBWsf2e8KV EV/2oJ6ln+bfbbAofktVYxBeYHa4 X-Google-Smtp-Source: AOwi7QBVg+fpiz3pY2CFxTZr8fG7AAQ2grROi1xKyOua1/Q4waiyJL0qA+5PcPt4mXYEVS33PpnZiA== X-Received: by 10.28.220.85 with SMTP id t82mr940979wmg.95.1505824210542; Tue, 19 Sep 2017 05:30:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 14:29:13 +0200 Message-Id: <1505824179-21541-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> References: <1505824179-21541-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:400c:c09::241 Subject: [Qemu-devel] [PULL 24/50] scsi/esp: Rename the ESP macro to ESP_STATE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kamil Rytarowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kamil Rytarowski SunOS defines ESP (x86 register) in as 7. This fixes build on SmartOS (Joyent). Signed-off-by: Kamil Rytarowski Message-Id: <20170909142116.26816-1-n54@gmx.com> Signed-off-by: Paolo Bonzini --- hw/scsi/esp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index eee831e..22c2d91 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -593,7 +593,7 @@ const VMStateDescription vmstate_esp =3D { }; =20 #define TYPE_ESP "esp" -#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP) +#define ESP_STATE(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP) =20 typedef struct { /*< private >*/ @@ -644,7 +644,7 @@ void esp_init(hwaddr espaddr, int it_shift, ESPState *esp; =20 dev =3D qdev_create(NULL, TYPE_ESP); - sysbus =3D ESP(dev); + sysbus =3D ESP_STATE(dev); esp =3D &sysbus->esp; esp->dma_memory_read =3D dma_memory_read; esp->dma_memory_write =3D dma_memory_write; @@ -672,7 +672,7 @@ static const struct SCSIBusInfo esp_scsi_info =3D { =20 static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) { - SysBusESPState *sysbus =3D ESP(opaque); + SysBusESPState *sysbus =3D ESP_STATE(opaque); ESPState *s =3D &sysbus->esp; =20 switch (irq) { @@ -688,7 +688,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq= , int level) static void sysbus_esp_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - SysBusESPState *sysbus =3D ESP(dev); + SysBusESPState *sysbus =3D ESP_STATE(dev); ESPState *s =3D &sysbus->esp; =20 sysbus_init_irq(sbd, &s->irq); @@ -706,7 +706,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error = **errp) =20 static void sysbus_esp_hard_reset(DeviceState *dev) { - SysBusESPState *sysbus =3D ESP(dev); + SysBusESPState *sysbus =3D ESP_STATE(dev); esp_hard_reset(&sysbus->esp); } =20 --=20 1.8.3.1