diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-04 13:25:20 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-04 13:25:20 -0600 |
| commit | a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6 (patch) | |
| tree | 1ede9905efbe4429fd8a49efc6d255fc425296ef /hw | |
| parent | 346c1f8b52afca515fecf95d5c215751b73fe9e1 (diff) | |
| parent | bfb82a28752d29291adf932c3a9941e8383203af (diff) | |
| download | focaccia-qemu-a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6.tar.gz focaccia-qemu-a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: spice: drop incorrect vm_change_state_handler() opaque linux-user/syscall.c: remove forward declarations hw/mcf5206: Reduce size of lookup table Remove --sparc_cpu option from the configure list pseries: Remove unneeded include statement (fixes MinGW builds) pc_sysfw: Check for qemu_find_file() failure Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mcf5206.c | 2 | ||||
| -rw-r--r-- | hw/pc_sysfw.c | 4 | ||||
| -rw-r--r-- | hw/spapr_nvram.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/hw/mcf5206.c b/hw/mcf5206.c index fe7a48864f..d8c0059ed6 100644 --- a/hw/mcf5206.c +++ b/hw/mcf5206.c @@ -359,7 +359,7 @@ static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset, /* Internal peripherals use a variety of register widths. This lookup table allows a single routine to handle all of them. */ -static const int m5206_mbar_width[] = +static const uint8_t m5206_mbar_width[] = { /* 000-040 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, /* 040-080 */ 1, 2, 2, 2, 4, 1, 2, 4, 1, 2, 4, 2, 2, 4, 2, 2, diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index 87e1fa961b..7567593a63 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -84,6 +84,10 @@ static void pc_fw_add_pflash_drv(void) bios_name = BIOS_FILENAME; } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!filename) { + error_report("Can't open BIOS image %s", bios_name); + exit(1); + } opts = drive_add(IF_PFLASH, -1, filename, "readonly=on"); diff --git a/hw/spapr_nvram.c b/hw/spapr_nvram.c index f20f6b4fdd..680cdba928 100644 --- a/hw/spapr_nvram.c +++ b/hw/spapr_nvram.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <sys/mman.h> + #include <libfdt.h> #include "sysemu/device_tree.h" |