mirror of https://github.com/xemu-project/xemu.git
mac_newworld: implement custom FWPathProvider
This enables the correct generation of bootdevice fw paths for in-built IDE and virtio-pci-blk devices suitable for OpenBIOS. Note we also set the MachineClass ignore_boot_device_suffixes property to true since an additional disk node should not be added except for virtio devices. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
03756c840e
commit
5d19be6c70
|
@ -64,6 +64,7 @@
|
|||
#include "hw/ppc/openpic.h"
|
||||
#include "hw/ide.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/fw-path-provider.h"
|
||||
#include "elf.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/kvm.h"
|
||||
|
@ -521,6 +522,54 @@ static void ppc_core99_init(MachineState *machine)
|
|||
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
|
||||
}
|
||||
|
||||
/*
|
||||
* Implementation of an interface to adjust firmware path
|
||||
* for the bootindex property handling.
|
||||
*/
|
||||
static char *core99_fw_dev_path(FWPathProvider *p, BusState *bus,
|
||||
DeviceState *dev)
|
||||
{
|
||||
PCIDevice *pci;
|
||||
IDEBus *ide_bus;
|
||||
IDEState *ide_s;
|
||||
MACIOIDEState *macio_ide;
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "macio-newworld")) {
|
||||
pci = PCI_DEVICE(dev);
|
||||
return g_strdup_printf("mac-io@%x", PCI_SLOT(pci->devfn));
|
||||
}
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "macio-ide")) {
|
||||
macio_ide = MACIO_IDE(dev);
|
||||
return g_strdup_printf("ata-3@%x", macio_ide->addr);
|
||||
}
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-drive")) {
|
||||
ide_bus = IDE_BUS(qdev_get_parent_bus(dev));
|
||||
ide_s = idebus_active_if(ide_bus);
|
||||
|
||||
if (ide_s->drive_kind == IDE_CD) {
|
||||
return g_strdup("cdrom");
|
||||
}
|
||||
|
||||
return g_strdup("hd");
|
||||
}
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-hd")) {
|
||||
return g_strdup("hd");
|
||||
}
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "ide-cd")) {
|
||||
return g_strdup("cdrom");
|
||||
}
|
||||
|
||||
if (!strcmp(object_get_typename(OBJECT(dev)), "virtio-blk-device")) {
|
||||
return g_strdup("disk");
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int core99_kvm_type(const char *arg)
|
||||
{
|
||||
/* Always force PR KVM */
|
||||
|
@ -530,6 +579,7 @@ static int core99_kvm_type(const char *arg)
|
|||
static void core99_machine_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
|
||||
|
||||
mc->desc = "Mac99 based PowerMAC";
|
||||
mc->init = ppc_core99_init;
|
||||
|
@ -543,6 +593,8 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
|
|||
#else
|
||||
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
|
||||
#endif
|
||||
mc->ignore_boot_device_suffixes = true;
|
||||
fwc->get_dev_path = core99_fw_dev_path;
|
||||
}
|
||||
|
||||
static char *core99_get_via_config(Object *obj, Error **errp)
|
||||
|
@ -599,7 +651,11 @@ static const TypeInfo core99_machine_info = {
|
|||
.parent = TYPE_MACHINE,
|
||||
.class_init = core99_machine_class_init,
|
||||
.instance_init = core99_instance_init,
|
||||
.instance_size = sizeof(Core99MachineState)
|
||||
.instance_size = sizeof(Core99MachineState),
|
||||
.interfaces = (InterfaceInfo[]) {
|
||||
{ TYPE_FW_PATH_PROVIDER },
|
||||
{ }
|
||||
},
|
||||
};
|
||||
|
||||
static void mac_machine_register_types(void)
|
||||
|
|
Loading…
Reference in New Issue