From: Thomas Huth <thuth@redhat.com>
To: qemu-s390x@nongnu.org,
Christian Borntraeger <borntraeger@linux.ibm.com>,
David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org, Eric Farman <farman@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>
Subject: [PATCH 05/10] hw/s390x/ipl: Remove the "iplbext_migration" property
Date: Fri, 3 Jan 2025 15:42:27 +0100 [thread overview]
Message-ID: <20250103144232.520383-6-thuth@redhat.com> (raw)
In-Reply-To: <20250103144232.520383-1-thuth@redhat.com>
Now that the old machine types that used this property have been
removed, we can remove the property and the corresponding code.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/ipl.h | 1 -
hw/s390x/ipl.c | 10 ----------
2 files changed, 11 deletions(-)
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index d7d0b7bfd2..8e3882d506 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -80,7 +80,6 @@ struct S390IPLState {
uint8_t cssid;
uint8_t ssid;
uint16_t devno;
- bool iplbext_migration;
};
QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wrong");
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 3a946be7a5..4aa21c91fc 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -49,13 +49,6 @@
#define BIOS_MAX_SIZE 0x300000UL
#define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64)
-static bool iplb_extended_needed(void *opaque)
-{
- S390IPLState *ipl = S390_IPL(object_resolve_path(TYPE_S390_IPL, NULL));
-
- return ipl->iplbext_migration;
-}
-
/* Place the IPLB chain immediately before the BIOS in memory */
static uint64_t find_iplb_chain_addr(uint64_t bios_addr, uint16_t count)
{
@@ -67,7 +60,6 @@ static const VMStateDescription vmstate_iplb_extended = {
.name = "ipl/iplb_extended",
.version_id = 0,
.minimum_version_id = 0,
- .needed = iplb_extended_needed,
.fields = (const VMStateField[]) {
VMSTATE_UINT8_ARRAY(reserved_ext, IplParameterBlock, 4096 - 200),
VMSTATE_END_OF_LIST()
@@ -297,8 +289,6 @@ static const Property s390_ipl_properties[] = {
DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline),
DEFINE_PROP_STRING("firmware", S390IPLState, firmware),
DEFINE_PROP_BOOL("enforce_bios", S390IPLState, enforce_bios, false),
- DEFINE_PROP_BOOL("iplbext_migration", S390IPLState, iplbext_migration,
- true),
};
static void s390_ipl_set_boot_menu(S390IPLState *ipl)
--
2.47.1
next prev parent reply other threads:[~2025-01-03 14:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-03 14:42 [PATCH 00/10] hw/s390x: Remove deprecated machine types 2.4 up to 2.8 Thomas Huth
2025-01-03 14:42 ` [PATCH 01/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.4 and 2.5 machine types Thomas Huth
2025-01-07 11:03 ` Philippe Mathieu-Daudé
2025-01-07 11:06 ` Philippe Mathieu-Daudé
2025-01-07 12:59 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 02/10] hw/s390x/s390-skeys: Remove the "migration-enabled" property Thomas Huth
2025-01-07 13:00 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 03/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type Thomas Huth
2025-01-07 13:01 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 04/10] hw/s390x: Remove the "ri_allowed" switch Thomas Huth
2025-01-07 13:03 ` Cornelia Huck
2025-01-03 14:42 ` Thomas Huth [this message]
2025-01-07 11:04 ` [PATCH 05/10] hw/s390x/ipl: Remove the "iplbext_migration" property Philippe Mathieu-Daudé
2025-01-07 13:04 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 06/10] hw/s390x/css-bridge: Remove the "css_dev_path" property Thomas Huth
2025-01-07 11:05 ` Philippe Mathieu-Daudé
2025-01-07 13:06 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 07/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.7 machine type Thomas Huth
2025-01-07 13:07 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 08/10] hw/s390x: Remove the cpu_model_allowed flag and related code Thomas Huth
2025-01-07 13:09 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 09/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.8 machine type Thomas Huth
2025-01-07 13:10 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 10/10] hw/s390x: Remove the "adapter_routes_max_batch" property from the flic Thomas Huth
2025-01-07 11:06 ` Philippe Mathieu-Daudé
2025-01-07 13:11 ` Cornelia Huck
2025-01-07 10:22 ` [PATCH 00/10] hw/s390x: Remove deprecated machine types 2.4 up to 2.8 Christian Borntraeger
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=20250103144232.520383-6-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@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 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).