diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide.c | 2 | ||||
| -rw-r--r-- | hw/ppc_newworld.c | 2 | ||||
| -rw-r--r-- | hw/ppc_oldworld.c | 2 | ||||
| -rw-r--r-- | hw/rtl8139.c | 4 | ||||
| -rw-r--r-- | hw/sysbus.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/hw/ide.c b/hw/ide.c index 2eea43835c..6cf04a6b89 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -4411,7 +4411,7 @@ PCMCIACardState *dscm1xxxx_init(BlockDriverState *bdrv) md->card.cis = dscm1xxxx_cis; md->card.cis_len = sizeof(dscm1xxxx_cis); - ide_init2(md->ide, bdrv, 0, qemu_allocate_irqs(md_set_irq, md, 1)[0]); + ide_init2(md->ide, bdrv, NULL, qemu_allocate_irqs(md_set_irq, md, 1)[0]); md->ide->is_cf = 1; md->ide->mdata_size = METADATA_SIZE; md->ide->mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 2a350eb8c5..cfeddabbdd 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -195,7 +195,7 @@ static void ppc_core99_init (ram_addr_t ram_size, kernel_size = load_elf(kernel_filename, kernel_base, NULL, &lowaddr, NULL); if (kernel_size > 0 && lowaddr != KERNEL_LOAD_ADDR) { kernel_size = load_elf(kernel_filename, (2 * kernel_base) - lowaddr, - NULL, 0, NULL); + NULL, NULL, NULL); } if (kernel_size < 0) kernel_size = load_aout(kernel_filename, kernel_base, diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 7931f44088..06e014195e 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -227,7 +227,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, kernel_size = load_elf(kernel_filename, kernel_base, NULL, &lowaddr, NULL); if (kernel_size > 0 && lowaddr != KERNEL_LOAD_ADDR) { kernel_size = load_elf(kernel_filename, (2 * kernel_base) - lowaddr, - NULL, 0, NULL); + NULL, NULL, NULL); } if (kernel_size < 0) kernel_size = load_aout(kernel_filename, kernel_base, diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 91165dbff4..fcd6d956db 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -2090,12 +2090,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) #define ETH_MTU 1500 /* ip packet header */ - ip_header *ip = 0; + ip_header *ip = NULL; int hlen = 0; uint8_t ip_protocol = 0; uint16_t ip_data_len = 0; - uint8_t *eth_payload_data = 0; + uint8_t *eth_payload_data = NULL; size_t eth_payload_len = 0; int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); diff --git a/hw/sysbus.c b/hw/sysbus.c index 814d347037..269be772b7 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -32,7 +32,7 @@ struct BusInfo system_bus_info = { void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq) { assert(n >= 0 && n < dev->num_irq); - dev->irqs[n] = 0; + dev->irqs[n] = NULL; if (dev->irqp[n]) { *dev->irqp[n] = irq; } |