CANCEL - Pull duplicate source chunk #4
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This needed some more code updates. Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: hw/boards.h target-arm/cpu.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
API fixes. Conflicts: hw/eepro100.c hw/lan9118.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: include/exec/cpu-defs.h Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: TODO configure Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: configure target-i386/translate.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: hw/sdhci.c hw/sdhci.h Signed-off-by: Stefan Weil <sw@weilnetz.de>
* Don't disable -Werror for old compilers. * Always enable -Wextra (not only for MinGW). Signed-off-by: Stefan Weil <sw@weilnetz.de>
08744c9 removed hw/baum.h but did not adjust hw/baum.c, breaking build. Fix. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
96c6384 did not adjust Win32 #ifdeffery properly, breaking build in later commits. Fix. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Conflicts: backends/baum.c hw/arm/Makefile.objs hw/mips/Makefile.objs hw/mips/mips_malta.c hw/mips/mips_r4k.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: hw/serial.c target-i386/misc_helper.c API fixes were needed for several block and hw sources. Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: configure Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: configure default-configs/arm-softmmu.mak hw/Makefile.objs hw/arm/Makefile.objs hw/mips/mips_malta.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: Makefile.target configure Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: Makefile.target configure include/qemu-common.h Signed-off-by: Stefan Weil <sw@weilnetz.de>
Linux provides a global variable __environ, so it is not necessary to use envp from main and propagate it via qemu_init_auxval. Signed-off-by: Stefan Weil <sw@weilnetz.de>
Commit ac86048 removed trace.h from console.h and ignored the fact that qxl-render.c needs this file (it includes qxl.h which includes console.h which included trace.h). Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: exec.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
gcc 4.7 shows a new warning when -Wclobbered (which is part of -Wextra) is enabled: qemu/exec.c:921:11: error: variable ‘area’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] The warning is caused by sigsetjmp which was added in commit ef36fa1. Declaring the variable with attribute 'volatile' fixes the warning. Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: target-mips/translate.c Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: tcg/tcg.h Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts: default-configs/arm-softmmu.mak hw/arm/Makefile.objs hw/arm/boot.c hw/intc/Makefile.objs hw/timer/Makefile.objs target-arm/helper.c
Conflicts: savevm.c target-i386/translate.c
Conflicts: include/qemu/osdep.h ui/gtk.c
Conflicts: hw/intc/bcm2835_ic.c
Conflicts: Makefile Makefile.target configure hw/ppc/spapr.c target-arm/cpu.h vl.c
mrvn
changed the title
|
please cancel |
mjkillough
pushed a commit
to mjkillough/qemu-rpi
that referenced
this pull request
May 26, 2014
The docs for glfs_init suggest that the function sets errno on every failure. In fact it doesn't. As other functions such as qemu_gluster_open() in the gluster block code report their errors based on this fact we need to make sure that errno is set on each failure. This fixes a crash of qemu-img/qemu when a gluster brick isn't accessible from given host while the server serving the volume description is. Thread 1 (Thread 0x7ffff7fba740 (LWP 203880)): #0 0x00007ffff77673f8 in glfs_lseek () from /usr/lib64/libgfapi.so.0 Torlus#1 0x0000555555574a68 in qemu_gluster_getlength () Torlus#2 0x0000555555565742 in refresh_total_sectors () Torlus#3 0x000055555556914f in bdrv_open_common () Torlus#4 0x000055555556e8e8 in bdrv_open () Torlus#5 0x000055555556f02f in bdrv_open_image () Torlus#6 0x000055555556e5f6 in bdrv_open () Torlus#7 0x00005555555c5775 in bdrv_new_open () Torlus#8 0x00005555555c5b91 in img_info () qemu#9 0x00007ffff62c9c05 in __libc_start_main () from /lib64/libc.so.6 qemu#10 0x00005555555648ad in _start () Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Torlus
pushed a commit
that referenced
this pull request
Jul 5, 2014
If libusb_get_device_list() fails, the uninitialized local variable libusb_device would be passed to libusb_free_device_list(), that will cause a crash, like: (gdb) bt #0 0x00007fbbb4bafc10 in pthread_mutex_lock () from /lib64/libpthread.so.0 #1 0x00007fbbb233e653 in libusb_unref_device (dev=0x6275682d627375) at core.c:902 #2 0x00007fbbb233e739 in libusb_free_device_list (list=0x7fbbb6e8436e, unref_devices=<optimized out>) at core.c:653 #3 0x00007fbbb6cd80a4 in usb_host_auto_check (unused=unused@entry=0x0) at hw/usb/host-libusb.c:1446 #4 0x00007fbbb6cd8525 in usb_host_initfn (udev=0x7fbbbd3c5670) at hw/usb/host-libusb.c:912 #5 0x00007fbbb6cc123b in usb_device_init (dev=0x7fbbbd3c5670) at hw/usb/bus.c:106 ... So initialize libusb_device at the begin time. Signed-off-by: Jincheng Miao <jmiao@redhat.com> Reviewed-by: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Torlus
pushed a commit
that referenced
this pull request
Sep 17, 2014
VirtIOBlockReq is freed later by virtio_blk_free_request() in hw/block/virtio-blk.c. Remove this extraneous g_slice_free(). This patch fixes the following segfault: 0x00005555556373af in virtio_blk_rw_complete (opaque=0x5555565ff5e0, ret=0) at hw/block/virtio-blk.c:99 99 bdrv_acct_done(req->dev->bs, &req->acct); (gdb) print req $1 = (VirtIOBlockReq *) 0x5555565ff5e0 (gdb) print req->dev $2 = (VirtIOBlock *) 0x0 (gdb) bt #0 0x00005555556373af in virtio_blk_rw_complete (opaque=0x5555565ff5e0, ret=0) at hw/block/virtio-blk.c:99 #1 0x0000555555840ebe in bdrv_co_em_bh (opaque=0x5555566152d0) at block.c:4675 #2 0x000055555583de77 in aio_bh_poll (ctx=ctx@entry=0x5555563a8150) at async.c:81 #3 0x000055555584b7a7 in aio_poll (ctx=0x5555563a8150, blocking=blocking@entry=true) at aio-posix.c:188 #4 0x00005555556e520e in iothread_run (opaque=0x5555563a7fd8) at iothread.c:41 #5 0x00007ffff42ba124 in start_thread () from /usr/lib/libpthread.so.0 #6 0x00007ffff16d14bd in clone () from /usr/lib/libc.so.6 Reported-by: Max Reitz <mreitz@redhat.com> Cc: Fam Zheng <famz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Torlus
pushed a commit
that referenced
this pull request
Dec 11, 2014
If the pci bridge enters in error flow as part
of init process it will only delete the shpc mmio
subregion but not remove it from the properties list,
resulting in segmentation fault when the bridge runs
the exit function.
Example: add a pci bridge without specifing the chassis number:
<qemu-bin> ... -device pci-bridge,id=p1
Result:
(qemu) qemu-system-x86_64: -device pci-bridge,id=p1: Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
qemu-system-x86_64: -device pci-bridge,id=p1: Device
initialization failed.
Segmentation fault (core dumped)
if (child->class->unparent) {
#0 0x00005555558d629b in object_finalize_child_property (obj=0x555556d2e830, name=0x555556d30630 "shpc-mmio[0]", opaque=0x555556a42fc8) at qom/object.c:1078
#1 0x00005555558d4b1f in object_property_del_all (obj=0x555556d2e830) at qom/object.c:367
#2 0x00005555558d4ca1 in object_finalize (data=0x555556d2e830) at qom/object.c:412
#3 0x00005555558d55a1 in object_unref (obj=0x555556d2e830) at qom/object.c:720
#4 0x000055555572c907 in qdev_device_add (opts=0x5555563544f0) at qdev-monitor.c:566
#5 0x0000555555744f16 in device_init_func (opts=0x5555563544f0, opaque=0x0) at vl.c:2213
#6 0x00005555559cf5f0 in qemu_opts_foreach (list=0x555555e0f8e0 <qemu_device_opts>, func=0x555555744efa <device_init_func>, opaque=0x0, abort_on_failure=1) at util/qemu-option.c:1057
#7 0x000055555574a11b in main (argc=16, argv=0x7fffffffdde8, envp=0x7fffffffde70) at vl.c:423
Unparent the shpc mmio region as part of shpc cleanup.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Torlus
pushed a commit
that referenced
this pull request
May 26, 2015
The dev->config pointer isn't set until guest system initializes usb devices (via usb_desc_set_config). However qemu networking can go through some motions prior to that, e.g.: #0 is_rndis (s=0x555557261970) at hw/usb/dev-network.c:653 #1 0x000055555585f723 in usbnet_can_receive (nc=0x55555641e820) at hw/usb/dev-network.c:1315 #2 0x000055555587635e in qemu_can_send_packet (sender=0x5555572660a0) at net/net.c:470 #3 0x0000555555878e34 in net_hub_port_can_receive (nc=0x5555562d7800) at net/hub.c:101 #4 0x000055555587635e in qemu_can_send_packet (sender=0x5555562d7980) at net/net.c:470 #5 0x000055555587dbca in tap_can_send (opaque=0x5555562d7980) at net/tap.c:172 The command to reproduce most reliably was: qemu-system-i386 -usb -device usb-net,vlan=0 -net tap,vlan=0 This wasn't strictly a problem with tap. Other networking endpoints (vde, user) could trigger this problem as well. Fixes: https://bugs.launchpad.net/qemu/+bug/1050823 Cc: qemu-stable@nongnu.org Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Torlus
pushed a commit
that referenced
this pull request
Aug 6, 2015
This fixes the following crash, introduced by commit 49d2e64: $ gdb --args qemu-system-x86_64 -machine pc,mem-merge=off -object memory-backend-ram,id=ram-node0,size=1024 [...] Program received signal SIGABRT, Aborted. (gdb) bt #0 0x00007ffff253b8c7 in raise () at /lib64/libc.so.6 #1 0x00007ffff253d52a in abort () at /lib64/libc.so.6 #2 0x00007ffff253446d in __assert_fail_base () at /lib64/libc.so.6 #3 0x00007ffff2534522 in () at /lib64/libc.so.6 #4 0x00005555558bb80a in qemu_opt_get_bool_helper (opts=0x55555621b650, name=name@entry=0x5555558ec922 "mem-merge", defval=defval@entry=true, del=del@entry=false) at qemu/util/qemu-option.c:388 #5 0x00005555558bbb5a in qemu_opt_get_bool (opts=<optimized out>, name=name@entry=0x5555558ec922 "mem-merge", defval=defval@entry=true) at qemu/util/qemu-option.c:398 #6 0x0000555555720a24 in host_memory_backend_init (obj=0x5555562ac970) at qemu/backends/hostmem.c:226 Instead of using qemu_opt_get_bool(), that didn't work with qemu_machine_opts for a long time, we can use the corresponding MachineState fields. Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seem to have been some merge error resulting in a chunk of source being duplicated.