[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5339] Add to machine structure a flag to use SCSI drives i
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [5339] Add to machine structure a flag to use SCSI drives instead of IDE: fixes SS-20 |
Date: |
Sun, 28 Sep 2008 18:55:17 +0000 |
Revision: 5339
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5339
Author: blueswir1
Date: 2008-09-28 18:55:17 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
Add to machine structure a flag to use SCSI drives instead of IDE: fixes SS-20
Modified Paths:
--------------
trunk/hw/boards.h
trunk/hw/realview.c
trunk/hw/sun4m.c
trunk/hw/versatilepb.c
trunk/vl.c
Modified: trunk/hw/boards.h
===================================================================
--- trunk/hw/boards.h 2008-09-28 02:43:18 UTC (rev 5338)
+++ trunk/hw/boards.h 2008-09-28 18:55:17 UTC (rev 5339)
@@ -17,6 +17,7 @@
#define RAMSIZE_FIXED (1 << 0)
ram_addr_t ram_require;
int nodisk_ok;
+ int use_scsi;
struct QEMUMachine *next;
} QEMUMachine;
Modified: trunk/hw/realview.c
===================================================================
--- trunk/hw/realview.c 2008-09-28 02:43:18 UTC (rev 5338)
+++ trunk/hw/realview.c 2008-09-28 18:55:17 UTC (rev 5339)
@@ -197,8 +197,9 @@
}
QEMUMachine realview_machine = {
- "realview",
- "ARM RealView Emulation Baseboard (ARM926EJ-S)",
- realview_init,
- 0x1000
+ .name = "realview",
+ .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
+ .init = realview_init,
+ .ram_require = 0x1000,
+ .use_scsi = 1,
};
Modified: trunk/hw/sun4m.c
===================================================================
--- trunk/hw/sun4m.c 2008-09-28 02:43:18 UTC (rev 5338)
+++ trunk/hw/sun4m.c 2008-09-28 18:55:17 UTC (rev 5339)
@@ -1292,6 +1292,7 @@
.init = ss5_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss10_machine = {
@@ -1300,6 +1301,7 @@
.init = ss10_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss600mp_machine = {
@@ -1308,6 +1310,7 @@
.init = ss600mp_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss20_machine = {
@@ -1316,6 +1319,7 @@
.init = ss20_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss2_machine = {
@@ -1324,6 +1328,7 @@
.init = ss2_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine voyager_machine = {
@@ -1332,6 +1337,7 @@
.init = vger_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss_lx_machine = {
@@ -1340,6 +1346,7 @@
.init = ss_lx_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss4_machine = {
@@ -1348,6 +1355,7 @@
.init = ss4_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine scls_machine = {
@@ -1356,6 +1364,7 @@
.init = scls_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine sbook_machine = {
@@ -1364,6 +1373,7 @@
.init = sbook_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1611,6 +1621,7 @@
.init = ss1000_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
QEMUMachine ss2000_machine = {
@@ -1619,4 +1630,5 @@
.init = ss2000_init,
.ram_require = PROM_SIZE_MAX + TCX_SIZE,
.nodisk_ok = 1,
+ .use_scsi = 1,
};
Modified: trunk/hw/versatilepb.c
===================================================================
--- trunk/hw/versatilepb.c 2008-09-28 02:43:18 UTC (rev 5338)
+++ trunk/hw/versatilepb.c 2008-09-28 18:55:17 UTC (rev 5339)
@@ -316,13 +316,15 @@
}
QEMUMachine versatilepb_machine = {
- "versatilepb",
- "ARM Versatile/PB (ARM926EJ-S)",
- vpb_init,
+ .name = "versatilepb",
+ .desc = "ARM Versatile/PB (ARM926EJ-S)",
+ .init = vpb_init,
+ .use_scsi = 1,
};
QEMUMachine versatileab_machine = {
- "versatileab",
- "ARM Versatile/AB (ARM926EJ-S)",
- vab_init,
+ .name = "versatileab",
+ .desc = "ARM Versatile/AB (ARM926EJ-S)",
+ .init = vab_init,
+ .use_scsi = 1,
};
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2008-09-28 02:43:18 UTC (rev 5338)
+++ trunk/vl.c 2008-09-28 18:55:17 UTC (rev 5339)
@@ -5461,12 +5461,7 @@
index = -1;
cache = 1;
- if (!strcmp(machine->name, "realview") ||
- !strcmp(machine->name, "SS-5") ||
- !strcmp(machine->name, "SS-10") ||
- !strcmp(machine->name, "SS-600MP") ||
- !strcmp(machine->name, "versatilepb") ||
- !strcmp(machine->name, "versatileab")) {
+ if (machine->use_scsi) {
type = IF_SCSI;
max_devs = MAX_SCSI_DEVS;
pstrcpy(devname, sizeof(devname), "scsi");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5339] Add to machine structure a flag to use SCSI drives instead of IDE: fixes SS-20,
Blue Swirl <=