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
This commit is contained in:
Anthony Liguori 2011-10-14 10:47:33 -05:00
commit 210b3a7038
7 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/qcow.c
View File

@ -596,7 +596,7 @@ static int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
if (qiov->niov > 1) { if (qiov->niov > 1) {
qemu_vfree(orig_buf); qemu_vfree(orig_buf);
} }
free(cluster_data); g_free(cluster_data);
return ret; return ret;
} }

2
block/sheepdog.c
View File

@ -66,7 +66,7 @@
* 20 - 31 (12 bits): reserved data object space * 20 - 31 (12 bits): reserved data object space
* 32 - 55 (24 bits): vdi object space * 32 - 55 (24 bits): vdi object space
* 56 - 59 ( 4 bits): reserved vdi object space * 56 - 59 ( 4 bits): reserved vdi object space
* 60 - 63 ( 4 bits): object type indentifier space * 60 - 63 ( 4 bits): object type identifier space
*/ */
#define VDI_SPACE_SHIFT 32 #define VDI_SPACE_SHIFT 32

22
hpet.h
View File

@ -1,22 +0,0 @@
#ifndef __HPET__
#define __HPET__ 1
struct hpet_info {
unsigned long hi_ireqfreq; /* Hz */
unsigned long hi_flags; /* information */
unsigned short hi_hpet;
unsigned short hi_timer;
};
#define HPET_INFO_PERIODIC 0x0001 /* timer is periodic */
#define HPET_IE_ON _IO('h', 0x01) /* interrupt on */
#define HPET_IE_OFF _IO('h', 0x02) /* interrupt off */
#define HPET_INFO _IOR('h', 0x03, struct hpet_info)
#define HPET_EPI _IO('h', 0x04) /* enable periodic */
#define HPET_DPI _IO('h', 0x05) /* disable periodic */
#define HPET_IRQFREQ _IOW('h', 0x6, unsigned long) /* IRQFREQ usec */
#endif /* !__HPET__ */

2
hw/arm_pic.c
View File

@ -39,7 +39,7 @@ static void arm_pic_cpu_handler(void *opaque, int irq, int level)
cpu_reset_interrupt(env, CPU_INTERRUPT_FIQ); cpu_reset_interrupt(env, CPU_INTERRUPT_FIQ);
break; break;
default: default:
hw_error("arm_pic_cpu_handler: Bad interrput line %d\n", irq); hw_error("arm_pic_cpu_handler: Bad interrupt line %d\n", irq);
} }
} }

8
qemu-char.c
View File

@ -1664,8 +1664,8 @@ static int qemu_chr_open_win(QemuOpts *opts, CharDriverState **_chr)
chr->chr_close = win_chr_close; chr->chr_close = win_chr_close;
if (win_chr_init(chr, filename) < 0) { if (win_chr_init(chr, filename) < 0) {
free(s); g_free(s);
free(chr); g_free(chr);
return -EIO; return -EIO;
} }
qemu_chr_generic_open(chr); qemu_chr_generic_open(chr);
@ -1766,8 +1766,8 @@ static int qemu_chr_open_win_pipe(QemuOpts *opts, CharDriverState **_chr)
chr->chr_close = win_chr_close; chr->chr_close = win_chr_close;
if (win_chr_pipe_init(chr, filename) < 0) { if (win_chr_pipe_init(chr, filename) < 0) {
free(s); g_free(s);
free(chr); g_free(chr);
return -EIO; return -EIO;
} }
qemu_chr_generic_open(chr); qemu_chr_generic_open(chr);

4
qemu-options.hx
View File

@ -1673,15 +1673,15 @@ Connect to a local parallel port.
@option{path} specifies the path to the parallel port device. @option{path} is @option{path} specifies the path to the parallel port device. @option{path} is
required. required.
#if defined(CONFIG_SPICE)
@item -chardev spicevmc ,id=@var{id} ,debug=@var{debug}, name=@var{name} @item -chardev spicevmc ,id=@var{id} ,debug=@var{debug}, name=@var{name}
@option{spicevmc} is only available when spice support is built in.
@option{debug} debug level for spicevmc @option{debug} debug level for spicevmc
@option{name} name of spice channel to connect to @option{name} name of spice channel to connect to
Connect to a spice virtual machine channel, such as vdiport. Connect to a spice virtual machine channel, such as vdiport.
#endif
@end table @end table
ETEXI ETEXI

2
tcg/tcg.h
View File

@ -175,7 +175,7 @@ typedef enum TCGType {
typedef tcg_target_ulong TCGArg; typedef tcg_target_ulong TCGArg;
/* Define a type and accessor macros for varables. Using a struct is /* Define a type and accessor macros for variables. Using a struct is
nice because it gives some level of type safely. Ideally the compiler nice because it gives some level of type safely. Ideally the compiler
be able to see through all this. However in practice this is not true, be able to see through all this. However in practice this is not true,
expecially on targets with braindamaged ABIs (e.g. i386). expecially on targets with braindamaged ABIs (e.g. i386).