mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source 
* 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:
Anthony Liguori 2013-01-04 13:25:20 -06:00
commit a4c7ecd8ca
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -1096,7 +1096,6 @@ echo " --fmod-inc path to FMOD includes"
echo " --oss-lib path to OSS library" echo " --oss-lib path to OSS library"
echo " --enable-uname-release=R Return R for uname -r in usermode emulation" echo " --enable-uname-release=R Return R for uname -r in usermode emulation"
echo " --cpu=CPU Build for host CPU [$cpu]" 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 " --disable-uuid disable uuid support"
echo " --enable-uuid enable uuid support" echo " --enable-uuid enable uuid support"
echo " --disable-vde disable support for vde network" echo " --disable-vde disable support for vde network"

2
hw/mcf5206.c
View File

@ -359,7 +359,7 @@ static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset,
/* Internal peripherals use a variety of register widths. /* Internal peripherals use a variety of register widths.
This lookup table allows a single routine to handle all of them. */ 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, /* 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, /* 040-080 */ 1, 2, 2, 2, 4, 1, 2, 4, 1, 2, 4, 2, 2, 4, 2, 2,

4
hw/pc_sysfw.c
View File

@ -84,6 +84,10 @@ static void pc_fw_add_pflash_drv(void)
bios_name = BIOS_FILENAME; bios_name = BIOS_FILENAME;
} }
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); 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"); opts = drive_add(IF_PFLASH, -1, filename, "readonly=on");

2
hw/spapr_nvram.c
View File

@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <sys/mman.h>
#include <libfdt.h> #include <libfdt.h>
#include "sysemu/device_tree.h" #include "sysemu/device_tree.h"

8
linux-user/syscall.c
View File

@ -36,6 +36,9 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/file.h>
#include <sys/fsuid.h>
#include <sys/personality.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/mman.h> #include <sys/mman.h>
@ -581,11 +584,6 @@ _syscall4(int, sys_prlimit64, pid_t, pid, int, resource,
struct host_rlimit64 *, old_limit) struct host_rlimit64 *, old_limit)
#endif #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 */ /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
#ifdef TARGET_ARM #ifdef TARGET_ARM
static inline int regpairs_aligned(void *cpu_env) { static inline int regpairs_aligned(void *cpu_env) {

5
ui/spice-core.c
View File

@ -709,7 +709,7 @@ void qemu_spice_init(void)
qemu_spice_input_init(); qemu_spice_input_init();
qemu_spice_audio_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_key_file);
g_free(x509_cert_file); g_free(x509_cert_file);
@ -736,8 +736,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
*/ */
spice_server = spice_server_new(); spice_server = spice_server_new();
spice_server_init(spice_server, &core_interface); spice_server_init(spice_server, &core_interface);
qemu_add_vm_change_state_handler(vm_change_state_handler, qemu_add_vm_change_state_handler(vm_change_state_handler, NULL);
&spice_server);
} }
return spice_server_add_interface(spice_server, sin); return spice_server_add_interface(spice_server, sin);