Fix some SLIRP warnings

[qemu.git] / hw / etraxfs.c

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 4f93cd81c3afce0c389a9b450ced300bf6772f49..01569bc1b995194af7399e8cb8c96f41a15b7768 100644 (file)
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -42,7 +42,6 @@ static void main_cpu_reset(void *opaque)
     CPUState *env = opaque;
     cpu_reset(env);
 
-    env->pregs[PR_CCS] &= ~I_FLAG;
     env->pc = bootstrap_pc;
 }
 
@@ -83,7 +82,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     phys_flash = qemu_ram_alloc(FLASH_SIZE);
     i = drive_get_index(IF_PFLASH, 0, 0);
     pflash_cfi02_register(0x0, phys_flash,
-                          drives_table[i].bdrv, (64 * 1024),
+                          i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024),
                           FLASH_SIZE >> 16,
                           1, 2, 0x0000, 0x0000, 0x0000, 0x0000,
                           0x555, 0x2aa);
@@ -95,9 +94,13 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
     }
 
     /* Add the two ethernet blocks.  */
-    eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000);
-    if (nb_nics > 1)
-        eth[1] = etraxfs_eth_init(&nd_table[1], env, pic->irq + 26, 0x30036000);
+    nd_table[0].model = nd_table[0].model ? nd_table[0].model : "fseth";
+    eth[0] = etraxfs_eth_init(&nd_table[0], env, pic->irq + 25, 0x30034000, 1);
+    if (nb_nics > 1) {
+        nd_table[1].model = nd_table[1].model ? nd_table[1].model : "fseth";
+        eth[1] = etraxfs_eth_init(&nd_table[1], env,
+                                  pic->irq + 26, 0x30036000, 2);
+    }
 
     /* The DMA Connector block is missing, hardwire things for now.  */
     etraxfs_dmac_connect_client(etraxfs_dmac, 0, eth[0]);