| commit | 64ce604c7e52913cf546f12798d0808813bb0e07 | |
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | |
| Mon, 5 Jul 2010 12:02:50 +0000 (5 13:02 +0100) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 5 Jul 2010 12:40:40 +0000 (5 15:40 +0300) | ||
| tree | 5bee09e697e46f7b2a26b67e5da53a70dbb967fb | treesnapshot (tar.gz zip) |
| parent | d4adede84de96d631f2c6eff2c01eae00b14a110 | commitdiff |
block: Restore extboot functionality after mismerge
Extboot if=virtio,boot=on is broken due to a mismerge of:
commit 666daa68234b5b1758652633cab07d5ca6046a5b
Author: Markus Armbruster <armbru@redhat.com>
Date: Wed Jun 2 18:48:27 2010 +0200
blockdev: Collect block device code in new blockdev.c
in:
commit 55cbee9e738bfe7434081967f884209f1a9c994c
Merge: a854beb 666daa6
Author: Avi Kivity <avi@redhat.com>
Date: Mon Jun 21 17:29:02 2010 +0300
Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into
upstream-merge
The extboot_drive global is no longer being initialized in drive_init().
This patch restores the code to initialize extboot_drive.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Extboot if=virtio,boot=on is broken due to a mismerge of:
commit 666daa68234b5b1758652633cab07d5ca6046a5b
Author: Markus Armbruster <armbru@redhat.com>
Date: Wed Jun 2 18:48:27 2010 +0200
blockdev: Collect block device code in new blockdev.c
in:
commit 55cbee9e738bfe7434081967f884209f1a9c994c
Merge: a854beb 666daa6
Author: Avi Kivity <avi@redhat.com>
Date: Mon Jun 21 17:29:02 2010 +0300
Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into
upstream-merge
The extboot_drive global is no longer being initialized in drive_init().
This patch restores the code to initialize extboot_drive.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| blockdev.c | diffblobblamehistory |