From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Sergio Lopez" <slp@redhat.com>, "Paul Durrant" <paul@xen.org>,
"David Woodhouse" <dwmw2@infradead.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Igor Mammedov" <imammedo@redhat.com>,
"Ani Sinha" <anisinha@redhat.com>,
"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH v3 1/4] hw/i386/pc: Remove "rtc_state" link again
Date: Sun, 3 Mar 2024 19:53:29 +0100 [thread overview]
Message-ID: <20240303185332.1408-2-shentey@gmail.com> (raw)
In-Reply-To: <20240303185332.1408-1-shentey@gmail.com>
Commit 99e1c1137b6f "hw/i386/pc: Populate RTC attribute directly" made linking
the "rtc_state" property unnecessary and removed it. Commit 84e945aad2d0 "vl,
pc: turn -no-fd-bootchk into a machine property" accidently reintroduced the
link. Remove it again since it is not needed.
Fixes: 84e945aad2d0 "vl, pc: turn -no-fd-bootchk into a machine property"
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/pc.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f5ff970acf..63b7583af0 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -613,14 +613,6 @@ void pc_cmos_init(PCMachineState *pcms,
mc146818rtc_set_cmos_data(s, 0x5c, val >> 8);
mc146818rtc_set_cmos_data(s, 0x5d, val >> 16);
- object_property_add_link(OBJECT(pcms), "rtc_state",
- TYPE_ISA_DEVICE,
- (Object **)&x86ms->rtc,
- object_property_allow_set_link,
- OBJ_PROP_LINK_STRONG);
- object_property_set_link(OBJECT(pcms), "rtc_state", OBJECT(s),
- &error_abort);
-
set_boot_dev(pcms, s, MACHINE(pcms)->boot_config.order, &error_fatal);
val = 0;
--
2.44.0
next prev parent reply other threads:[~2024-03-03 18:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-03 18:53 [PATCH v3 0/4] Simplify initialization of PC machines Bernhard Beschow
2024-03-03 18:53 ` Bernhard Beschow [this message]
2024-03-05 15:51 ` [PATCH v3 1/4] hw/i386/pc: Remove "rtc_state" link again Philippe Mathieu-Daudé
2024-03-05 15:57 ` Peter Maydell
2024-03-05 19:54 ` Bernhard Beschow
2024-03-05 20:00 ` Michael S. Tsirkin
2024-03-03 18:53 ` [PATCH v3 2/4] hw/i386/pc: Avoid one use of the current_machine global Bernhard Beschow
2024-03-05 15:52 ` Philippe Mathieu-Daudé
2024-03-03 18:53 ` [PATCH v3 3/4] hw/i386/pc: Set "normal" boot device order in pc_basic_device_init() Bernhard Beschow
2024-03-03 18:53 ` [PATCH v3 4/4] hw/i386/pc: Inline pc_cmos_init() into pc_cmos_init_late() and remove it Bernhard Beschow
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=20240303185332.1408-2-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=anisinha@redhat.com \
--cc=dwmw2@infradead.org \
--cc=eduardo@habkost.net \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=slp@redhat.com \
/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).