From 87f1361c193c77dad428a7aa9bdce7ae2b76871f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 10 Feb 2013 23:11:05 +0100 Subject: Remove forward declaration of non-existant variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This variable has been removed 5 years ago in 970ac5a3082428dca91171f270dcd95d6f4b2636. Signed-off-by: Hervé Poussineau Signed-off-by: Stefan Hajnoczi --- include/sysemu/sysemu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1d9599e..ae49088 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, -- cgit v1.1 From b15aaca4303fe009870842dd922a0128b332a2fd Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Mon, 11 Feb 2013 17:16:05 +1000 Subject: xilinx_axienet.c: Assert no error when making link This gives an awful silent failure when it doesn't work. Assert against link creation failure. Signed-off-by: Peter Crosthwaite Signed-off-by: Stefan Hajnoczi --- hw/xilinx_axienet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c index 34e344c..e5d9251 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[] = { -- cgit v1.1 From 499a6165bef56ce3f5297fa7b1abaab32858a34f Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 21 Feb 2013 13:34:40 +1100 Subject: Add some missing qtest binaries to .gitignore These binaries are generated during make check on at least some configurations, so att them to .gitignore. Signed-off-by: David Gibson Signed-off-by: Stefan Hajnoczi --- tests/.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/.gitignore b/tests/.gitignore index 38c94ef..fb05c2a 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 -- cgit v1.1 From 11e5d738a4c68cd20e90477fa8b7ee873bf3e2c0 Mon Sep 17 00:00:00 2001 From: Alin Tomescu Date: Wed, 20 Feb 2013 21:36:09 -0500 Subject: ppc: fix bamboo >256MB RAM initialization in hw/ppc4xx_devs.c I was trying to launch a PowerPC "bamboo" machine with more than 256MB of RAM with qemu-system-ppc -M bamboo -kernel $kernel -initrd $ramdisk -m 512, but QEMU would just hang. However, when I used -m 256, the machine would boot. I looked through the code in hw/ and it seems there is an error when the RAM memory is setup (if my understanding is correct). After patching it, the machine launched and booted successfully with 512MB of RAM. Signed-off-by: Alin Tomescu Signed-off-by: Stefan Hajnoczi --- hw/ppc4xx_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index 5e491bc..b6bb0e1 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; } -- cgit v1.1 From 159c9836d057d8990e71399e8a431b2b911e2885 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Feb 2013 17:41:28 -0500 Subject: .gitignore: Ignore optionrom/*.asm Signed-off-by: Cole Robinson Signed-off-by: Stefan Hajnoczi --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 53fe9c3..27ad002 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 -- cgit v1.1