ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

# By Alin Tomescu (1) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  .gitignore: Ignore optionrom/*.asm
  ppc: fix bamboo >256MB RAM initialization in hw/ppc4xx_devs.c
  Add some missing qtest binaries to .gitignore
  xilinx_axienet.c: Assert no error when making link
  Remove forward declaration of non-existant variable
This commit is contained in:
Anthony Liguori 2013-02-21 09:38:27 -06:00
parent cc2832a51c 159c9836d0
commit 259dc0c1ce
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -83,12 +83,15 @@ fsdev/virtfs-proxy-helper.pod
patches patches
pc-bios/bios-pq/status pc-bios/bios-pq/status
pc-bios/vgabios-pq/status pc-bios/vgabios-pq/status
pc-bios/optionrom/linuxboot.asm
pc-bios/optionrom/linuxboot.bin pc-bios/optionrom/linuxboot.bin
pc-bios/optionrom/linuxboot.raw pc-bios/optionrom/linuxboot.raw
pc-bios/optionrom/linuxboot.img pc-bios/optionrom/linuxboot.img
pc-bios/optionrom/multiboot.asm
pc-bios/optionrom/multiboot.bin pc-bios/optionrom/multiboot.bin
pc-bios/optionrom/multiboot.raw pc-bios/optionrom/multiboot.raw
pc-bios/optionrom/multiboot.img pc-bios/optionrom/multiboot.img
pc-bios/optionrom/kvmvapic.asm
pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.bin
pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.raw
pc-bios/optionrom/kvmvapic.img pc-bios/optionrom/kvmvapic.img

2
hw/ppc4xx_devs.c
View File

@ -700,7 +700,7 @@ ram_addr_t ppc4xx_sdram_adjust(ram_addr_t ram_size, int nr_banks,
vmstate_register_ram_global(&ram_memories[i]); vmstate_register_ram_global(&ram_memories[i]);
ram_bases[i] = base; ram_bases[i] = base;
ram_sizes[i] = bank_size; ram_sizes[i] = bank_size;
base += ram_size; base += bank_size;
size_left -= bank_size; size_left -= bank_size;
break; break;
} }

4
hw/xilinx_axienet.c
View File

@ -869,9 +869,11 @@ static int xilinx_enet_init(SysBusDevice *dev)
static void xilinx_enet_initfn(Object *obj) static void xilinx_enet_initfn(Object *obj)
{ {
struct XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj)); struct XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj));
Error *errp = NULL;
object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
(Object **) &s->tx_dev, NULL); (Object **) &s->tx_dev, &errp);
assert_no_error(errp);
} }
static Property xilinx_enet_properties[] = { static Property xilinx_enet_properties[] = {

1
include/sysemu/sysemu.h
View File

@ -94,7 +94,6 @@ typedef enum DisplayType
} DisplayType; } DisplayType;
extern int autostart; extern int autostart;
extern int bios_size;
typedef enum { typedef enum {
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL, VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,

7
tests/.gitignore vendored
View File

@ -4,11 +4,18 @@ check-qint
check-qjson check-qjson
check-qlist check-qlist
check-qstring check-qstring
test-aio
test-cutils
test-hbitmap
test-iov
test-mul64
test-qapi-types.[ch] test-qapi-types.[ch]
test-qapi-visit.[ch] test-qapi-visit.[ch]
test-qmp-commands.h test-qmp-commands.h
test-qmp-commands test-qmp-commands
test-qmp-input-strict test-qmp-input-strict
test-qmp-marshal.c test-qmp-marshal.c
test-thread-pool
test-x86-cpuid test-x86-cpuid
test-xbzrle
*-test *-test