# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b29954d81e6df0040c25c7e59d508c9433e767b0
# Parent 9d86f5a5e426e9119a4535f85df9223ef479bccc
Cleanup dirty code avoiding warning messages when compiling
ioemu.
Signed-off-by: Haifeng Xue <haifeng.xue@xxxxxxxxx>
diff -r 9d86f5a5e426 -r b29954d81e6d tools/firmware/vmxassist/acpi_madt.c
--- a/tools/firmware/vmxassist/acpi_madt.c Wed Jan 18 12:58:11 2006
+++ b/tools/firmware/vmxassist/acpi_madt.c Thu Jan 19 08:12:40 2006
@@ -55,7 +55,6 @@
get_hvm_info_table(void)
{
struct hvm_info_table *t;
- int i;
if (table != NULL)
return table;
diff -r 9d86f5a5e426 -r b29954d81e6d tools/ioemu/audio/noaudio.c
--- a/tools/ioemu/audio/noaudio.c Wed Jan 18 12:58:11 2006
+++ b/tools/ioemu/audio/noaudio.c Thu Jan 19 08:12:40 2006
@@ -41,7 +41,6 @@
{
NoVoice *no = (NoVoice *) hw;
int rpos, live, decr, samples;
- uint8_t *dst;
st_sample_t *src;
int64_t now = qemu_get_clock (vm_clock);
int64_t ticks = now - no->old_ticks;
@@ -82,7 +81,6 @@
static int no_hw_init (HWVoice *hw, int freq, int nchannels, audfmt_e fmt)
{
- NoVoice *no = (NoVoice *) hw;
hw->freq = freq;
hw->nchannels = nchannels;
hw->fmt = fmt;
diff -r 9d86f5a5e426 -r b29954d81e6d tools/ioemu/cpu.h
--- a/tools/ioemu/cpu.h Wed Jan 18 12:58:11 2006
+++ b/tools/ioemu/cpu.h Thu Jan 19 08:12:40 2006
@@ -63,6 +63,9 @@
/* MSDOS compatibility mode FPU exception support */
void cpu_set_ferr(CPUX86State *s);
+/* helper2.c */
+void cpu_x86_set_a20(CPUX86State *env, int a20_state);
+
#if defined(__i386__) || defined(__x86_64__)
#define TARGET_PAGE_BITS 12
#elif defined(__ia64__)
diff -r 9d86f5a5e426 -r b29954d81e6d tools/ioemu/hw/pc.c
--- a/tools/ioemu/hw/pc.c Wed Jan 18 12:58:11 2006
+++ b/tools/ioemu/hw/pc.c Thu Jan 19 08:12:40 2006
@@ -382,8 +382,6 @@
{
char buf[1024];
int ret, linux_boot, initrd_size, i, nb_nics1;
- unsigned long bios_offset, vga_bios_offset;
- int bios_size, isa_bios_size;
PCIBus *pci_bus;
extern void * shared_vram;
diff -r 9d86f5a5e426 -r b29954d81e6d tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Wed Jan 18 12:58:11 2006
+++ b/tools/ioemu/vl.c Thu Jan 19 08:12:40 2006
@@ -1204,7 +1204,7 @@
return -1;
}
strcat(path, "/console/tty");
- if (!xs_write(xs, NULL, path, pts, strlen(pts))) {
+ if (!xs_write(xs, XBT_NULL, path, pts, strlen(pts))) {
fprintf(logfile, "xs_write for console fail");
return -1;
}
diff -r 9d86f5a5e426 -r b29954d81e6d tools/ioemu/vl.h
--- a/tools/ioemu/vl.h Wed Jan 18 12:58:11 2006
+++ b/tools/ioemu/vl.h Thu Jan 19 08:12:40 2006
@@ -354,6 +354,9 @@
void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
+/* port-e9.c */
+void port_e9_init(void);
+
/* block.c */
typedef struct BlockDriverState BlockDriverState;
typedef struct BlockDriver BlockDriver;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home