diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | hw/mcf5206.c | 2 | ||||
| -rw-r--r-- | hw/pc_sysfw.c | 4 | ||||
| -rw-r--r-- | hw/spapr_nvram.c | 2 | ||||
| -rw-r--r-- | linux-user/syscall.c | 8 | ||||
| -rw-r--r-- | ui/spice-core.c | 5 |
6 files changed, 11 insertions, 11 deletions
diff --git a/configure b/configure index 1e9fd868af..837a84aff0 100755 --- a/configure +++ b/configure @@ -1096,7 +1096,6 @@ echo " --fmod-inc path to FMOD includes" echo " --oss-lib path to OSS library" echo " --enable-uname-release=R Return R for uname -r in usermode emulation" echo " --cpu=CPU Build for host CPU [$cpu]" -echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" echo " --disable-uuid disable uuid support" echo " --enable-uuid enable uuid support" echo " --disable-vde disable support for vde network" 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" diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e99adab492..3167a87549 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -36,6 +36,9 @@ #include <sys/time.h> #include <sys/stat.h> #include <sys/mount.h> +#include <sys/file.h> +#include <sys/fsuid.h> +#include <sys/personality.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/mman.h> @@ -581,11 +584,6 @@ _syscall4(int, sys_prlimit64, pid_t, pid, int, resource, struct host_rlimit64 *, old_limit) #endif -extern int personality(int); -extern int flock(int, int); -extern int setfsuid(int); -extern int setfsgid(int); - /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */ #ifdef TARGET_ARM static inline int regpairs_aligned(void *cpu_env) { diff --git a/ui/spice-core.c b/ui/spice-core.c index 3e44779107..d83de2a46e 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -709,7 +709,7 @@ void qemu_spice_init(void) qemu_spice_input_init(); qemu_spice_audio_init(); - qemu_add_vm_change_state_handler(vm_change_state_handler, &spice_server); + qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); g_free(x509_key_file); g_free(x509_cert_file); @@ -736,8 +736,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin) */ spice_server = spice_server_new(); spice_server_init(spice_server, &core_interface); - qemu_add_vm_change_state_handler(vm_change_state_handler, - &spice_server); + qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); } return spice_server_add_interface(spice_server, sin); |