From 80bb4653bb6103f6600dbaa6071c47b760b9fd9c Mon Sep 17 00:00:00 2001 From: espes Date: Tue, 21 Apr 2015 01:59:23 -0700 Subject: [PATCH] don't ignore a broken bootrom path --- hw/xbox/xbox_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/xbox/xbox_pci.c b/hw/xbox/xbox_pci.c index 7e44fcd385..bf86315b6e 100644 --- a/hw/xbox/xbox_pci.c +++ b/hw/xbox/xbox_pci.c @@ -300,12 +300,12 @@ static int xbox_lpc_initfn(PCIDevice *d) const char *bootrom_file = qemu_opt_get(machine_opts, "bootrom"); if (!bootrom_file) bootrom_file = "mcpx.bin"; - char *filename; int rc, fd = -1; - if (bootrom_file - && (filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bootrom_file))) { - s->bootrom_size = get_image_size(filename); + if (bootrom_file) { + char *filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bootrom_file); + assert(filename); + s->bootrom_size = get_image_size(filename); if (s->bootrom_size != 512) { fprintf(stderr, "MCPX bootrom should be 512 bytes, got %d\n", s->bootrom_size); @@ -313,7 +313,7 @@ static int xbox_lpc_initfn(PCIDevice *d) } fd = open(filename, O_RDONLY | O_BINARY); - assert(fd != -1); + assert(fd >= 0); rc = read(fd, s->bootrom_data, s->bootrom_size); assert(rc == s->bootrom_size);