diff options
| -rw-r--r-- | qemu/hw/pc.c | 2 | ||||
| -rw-r--r-- | qemu/hw/pxa2xx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index a698ba54..388d6572 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -347,7 +347,7 @@ void bochs_bios_init(void) /* Generate an initial boot sector which sets state and jump to a specified vector */ -static int generate_bootsect(uint32_t gpr[8], uint16_t segs[6], uint16_t ip) +static void generate_bootsect(uint32_t gpr[8], uint16_t segs[6], uint16_t ip) { uint8_t bootsect[512], *p; int i; diff --git a/qemu/hw/pxa2xx.c b/qemu/hw/pxa2xx.c index 913c0bd7..03f4b473 100644 --- a/qemu/hw/pxa2xx.c +++ b/qemu/hw/pxa2xx.c @@ -1294,7 +1294,7 @@ struct pxa2xx_i2c_s *pxa2xx_i2c_init(target_phys_addr_t base, { int iomemtype; struct pxa2xx_i2c_s *s = (struct pxa2xx_i2c_s *) - qemu_mallocz(sizeof(struct pxa2xx_i2c_s)); + i2c_slave_init(i2c_init_bus(), 0, sizeof(struct pxa2xx_i2c_s)); s->base = base; s->irq = irq; |