From: Paolo Bonzini <pbonzini@redhat.com>
To: Kamil Rytarowski <n54@gmx.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2] scsi/esp: Rename the ESP macro to ESP_STATE
Date: Mon, 11 Sep 2017 13:45:41 +0200 [thread overview]
Message-ID: <6c7f02bd-40a8-de0b-ba73-31d54d99905a@redhat.com> (raw)
In-Reply-To: <20170909142116.26816-1-n54@gmx.com>
On 09/09/2017 16:21, Kamil Rytarowski wrote:
> SunOS defines ESP (x86 register) in <sys/regset.h> as 7.
>
> This fixes build on SmartOS (Joyent).
>
> Signed-off-by: Kamil Rytarowski <n54@gmx.com>
> ---
> 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..22c2d91e39 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 ESP_STATE(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 = ESP_STATE(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 = ESP_STATE(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 = ESP_STATE(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 = ESP_STATE(dev);
> esp_hard_reset(&sysbus->esp);
> }
>
>
Queued, thanks.
Paolo
prev parent reply other threads:[~2017-09-11 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-03 16:36 [Qemu-devel] [PATCH] scsi/esp: Rename the ESP symbol to QESP (QEMU ESP) Kamil Rytarowski
2017-09-04 8:04 ` no-reply
2017-09-04 8:21 ` Fam Zheng
2017-09-09 14:08 ` Paolo Bonzini
2017-09-09 14:21 ` [Qemu-devel] [PATCH v2] scsi/esp: Rename the ESP macro to ESP_STATE Kamil Rytarowski
2017-09-11 11:45 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6c7f02bd-40a8-de0b-ba73-31d54d99905a@redhat.com \
--to=pbonzini@redhat.com \
--cc=n54@gmx.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.