block: Handle "rechs" and "large" translation options
Sure, CHS translation is an obscure topic, and legacy options for hard-disk geometries are obscure as well. But since QEMU does nothing with it except telling the BIOS, and since there "large" and "rechs" are listed in the enums, parsing them seems to be the bare minimum. Acked-by: Stefan Hajnoczi <stefanha@gmail.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
c7bcc85d66
commit
f31c41ff5e
@ -776,6 +776,10 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
||||
translation = BIOS_ATA_TRANSLATION_NONE;
|
||||
} else if (!strcmp(value, "lba")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LBA;
|
||||
} else if (!strcmp(value, "large")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LARGE;
|
||||
} else if (!strcmp(value, "rechs")) {
|
||||
translation = BIOS_ATA_TRANSLATION_RECHS;
|
||||
} else if (!strcmp(value, "auto")) {
|
||||
translation = BIOS_ATA_TRANSLATION_AUTO;
|
||||
} else {
|
||||
|
@ -469,9 +469,11 @@ PropertyInfo qdev_prop_losttickpolicy = {
|
||||
/* --- BIOS CHS translation */
|
||||
|
||||
static const char *bios_chs_trans_table[] = {
|
||||
[BIOS_ATA_TRANSLATION_AUTO] = "auto",
|
||||
[BIOS_ATA_TRANSLATION_NONE] = "none",
|
||||
[BIOS_ATA_TRANSLATION_LBA] = "lba",
|
||||
[BIOS_ATA_TRANSLATION_AUTO] = "auto",
|
||||
[BIOS_ATA_TRANSLATION_NONE] = "none",
|
||||
[BIOS_ATA_TRANSLATION_LBA] = "lba",
|
||||
[BIOS_ATA_TRANSLATION_LARGE] = "large",
|
||||
[BIOS_ATA_TRANSLATION_RECHS] = "rechs",
|
||||
};
|
||||
|
||||
PropertyInfo qdev_prop_bios_chs_trans = {
|
||||
|
22
vl.c
22
vl.c
@ -3073,14 +3073,19 @@ int main(int argc, char **argv, char **envp)
|
||||
goto chs_fail;
|
||||
if (*p == ',') {
|
||||
p++;
|
||||
if (!strcmp(p, "none"))
|
||||
if (!strcmp(p, "large")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LARGE;
|
||||
} else if (!strcmp(p, "rechs")) {
|
||||
translation = BIOS_ATA_TRANSLATION_RECHS;
|
||||
} else if (!strcmp(p, "none")) {
|
||||
translation = BIOS_ATA_TRANSLATION_NONE;
|
||||
else if (!strcmp(p, "lba"))
|
||||
} else if (!strcmp(p, "lba")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LBA;
|
||||
else if (!strcmp(p, "auto"))
|
||||
} else if (!strcmp(p, "auto")) {
|
||||
translation = BIOS_ATA_TRANSLATION_AUTO;
|
||||
else
|
||||
} else {
|
||||
goto chs_fail;
|
||||
}
|
||||
} else if (*p != '\0') {
|
||||
chs_fail:
|
||||
fprintf(stderr, "qemu: invalid physical CHS format\n");
|
||||
@ -3094,10 +3099,15 @@ int main(int argc, char **argv, char **envp)
|
||||
qemu_opt_set(hda_opts, "heads", num);
|
||||
snprintf(num, sizeof(num), "%d", secs);
|
||||
qemu_opt_set(hda_opts, "secs", num);
|
||||
if (translation == BIOS_ATA_TRANSLATION_LBA)
|
||||
if (translation == BIOS_ATA_TRANSLATION_LARGE) {
|
||||
qemu_opt_set(hda_opts, "trans", "large");
|
||||
} else if (translation == BIOS_ATA_TRANSLATION_RECHS) {
|
||||
qemu_opt_set(hda_opts, "trans", "rechs");
|
||||
} else if (translation == BIOS_ATA_TRANSLATION_LBA) {
|
||||
qemu_opt_set(hda_opts, "trans", "lba");
|
||||
if (translation == BIOS_ATA_TRANSLATION_NONE)
|
||||
} else if (translation == BIOS_ATA_TRANSLATION_NONE) {
|
||||
qemu_opt_set(hda_opts, "trans", "none");
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user