ia64/xen-unstable

changeset 8629:b29954d81e6d

Cleanup dirty code avoiding warning messages when compiling
ioemu.

Signed-off-by: Haifeng Xue <haifeng.xue@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Jan 19 09:12:40 2006 +0100 (2006-01-19)
parents 9d86f5a5e426
children e32258567d05
files tools/firmware/vmxassist/acpi_madt.c tools/ioemu/audio/noaudio.c tools/ioemu/cpu.h tools/ioemu/hw/pc.c tools/ioemu/vl.c tools/ioemu/vl.h
line diff
     1.1 --- a/tools/firmware/vmxassist/acpi_madt.c	Wed Jan 18 12:58:11 2006 +0000
     1.2 +++ b/tools/firmware/vmxassist/acpi_madt.c	Thu Jan 19 09:12:40 2006 +0100
     1.3 @@ -55,7 +55,6 @@ static struct hvm_info_table *
     1.4  get_hvm_info_table(void)
     1.5  {
     1.6  	struct hvm_info_table *t;
     1.7 -	int i;
     1.8  
     1.9  	if (table != NULL)
    1.10  		return table;
     2.1 --- a/tools/ioemu/audio/noaudio.c	Wed Jan 18 12:58:11 2006 +0000
     2.2 +++ b/tools/ioemu/audio/noaudio.c	Thu Jan 19 09:12:40 2006 +0100
     2.3 @@ -41,7 +41,6 @@ static void no_hw_run (HWVoice *hw)
     2.4  {
     2.5      NoVoice *no = (NoVoice *) hw;
     2.6      int rpos, live, decr, samples;
     2.7 -    uint8_t *dst;
     2.8      st_sample_t *src;
     2.9      int64_t now = qemu_get_clock (vm_clock);
    2.10      int64_t ticks = now - no->old_ticks;
    2.11 @@ -82,7 +81,6 @@ static int no_hw_write (SWVoice *sw, voi
    2.12  
    2.13  static int no_hw_init (HWVoice *hw, int freq, int nchannels, audfmt_e fmt)
    2.14  {
    2.15 -    NoVoice *no = (NoVoice *) hw;
    2.16      hw->freq = freq;
    2.17      hw->nchannels = nchannels;
    2.18      hw->fmt = fmt;
     3.1 --- a/tools/ioemu/cpu.h	Wed Jan 18 12:58:11 2006 +0000
     3.2 +++ b/tools/ioemu/cpu.h	Thu Jan 19 09:12:40 2006 +0100
     3.3 @@ -63,6 +63,9 @@ int cpu_get_pic_interrupt(CPUX86State *s
     3.4  /* MSDOS compatibility mode FPU exception support */
     3.5  void cpu_set_ferr(CPUX86State *s);
     3.6  
     3.7 +/* helper2.c */
     3.8 +void cpu_x86_set_a20(CPUX86State *env, int a20_state);
     3.9 +
    3.10  #if defined(__i386__) || defined(__x86_64__)
    3.11  #define TARGET_PAGE_BITS 12
    3.12  #elif defined(__ia64__)
     4.1 --- a/tools/ioemu/hw/pc.c	Wed Jan 18 12:58:11 2006 +0000
     4.2 +++ b/tools/ioemu/hw/pc.c	Thu Jan 19 09:12:40 2006 +0100
     4.3 @@ -382,8 +382,6 @@ void pc_init(uint64_t ram_size, int vga_
     4.4  {
     4.5      char buf[1024];
     4.6      int ret, linux_boot, initrd_size, i, nb_nics1;
     4.7 -    unsigned long bios_offset, vga_bios_offset;
     4.8 -    int bios_size, isa_bios_size;
     4.9      PCIBus *pci_bus;
    4.10      extern void * shared_vram;
    4.11      
     5.1 --- a/tools/ioemu/vl.c	Wed Jan 18 12:58:11 2006 +0000
     5.2 +++ b/tools/ioemu/vl.c	Thu Jan 19 09:12:40 2006 +0100
     5.3 @@ -1204,7 +1204,7 @@ int store_console_dev(int domid, char *p
     5.4          return -1;
     5.5      }
     5.6      strcat(path, "/console/tty");
     5.7 -    if (!xs_write(xs, NULL, path, pts, strlen(pts))) {
     5.8 +    if (!xs_write(xs, XBT_NULL, path, pts, strlen(pts))) {
     5.9          fprintf(logfile, "xs_write for console fail");
    5.10          return -1;
    5.11      }
     6.1 --- a/tools/ioemu/vl.h	Wed Jan 18 12:58:11 2006 +0000
     6.2 +++ b/tools/ioemu/vl.h	Thu Jan 19 09:12:40 2006 +0100
     6.3 @@ -354,6 +354,9 @@ int register_savevm(const char *idstr,
     6.4  void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
     6.5  void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
     6.6  
     6.7 +/* port-e9.c */
     6.8 +void port_e9_init(void);
     6.9 +
    6.10  /* block.c */
    6.11  typedef struct BlockDriverState BlockDriverState;
    6.12  typedef struct BlockDriver BlockDriver;