Commit a19255a3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* stefanha/trivial-patches:
  linux-user: brk() debugging
  virtio: Remove unneeded g_free() check in virtio_cleanup()
  net: remove extra spaces in help messages
  fmopl: Fix typo in function name
  vl.c: Fix typo in variable name
  ide: fix compilation errors when DEBUG_IDE is set
  cpu-exec.c: Correct comment about this file and indentation cleanup
  CODING_STYLE: Clarify style for enum and function type names
  linux-user: fail execve() if env/args too big
parents 9de36b1a 3a0c6c4a

CODING_STYLE

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ Rationale: 
3. Naming



Variables are lower_case_with_underscores; easy to type and read.  Structured

type names are in CamelCase; harder to type but standing out.  Scalar type

type names are in CamelCase; harder to type but standing out.  Enum type

names and function type names should also be in CamelCase.  Scalar type

names are lower_case_with_underscores_ending_with_a_t, like the POSIX

uint64_t and family.  Note that this last convention contradicts POSIX

and is therefore likely to be changed.

cpu-exec.c

+5 −5
Original line number Diff line number Diff line 
/*

 *  i386 emulator main execution loop

 *  emulator main execution loop

 *

 *  Copyright (c) 2003-2005 Fabrice Bellard

 *

hw/fmopl.c

+2 −2
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ INLINE void CSMKeyControll(OPL_CH *CH) 
}



/* ---------- opl initialize ---------- */

static void OPL_initalize(FM_OPL *OPL)

static void OPL_initialize(FM_OPL *OPL)

{

	int fn;
@@ -1239,7 +1239,7 @@ FM_OPL *OPLCreate(int type, int clock, int rate) 
	OPL->rate  = rate;

	OPL->max_ch = max_ch;

	/* init grobal tables */

	OPL_initalize(OPL);

	OPL_initialize(OPL);

	/* reset chip */

	OPLResetChip(OPL);

#ifdef OPL_OUTPUT_LOG

hw/ide/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static uint64_t bmdma_addr_read(void *opaque, target_phys_addr_t addr, 


    data = (bm->addr >> (addr * 8)) & mask;

#ifdef DEBUG_IDE

    printf("%s: 0x%08x\n", __func__, (unsigned)*data);

    printf("%s: 0x%08x\n", __func__, (unsigned)data);

#endif

    return data;

}

hw/ide/piix.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, unsigned size) 
        break;

    }

#ifdef DEBUG_IDE

    printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);

    printf("bmdma: readb 0x%02x : 0x%02x\n", (uint8_t)addr, val);

#endif

    return val;

}
@@ -68,7 +68,7 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, 
    }



#ifdef DEBUG_IDE

    printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);

    printf("bmdma: writeb 0x%02x : 0x%02x\n", (uint8_t)addr, (uint8_t)val);

#endif

    switch(addr & 3) {

    case 0: