| commit | e049cc43427772498b5de3d7a8df7515c4c960a4 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:56:57 +0000 (21 17:56 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:56:57 +0000 (21 17:56 +0300) | ||
| tree | de249aa5013d3fb9c34c5d853e2d332fa173589d | treesnapshot (tar.gz zip) |
| parent | 89b856958254ad91cd90c173dfc5cbc246ac1e0f | commitdiff |
| parent | f471a17e9d869df3c6573f7ec02c4725676d6f3a | commitdiff |
Merge commit 'f471a17e9d869df3c6573f7ec02c4725676d6f3a' into upstream-merge
* commit 'f471a17e9d869df3c6573f7ec02c4725676d6f3a':
ram_blocks: Convert to a QLIST
Make netdev_del delete the netdev even when it's in use
pass info about hpets to seabios.]
hpet: Init capability register only once
qemu-option: Fix uninitialized value in append_option_parameter
Change #define DEBUG to #define E1000_DEBUG in hw/e1000.c
Remove unused DEBUG defines from hw/msix.c
Conflicts:
exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'f471a17e9d869df3c6573f7ec02c4725676d6f3a':
ram_blocks: Convert to a QLIST
Make netdev_del delete the netdev even when it's in use
pass info about hpets to seabios.]
hpet: Init capability register only once
qemu-option: Fix uninitialized value in append_option_parameter
Change #define DEBUG to #define E1000_DEBUG in hw/e1000.c
Remove unused DEBUG defines from hw/msix.c
Conflicts:
exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| exec.c | diff1 | diff2 | blobhistory |
| hw/hpet.c | diff1 | diff2 | blobhistory |
| hw/msix.c | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |