mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
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>
This commit is contained in:
commit
a4c7ecd8ca
6 changed files with 11 additions and 11 deletions
|
@ -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,
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue