Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* cpu-exec: more cleanups to CPU loop exits
* python: bump bundled Meson to 1.9.0
* rust: require Rust 1.83.0
* rust: temporarily remove from Ubuntu CI
* rust: vmstate: convert to use builder pattern
* rust: split "qemu-api" crate
* rust: rename qemu_api_macros -> qemu_macros
* rust: re-export qemu macros from other crates
* x86: fix functional test failure for Xen emulation
* x86: cleanups

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCgAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmjK6ZsUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroNBKwf/aadInCT4vASOfpxbwZgYfYgR2m2m
# BJE9oYKxZJ6MlEOU/1Wfywf9fg4leMSh3XxkDKkEIL19yS6emwin8n3SNYrdAFn3
# 6u4IIWO4NI1Ht3NKytrqFk9wtbH9pAs/gVHLlnmpMxIqtOtZLumPAKNz8rlantmK
# UVDYL3Y0L4pD9i5FK1ObMNpk5AsWNr8Tr64fmb+nTkHutld3sBrEMCLI0+EByGyN
# lQ16sLn9PGqHOr210zuQP7wP2T3NCI3YokFSPQrUUL8LZGxRdXoNF4hI4uZDKGdn
# UbtRu9EkM052qzfsFMrEw5JSbdxEfIjKlPoFKseMv+aWvNAuximAraD3Vg==
# =Lr+x
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 17 Sep 2025 10:02:19 AM PDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [unknown]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (60 commits)
  accel/kvm: Set guest_memfd_offset to non-zero value only when guest_memfd is valid
  accel/kvm: Zero out mem explicitly in kvm_set_user_memory_region()
  accel/kvm: Switch to check KVM_CAP_GUEST_MEMFD and KVM_CAP_USER_MEMORY2 on VM
  i386/kvm: Drop KVM_CAP_X86_SMM check in kvm_arch_init()
  multiboot: Fix the split lock
  target/i386: Define enum X86ASIdx for x86's address spaces
  i386/cpu: Enable SMM cpu address space under KVM
  hpet: guard IRQ handling with BQL
  rust: do not inline do_init_io
  rust: meson: remove unnecessary complication in device crates
  docs: update rust.rst
  rust: re-export qemu macros from common/qom/hwcore
  rust: re-export qemu_macros internal helper in "bits"
  rust: repurpose qemu_api -> tests
  rust/pl011: drop dependency on qemu_api
  rust/hpet: drop now unneeded qemu_api dep
  rust: rename qemu_api_macros -> qemu_macros
  rust: split "hwcore" crate
  rust: split "system" crate
  rust: split "chardev" crate
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

1 files changed, 0 insertions, 122 deletions

diff --git a/rust/qemu-api/src/sysbus.rs b/rust/qemu-api/src/sysbus.rs
deleted file mode 100644
index e92502a8fe..0000000000
--- a/rust/qemu-api/src/sysbus.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2024 Red Hat, Inc.
-// Author(s): Paolo Bonzini <pbonzini@redhat.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-//! Bindings to access `sysbus` functionality from Rust.
-
-use std::{ffi::CStr, ptr::addr_of_mut};
-
-pub use bindings::SysBusDeviceClass;
-
-use crate::{
-    bindings,
-    cell::{bql_locked, Opaque},
-    irq::{IRQState, InterruptSource},
-    memory::MemoryRegion,
-    prelude::*,
-    qdev::{DeviceImpl, DeviceState},
-    qom::Owned,
-};
-
-/// A safe wrapper around [`bindings::SysBusDevice`].
-#[repr(transparent)]
-#[derive(Debug, qemu_api_macros::Wrapper)]
-pub struct SysBusDevice(Opaque<bindings::SysBusDevice>);
-
-unsafe impl Send for SysBusDevice {}
-unsafe impl Sync for SysBusDevice {}
-
-unsafe impl ObjectType for SysBusDevice {
-    type Class = SysBusDeviceClass;
-    const TYPE_NAME: &'static CStr =
-        unsafe { CStr::from_bytes_with_nul_unchecked(bindings::TYPE_SYS_BUS_DEVICE) };
-}
-qom_isa!(SysBusDevice: DeviceState, Object);
-
-// TODO: add virtual methods
-pub trait SysBusDeviceImpl: DeviceImpl + IsA<SysBusDevice> {}
-
-impl SysBusDeviceClass {
-    /// Fill in the virtual methods of `SysBusDeviceClass` based on the
-    /// definitions in the `SysBusDeviceImpl` trait.
-    pub fn class_init<T: SysBusDeviceImpl>(self: &mut SysBusDeviceClass) {
-        self.parent_class.class_init::<T>();
-    }
-}
-
-/// Trait for methods of [`SysBusDevice`] and its subclasses.
-pub trait SysBusDeviceMethods: ObjectDeref
-where
-    Self::Target: IsA<SysBusDevice>,
-{
-    /// Expose a memory region to the board so that it can give it an address
-    /// in guest memory.  Note that the ordering of calls to `init_mmio` is
-    /// important, since whoever creates the sysbus device will refer to the
-    /// region with a number that corresponds to the order of calls to
-    /// `init_mmio`.
-    fn init_mmio(&self, iomem: &MemoryRegion) {
-        assert!(bql_locked());
-        unsafe {
-            bindings::sysbus_init_mmio(self.upcast().as_mut_ptr(), iomem.as_mut_ptr());
-        }
-    }
-
-    /// Expose an interrupt source outside the device as a qdev GPIO output.
-    /// Note that the ordering of calls to `init_irq` is important, since
-    /// whoever creates the sysbus device will refer to the interrupts with
-    /// a number that corresponds to the order of calls to `init_irq`.
-    fn init_irq(&self, irq: &InterruptSource) {
-        assert!(bql_locked());
-        unsafe {
-            bindings::sysbus_init_irq(self.upcast().as_mut_ptr(), irq.as_ptr());
-        }
-    }
-
-    // TODO: do we want a type like GuestAddress here?
-    fn mmio_addr(&self, id: u32) -> Option<u64> {
-        assert!(bql_locked());
-        // SAFETY: the BQL ensures that no one else writes to sbd.mmio[], and
-        // the SysBusDevice must be initialized to get an IsA<SysBusDevice>.
-        let sbd = unsafe { *self.upcast().as_ptr() };
-        let id: usize = id.try_into().unwrap();
-        if sbd.mmio[id].memory.is_null() {
-            None
-        } else {
-            Some(sbd.mmio[id].addr)
-        }
-    }
-
-    // TODO: do we want a type like GuestAddress here?
-    fn mmio_map(&self, id: u32, addr: u64) {
-        assert!(bql_locked());
-        let id: i32 = id.try_into().unwrap();
-        unsafe {
-            bindings::sysbus_mmio_map(self.upcast().as_mut_ptr(), id, addr);
-        }
-    }
-
-    // Owned<> is used here because sysbus_connect_irq (via
-    // object_property_set_link) adds a reference to the IRQState,
-    // which can prolong its life
-    fn connect_irq(&self, id: u32, irq: &Owned<IRQState>) {
-        assert!(bql_locked());
-        let id: i32 = id.try_into().unwrap();
-        let irq: &IRQState = irq;
-        unsafe {
-            bindings::sysbus_connect_irq(self.upcast().as_mut_ptr(), id, irq.as_mut_ptr());
-        }
-    }
-
-    fn sysbus_realize(&self) {
-        // TODO: return an Error
-        assert!(bql_locked());
-        unsafe {
-            bindings::sysbus_realize(
-                self.upcast().as_mut_ptr(),
-                addr_of_mut!(bindings::error_fatal),
-            );
-        }
-    }
-}
-
-impl<R: ObjectDeref> SysBusDeviceMethods for R where R::Target: IsA<SysBusDevice> {}