diff --git a/hw/xbox/chihiro.c b/hw/xbox/chihiro.c
index 4ff0affe61..4cf955b420 100644
--- a/hw/xbox/chihiro.c
+++ b/hw/xbox/chihiro.c
@@ -248,7 +248,7 @@ static void chihiro_init(QEMUMachineInitArgs *args)
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     };
 
-    QemuOpts *machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
+    QemuOpts *machine_opts = qemu_opts_find(qemu_find_opts("machine"), NULL);
     if (machine_opts) {
         const char *mediaboard_rom_file =
             qemu_opt_get(machine_opts, "mediaboard_rom");
diff --git a/hw/xbox/xbox.c b/hw/xbox/xbox.c
index 1511f8b779..fba780f32e 100644
--- a/hw/xbox/xbox.c
+++ b/hw/xbox/xbox.c
@@ -119,7 +119,7 @@ bios_error:
 
 /* mostly from pc_init1 */
 void xbox_init_common(QEMUMachineInitArgs *args,
-                      uint8_t *default_eeprom,
+                      const uint8_t *default_eeprom,
                       ISABus **out_isa_bus)
 {
     int i;
@@ -329,7 +329,7 @@ static void xbox_init(QEMUMachineInitArgs *args)
     };
 
     ISABus *isa_bus;
-    xbox_init_common(args, (uint8_t*)eeprom, &isa_bus);
+    xbox_init_common(args, eeprom, &isa_bus);
 }
 
 static QEMUMachine xbox_machine = {
diff --git a/hw/xbox/xbox.h b/hw/xbox/xbox.h
index e2f32a8aa9..9c0c6b1346 100644
--- a/hw/xbox/xbox.h
+++ b/hw/xbox/xbox.h
@@ -26,7 +26,7 @@
 #define MAX_IDE_BUS 2
 
 void xbox_init_common(QEMUMachineInitArgs *args,
-                      uint8_t *default_eeprom,
+                      const uint8_t *default_eeprom,
                       ISABus **out_isa_bus);
 
 #endif
\ No newline at end of file
diff --git a/hw/xbox/xbox_pci.c b/hw/xbox/xbox_pci.c
index 52dc33e3e8..2f8f0b459e 100644
--- a/hw/xbox/xbox_pci.c
+++ b/hw/xbox/xbox_pci.c
@@ -295,7 +295,7 @@ static int xbox_lpc_initfn(PCIDevice *d)
      * can't load it through loader.c because it overlaps with the bios...
      * We really should just commandeer the entire top 16Mb.
      */
-    QemuOpts *machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
+    QemuOpts *machine_opts = qemu_opts_find(qemu_find_opts("machine"), NULL);
     if (machine_opts) {
         const char *bootrom_file = qemu_opt_get(machine_opts, "bootrom");