diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:38:27 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:38:27 -0600 |
| commit | 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f (patch) | |
| tree | 017cba36bb8b71b7b2207300403d13f37d0edf8f | |
| parent | cc2832a51c8ce43349967ab1b6c7aafd510e55b2 (diff) | |
| parent | 159c9836d057d8990e71399e8a431b2b911e2885 (diff) | |
| download | qemu-259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f.tar.gz | |
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
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | hw/ppc4xx_devs.c | 2 | ||||
| -rw-r--r-- | hw/xilinx_axienet.c | 4 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 1 | ||||
| -rw-r--r-- | tests/.gitignore | 7 |
5 files changed, 14 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 53fe9c3078..27ad002970 100644 --- a/.gitignore +++ b/.gitignore @@ -83,12 +83,15 @@ fsdev/virtfs-proxy-helper.pod patches pc-bios/bios-pq/status pc-bios/vgabios-pq/status +pc-bios/optionrom/linuxboot.asm pc-bios/optionrom/linuxboot.bin pc-bios/optionrom/linuxboot.raw pc-bios/optionrom/linuxboot.img +pc-bios/optionrom/multiboot.asm pc-bios/optionrom/multiboot.bin pc-bios/optionrom/multiboot.raw pc-bios/optionrom/multiboot.img +pc-bios/optionrom/kvmvapic.asm pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.img diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 5e491bc0b4..b6bb0e166a 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -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]); ram_bases[i] = base; ram_sizes[i] = bank_size; - base += ram_size; + base += bank_size; size_left -= bank_size; break; } diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c index 34e344ce2c..e5d9251b8b 100644 --- a/hw/xilinx_axienet.c +++ b/hw/xilinx_axienet.c @@ -869,9 +869,11 @@ static int xilinx_enet_init(SysBusDevice *dev) static void xilinx_enet_initfn(Object *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 **) &s->tx_dev, NULL); + (Object **) &s->tx_dev, &errp); + assert_no_error(errp); } static Property xilinx_enet_properties[] = { diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1d9599e5f4..ae49088d42 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -94,7 +94,6 @@ typedef enum DisplayType } DisplayType; extern int autostart; -extern int bios_size; typedef enum { VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL, diff --git a/tests/.gitignore b/tests/.gitignore index 38c94ef1da..fb05c2ae87 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -4,11 +4,18 @@ check-qint check-qjson check-qlist check-qstring +test-aio +test-cutils +test-hbitmap +test-iov +test-mul64 test-qapi-types.[ch] test-qapi-visit.[ch] test-qmp-commands.h test-qmp-commands test-qmp-input-strict test-qmp-marshal.c +test-thread-pool test-x86-cpuid +test-xbzrle *-test |