projects
/
seabios.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4fe135
)
Make sure virtio-blk is fully compiled out if not wanted.
author
Kevin O'Connor
<kevin@koconnor.net>
Sun, 23 May 2010 14:19:03 +0000
(10:19 -0400)
committer
Kevin O'Connor
<kevin@koconnor.net>
Sun, 23 May 2010 14:19:03 +0000
(10:19 -0400)
Add check for CONFIG_VIRTIO_BLK in process_virtio_op.
Don't enable virtio when coreboot enabled.
src/virtio-blk.c
patch
|
blob
|
history
diff --git
a/src/virtio-blk.c
b/src/virtio-blk.c
index 7f9b3d2fadb960fd5ed4f88ee39481347dc88ce7..16d9ad868ad4dd415493e0f3b1044afce96135b4 100644
(file)
--- a/
src/virtio-blk.c
+++ b/
src/virtio-blk.c
@@
-68,6
+68,8
@@
virtio_blk_read(struct disk_op_s *op)
int
process_virtio_op(struct disk_op_s *op)
{
+ if (! CONFIG_VIRTIO_BLK || CONFIG_COREBOOT)
+ return 0;
switch (op->command) {
case CMD_READ:
return virtio_blk_read(op);
@@
-162,7
+164,7
@@
void
virtio_blk_setup(void)
{
ASSERT32FLAT();
- if (! CONFIG_VIRTIO_BLK)
+ if (! CONFIG_VIRTIO_BLK
|| CONFIG_COREBOOT
)
return;
dprintf(3, "init virtio-blk\n");