From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: paul@xen.org, xen-devel@lists.xenproject.org, qemu-devel@nongnu.org
Cc: 'Eduardo Habkost' <ehabkost@redhat.com>,
'Jason Andryuk' <jandryuk@gmail.com>,
'Paul Durrant' <pdurrant@amazon.com>,
"'Michael S. Tsirkin'" <mst@redhat.com>,
'Paolo Bonzini' <pbonzini@redhat.com>,
'Richard Henderson' <rth@twiddle.net>
Subject: Re: [PATCH 2/2] xen: cleanup unrealized flash devices
Date: Tue, 30 Jun 2020 19:27:22 +0200 [thread overview]
Message-ID: <9e591254-d215-d5af-38d2-fd5b65f84a43@redhat.com> (raw)
In-Reply-To: <000701d64ef5$6568f660$303ae320$@xen.org>
On 6/30/20 5:44 PM, Paul Durrant wrote:
>> -----Original Message-----
>> From: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Sent: 30 June 2020 16:26
>> To: Paul Durrant <paul@xen.org>; xen-devel@lists.xenproject.org; qemu-devel@nongnu.org
>> Cc: Eduardo Habkost <ehabkost@redhat.com>; Michael S. Tsirkin <mst@redhat.com>; Paul Durrant
>> <pdurrant@amazon.com>; Jason Andryuk <jandryuk@gmail.com>; Paolo Bonzini <pbonzini@redhat.com>;
>> Richard Henderson <rth@twiddle.net>
>> Subject: Re: [PATCH 2/2] xen: cleanup unrealized flash devices
>>
>> On 6/24/20 2:18 PM, Paul Durrant wrote:
>>> From: Paul Durrant <pdurrant@amazon.com>
>>>
>>> The generic pc_machine_initfn() calls pc_system_flash_create() which creates
>>> 'system.flash0' and 'system.flash1' devices. These devices are then realized
>>> by pc_system_flash_map() which is called from pc_system_firmware_init() which
>>> itself is called via pc_memory_init(). The latter however is not called when
>>> xen_enable() is true and hence the following assertion fails:
>>>
>>> qemu-system-i386: hw/core/qdev.c:439: qdev_assert_realized_properly:
>>> Assertion `dev->realized' failed
>>>
>>> These flash devices are unneeded when using Xen so this patch avoids the
>>> assertion by simply removing them using pc_system_flash_cleanup_unused().
>>>
>>> Reported-by: Jason Andryuk <jandryuk@gmail.com>
>>> Fixes: ebc29e1beab0 ("pc: Support firmware configuration with -blockdev")
>>> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
>>> Tested-by: Jason Andryuk <jandryuk@gmail.com>
>>> ---
>>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>>> Cc: Richard Henderson <rth@twiddle.net>
>>> Cc: Eduardo Habkost <ehabkost@redhat.com>
>>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>>> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
>>> ---
>>> hw/i386/pc_piix.c | 9 ++++++---
>>> hw/i386/pc_sysfw.c | 2 +-
>>> include/hw/i386/pc.h | 1 +
>>> 3 files changed, 8 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>>> index 1497d0e4ae..977d40afb8 100644
>>> --- a/hw/i386/pc_piix.c
>>> +++ b/hw/i386/pc_piix.c
>>> @@ -186,9 +186,12 @@ static void pc_init1(MachineState *machine,
>>> if (!xen_enabled()) {
>>> pc_memory_init(pcms, system_memory,
>>> rom_memory, &ram_memory);
>>> - } else if (machine->kernel_filename != NULL) {
>>> - /* For xen HVM direct kernel boot, load linux here */
>>> - xen_load_linux(pcms);
>>> + } else {
>>> + pc_system_flash_cleanup_unused(pcms);
>>
>> TIL pc_system_flash_cleanup_unused().
>>
>> What about restricting at the source?
>>
>
> And leave the devices in place? They are not relevant for Xen, so why not clean up?
No, I meant to not create them in the first place, instead of
create+destroy.
Anyway what you did works, so I don't have any problem.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Paul
>
>> -- >8 --
>> --- a/hw/i386/pc.c
>> +++ b/hw/i386/pc.c
>> @@ -1004,24 +1004,26 @@ void pc_memory_init(PCMachineState *pcms,
>> &machine->device_memory->mr);
>> }
>>
>> - /* Initialize PC system firmware */
>> - pc_system_firmware_init(pcms, rom_memory);
>> -
>> - option_rom_mr = g_malloc(sizeof(*option_rom_mr));
>> - memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
>> - &error_fatal);
>> - if (pcmc->pci_enabled) {
>> - memory_region_set_readonly(option_rom_mr, true);
>> - }
>> - memory_region_add_subregion_overlap(rom_memory,
>> - PC_ROM_MIN_VGA,
>> - option_rom_mr,
>> - 1);
>> -
>> fw_cfg = fw_cfg_arch_create(machine,
>> x86ms->boot_cpus, x86ms->apic_id_limit);
>>
>> - rom_set_fw(fw_cfg);
>> + /* Initialize PC system firmware */
>> + if (!xen_enabled()) {
>> + pc_system_firmware_init(pcms, rom_memory);
>> +
>> + option_rom_mr = g_malloc(sizeof(*option_rom_mr));
>> + memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
>> + &error_fatal);
>> + if (pcmc->pci_enabled) {
>> + memory_region_set_readonly(option_rom_mr, true);
>> + }
>> + memory_region_add_subregion_overlap(rom_memory,
>> + PC_ROM_MIN_VGA,
>> + option_rom_mr,
>> + 1);
>> +
>> + rom_set_fw(fw_cfg);
>> + }
>>
>> if (pcmc->has_reserved_memory && machine->device_memory->base) {
>> uint64_t *val = g_malloc(sizeof(*val));
>> ---
>>
>>> + if (machine->kernel_filename != NULL) {
>>> + /* For xen HVM direct kernel boot, load linux here */
>>> + xen_load_linux(pcms);
>>> + }
>>> }
>>>
>>> gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
>>> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
>>> index ec2a3b3e7e..0ff47a4b59 100644
>>> --- a/hw/i386/pc_sysfw.c
>>> +++ b/hw/i386/pc_sysfw.c
>>> @@ -108,7 +108,7 @@ void pc_system_flash_create(PCMachineState *pcms)
>>> }
>>> }
>>>
>>> -static void pc_system_flash_cleanup_unused(PCMachineState *pcms)
>>> +void pc_system_flash_cleanup_unused(PCMachineState *pcms)
>>> {
>>> char *prop_name;
>>> int i;
>>> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
>>> index e6135c34d6..497f2b7ab7 100644
>>> --- a/include/hw/i386/pc.h
>>> +++ b/include/hw/i386/pc.h
>>> @@ -187,6 +187,7 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0);
>>>
>>> /* pc_sysfw.c */
>>> void pc_system_flash_create(PCMachineState *pcms);
>>> +void pc_system_flash_cleanup_unused(PCMachineState *pcms);
>>> void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);
>>>
>>> /* acpi-build.c */
>>>
>
>
next prev parent reply other threads:[~2020-06-30 17:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 12:18 [PATCH 0/2] fix assertion failures when using Xen Paul Durrant
2020-06-24 12:18 ` [PATCH 1/2] xen: fix legacy 'xen-sysdev' and 'xen-backend' bus types Paul Durrant
2020-06-30 15:19 ` Philippe Mathieu-Daudé
2020-06-24 12:18 ` [PATCH 2/2] xen: cleanup unrealized flash devices Paul Durrant
2020-06-30 15:08 ` Anthony PERARD
2020-06-30 15:17 ` Paul Durrant
2020-07-01 5:56 ` Markus Armbruster
2020-06-30 15:25 ` Philippe Mathieu-Daudé
2020-06-30 15:44 ` Paul Durrant
2020-06-30 17:27 ` Philippe Mathieu-Daudé [this message]
2020-07-01 5:59 ` Markus Armbruster
2020-07-01 7:03 ` Paul Durrant
2020-07-01 12:25 ` Jason Andryuk
2020-07-01 12:40 ` Philippe Mathieu-Daudé
2020-07-01 12:55 ` Philippe Mathieu-Daudé
2020-07-01 14:59 ` Jason Andryuk
2020-07-01 15:10 ` Philippe Mathieu-Daudé
2020-07-02 3:55 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e591254-d215-d5af-38d2-fd5b65f84a43@redhat.com \
--to=philmd@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jandryuk@gmail.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=pdurrant@amazon.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).