From: "Alex Bennée" <alex.bennee@linaro.org>
To: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: Re: [PATCH for 6.2?] Revert "vga: don't abort when adding a duplicate isa-vga device"
Date: Fri, 03 Dec 2021 10:23:02 +0000 [thread overview]
Message-ID: <877dcmx9yr.fsf@linaro.org> (raw)
In-Reply-To: <d756e6f4-cabc-5384-fb73-08e498d49bfd@ilande.co.uk>
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> writes:
> On 02/12/2021 17:14, Cornelia Huck wrote:
>
>> On Thu, Dec 02 2021, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>>> This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2.
>>>
>>> The check is bogus as it ends up finding itself and falling over.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> Resolves: https://gitlab.com/qemu-project/qemu.git/-/issues/733
>>> ---
>>> hw/display/vga-isa.c | 10 ----------
>>> 1 file changed, 10 deletions(-)
>>>
>>> diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
>>> index 8cea84f2be..90851e730b 100644
>>> --- a/hw/display/vga-isa.c
>>> +++ b/hw/display/vga-isa.c
>>> @@ -33,7 +33,6 @@
>>> #include "hw/loader.h"
>>> #include "hw/qdev-properties.h"
>>> #include "qom/object.h"
>>> -#include "qapi/error.h"
>>> #define TYPE_ISA_VGA "isa-vga"
>>> OBJECT_DECLARE_SIMPLE_TYPE(ISAVGAState, ISA_VGA)
>>> @@ -62,15 +61,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
>>> MemoryRegion *vga_io_memory;
>>> const MemoryRegionPortio *vga_ports, *vbe_ports;
>>> - /*
>>> - * make sure this device is not being added twice, if so
>>> - * exit without crashing qemu
>>> - */
>>> - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) {
>> Don't you simply need to invert the check? You should get NULL back
>> if
>> there is another device already...
>
> Yes that's correct - the existing check is simply missing a ! at the
> front. For an existing example take a look at the the fw_cfg device:
>
> https://gitlab.com/qemu-project/qemu/-/blob/master/hw/nvram/fw_cfg.c#L1228
> https://gitlab.com/qemu-project/qemu/-/blob/master/hw/nvram/fw_cfg.c#L1125
>
> Unfortunately it seems that I also missed this when I added my R-B tag
> :(
Although that doesn't seem to fix the original problem:
➜ ./qemu-system-x86_64 -name ELKS -machine isapc -cpu 486,tsc -m 1M -vga std -rtc base=utc -netdev user,id=mynet,hostfwd=tcp:127.0.0.1:8080-10.0.2.15:80,hostfwd=tcp:127.0.0
.1:2323-10.0.2.15:23 -device ne2k_isa,irq=12,netdev=mynet -drive if=ide,format=raw,file=$HOME/images/qemu.advent/day23/hd32mbr-fat.bin -drive if=ide,format=qcow2,file=$HOME/images/qemu.advent/day23/scratch.qcow2 -serial mon:stdio
QEMU 6.1.93 monitor - type 'help' for more information
(qemu) quit
🕙10:23:50 alex@zen:qemu.git/builds/all on plugins/upgrade-insn-tracking-plugin [$!?] took 5s
➜ ./qemu-system-mips64el -M pica61 -device isa-vga
RAMBlock "vga.vram" already registered, abort!
fish: “./qemu-system-mips64el -M pica6…” terminated by signal SIGABRT (Abort)
🕙10:23:54 alex@zen:qemu.git/builds/all on plugins/upgrade-insn-tracking-plugin [$!?] [⚡ IOT]
>
>
> ATB,
>
> Mark.
--
Alex Bennée
next prev parent reply other threads:[~2021-12-03 10:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 16:49 [PATCH for 6.2?] Revert "vga: don't abort when adding a duplicate isa-vga device" Alex Bennée
2021-12-02 16:57 ` Daniel P. Berrangé
2021-12-02 17:14 ` Cornelia Huck
2021-12-02 18:21 ` Mark Cave-Ayland
2021-12-03 10:23 ` Alex Bennée [this message]
2021-12-02 17:49 ` Philippe Mathieu-Daudé
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=877dcmx9yr.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=cohuck@redhat.com \
--cc=kraxel@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.