openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi/esp: Rename the ESP macro to ESP_STATE 

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>
Message-Id: <20170909142116.26816-1-n54@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Kamil Rytarowski 2017-09-09 16:21:16 +02:00 committed by Paolo Bonzini
parent a16878d224
commit 80cac47e95
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/scsi/esp.c
View File

@ -593,7 +593,7 @@ const VMStateDescription vmstate_esp = {
}; };
#define TYPE_ESP "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 { typedef struct {
/*< private >*/ /*< private >*/
@ -644,7 +644,7 @@ void esp_init(hwaddr espaddr, int it_shift,
ESPState *esp; ESPState *esp;
dev = qdev_create(NULL, TYPE_ESP); dev = qdev_create(NULL, TYPE_ESP);
sysbus = ESP(dev); sysbus = ESP_STATE(dev);
esp = &sysbus->esp; esp = &sysbus->esp;
esp->dma_memory_read = dma_memory_read; esp->dma_memory_read = dma_memory_read;
esp->dma_memory_write = dma_memory_write; 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) 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; ESPState *s = &sysbus->esp;
switch (irq) { 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) static void sysbus_esp_realize(DeviceState *dev, Error **errp)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
SysBusESPState *sysbus = ESP(dev); SysBusESPState *sysbus = ESP_STATE(dev);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
sysbus_init_irq(sbd, &s->irq); 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) static void sysbus_esp_hard_reset(DeviceState *dev)
{ {
SysBusESPState *sysbus = ESP(dev); SysBusESPState *sysbus = ESP_STATE(dev);
esp_hard_reset(&sysbus->esp); esp_hard_reset(&sysbus->esp);
} }