From f2fb227b0580b5cc164c7a2f60cf6ce3c09d7a23 Mon Sep 17 00:00:00 2001 From: Gao Junhao Date: Mon, 14 Oct 2019 21:17:03 +0000 Subject: [PATCH] doc: detail change for hld-devicemodel update code in hld-devicemodel to latest. Signed-off-by: Gao Junhao --- doc/developer-guides/hld/hld-devicemodel.rst | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/developer-guides/hld/hld-devicemodel.rst b/doc/developer-guides/hld/hld-devicemodel.rst index aca1832e7..6a9123e29 100644 --- a/doc/developer-guides/hld/hld-devicemodel.rst +++ b/doc/developer-guides/hld/hld-devicemodel.rst @@ -88,6 +88,10 @@ options: --virtio_poll: enable virtio poll mode with poll interval with ns --vtpm2: Virtual TPM2 args: sock_path=$PATH_OF_SWTPM_SOCKET --lapic_pt: enable local apic passthrough + --rtvm: indicate that the guest is rtvm + --logger_setting: params like console,level=4;kmsg,level=3 + --pm_notify_channel: define the channel used to notify guest about power event + --pm_by_vuart:pty,/run/acrn/vuart_vmname or tty,/dev/ttySn See :ref:`acrn-dm_parameters` for more detailed descriptions of these configuration options. @@ -247,6 +251,11 @@ DM Initialization handle_vmexit(ctx, vhm_req, vcpu_id); } + if (VM_SUSPEND_FULL_RESET == vm_get_suspend_mode() || + VM_SUSPEND_POWEROFF == vm_get_suspend_mode()) { + break; + } + if (VM_SUSPEND_SYSTEM_RESET == vm_get_suspend_mode()) { vm_system_reset(ctx); } @@ -255,7 +264,6 @@ DM Initialization vm_suspend_resume(ctx); } } - quit_vm_loop = 0; printf("VM loop exit\n"); } @@ -626,11 +634,6 @@ to destination emulated devices: void pci_lintr_request(struct pci_vdev *pi); void pci_lintr_release(struct pci_vdev *pi); - /* These APIs assert/deassert vPIC interrupt lines. */ - int vm_isa_assert_irq(struct vmctx *ctx, int atpic_irq, int ioapic_irq); - int vm_isa_deassert_irq(struct vmctx *ctx, int atpic_irq, int ioapic_irq); - int vm_isa_pulse_irq(struct vmctx *ctx, int atpic_irq, int ioapic_irq); - PIRQ Routing ============ @@ -1031,6 +1034,8 @@ including following elements: { basl_fwrite_mcfg, MCFG_OFFSET, true }, { basl_fwrite_facs, FACS_OFFSET, true }, { basl_fwrite_nhlt, NHLT_OFFSET, false }, /*valid with audio ptdev*/ + { basl_fwrite_tpm2, TPM2_OFFSET, false }, + { basl_fwrite_psds, PSDS_OFFSET, false }, /*valid when psds present in sos */ { basl_fwrite_dsdt, DSDT_OFFSET, true } }; @@ -1130,6 +1135,9 @@ device id: else if (device == 0x5abc) /* URT1 @ 00:18.0 for bluetooth*/ write_dsdt_urt1(dev); + else if (device == 0x5aca) + /* SDC @ 00:1b.0 */ + write_dsdt_sdc(dev); }