From patchwork Sun Sep 3 16:36:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Rytarowski X-Patchwork-Id: 809332 Return-Path: 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=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xlf82043Rz9t2f for ; Mon, 4 Sep 2017 02:49:06 +1000 (AEST) Received: from localhost ([::1]:59890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doY52-0003GF-6X for incoming@patchwork.ozlabs.org; Sun, 03 Sep 2017 12:49:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doY4X-0003CS-3b for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:48:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1doY4S-0002mK-GG for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:48:33 -0400 Received: from mout.gmx.net ([212.227.15.18]:57408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1doY4S-0002lf-6x for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:48:28 -0400 Received: from localhost.localdomain ([185.58.161.191]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MILxX-1dm5Mb0NNX-0049fd; Sun, 03 Sep 2017 18:48:18 +0200 From: Kamil Rytarowski To: pbonzini@redhat.com Date: Sun, 3 Sep 2017 18:36:15 +0200 Message-Id: <20170903163615.15562-1-n54@gmx.com> X-Mailer: git-send-email 2.14.1 X-Provags-ID: V03:K0:vvkU9BuGUfRO+WZ+B34HlgdLxGn9NI9qV9RrBWIa/sE9tyzRbJN 6J6LD1d9/oX5ewwxRkXBTYCZsLk3tz4WZsLJEniTp+LcYs38J2p8W/Tw3+lI9zusA2ys24M rlTZipiL9629Q1nhe89PhdwHko0H5e/JAexhBRvzEmH3z05+WJkAsxPoGClGQas7gVyipQZ o8RLVL9tHEFYcaM17txRw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3agAeba9PWc=:zEL9/kieCuzHJW5elw2Fn4 +elUeAOYQkiMFj7gnmzgOtyhz+zx2UJRe22ZxJ39T0DN7beXRu3E7Rltz4kSqNxVGhLnPHvMw iaCWq1A3xE0uwpVP4KhgWH1e4uimJR9N2CObPd1JTTZJLsIDHFIsaV/Hcex1aPR0Sa5b0TNKL v02UMkff2GppLn6ZCmzKLHq63D+RgVm+CjW6dgfoyoAcftKP+xEp0u9/4dmRWGdSFAu73c5rN yHiBv+algVGZHrqWoljCh+F6FZxxkSmpWZxEu6xjzg5SoDE4llG07imO7yozMy3C5hpj6C1Pk pOodSpD+4O87fQJPBSEChfd0nyosWixyHENGb4fn+RNIpA5iat91M+0wA56jTE7NH1rw5Zlew joxi8Z9eU+8yRLHkI2MBHQoRR3RtE5ni1RGmJjYevM8eWlxaN9U1gncCyCkRKM6Cz4YZ6OCAF WOCZPj63sHZ1tOjrFb/0XmN50VfIIvQiwhQExIY1gsuZndbSC4mSCjDELP/mmx16VWbDqvW3g f+7YQsRBOvFlVDMI2jxPJSoPtKRx8ZY9j6ZrgJVQHPh3Fg7j3zE9YUDBq7z5q9kpqse57lFpA ewPUEQZwc+VBmDgMLH+iC85qO96Hct2kO6Xnm9UEebqdnne3bP1T1brC9K6PUkiBd3wdD7PY5 dTUGuUz1PpTphuKLlOpUFsvLSssZQJC8Raqr6s7FMV8uN638eq/Aw6sMHMRRLh6TOaO+Rgero Tq7PG63LAnZk4nFPWvRz8ukMfRdC7uB62fRFY+VUfzTarQNEKOULY1XkqrMC4Y55OMlggGpg6 2b7eOwPQRyFl00+XxMnsruP0VLLFQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.18 Subject: [Qemu-devel] [PATCH] scsi/esp: Rename the ESP symbol to QESP (QEMU ESP) 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 , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" SunOS defines ESP (x86 register) in as 7. This fixes build on SmartOS (Joyent). Signed-off-by: Kamil Rytarowski --- 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 eee831efeb..38ddfd6715 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -593,7 +593,7 @@ const VMStateDescription vmstate_esp = { }; #define TYPE_ESP "esp" -#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP) +#define QESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP) typedef struct { /*< private >*/ @@ -644,7 +644,7 @@ void esp_init(hwaddr espaddr, int it_shift, ESPState *esp; dev = qdev_create(NULL, TYPE_ESP); - sysbus = ESP(dev); + sysbus = QESP(dev); esp = &sysbus->esp; esp->dma_memory_read = dma_memory_read; esp->dma_memory_write = dma_memory_write; @@ -672,7 +672,7 @@ static const struct SCSIBusInfo esp_scsi_info = { static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) { - SysBusESPState *sysbus = ESP(opaque); + SysBusESPState *sysbus = QESP(opaque); ESPState *s = &sysbus->esp; 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 = SYS_BUS_DEVICE(dev); - SysBusESPState *sysbus = ESP(dev); + SysBusESPState *sysbus = QESP(dev); ESPState *s = &sysbus->esp; sysbus_init_irq(sbd, &s->irq); @@ -706,7 +706,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) static void sysbus_esp_hard_reset(DeviceState *dev) { - SysBusESPState *sysbus = ESP(dev); + SysBusESPState *sysbus = QESP(dev); esp_hard_reset(&sysbus->esp); }