diff --git a/hw/pc.c b/hw/pc.c
index a698ba546b..388d657294 100644
--- a/hw/pc.c
+++ b/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/hw/pxa2xx.c b/hw/pxa2xx.c
index 913c0bd764..03f4b47316 100644
--- a/hw/pxa2xx.c
+++ b/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;