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, 271 deletions

diff --git a/rust/qemu-api-macros/src/lib.rs b/rust/qemu-api-macros/src/lib.rs
deleted file mode 100644
index 959726efe6..0000000000
--- a/rust/qemu-api-macros/src/lib.rs
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2024, Linaro Limited
-// Author(s): Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{
-    parse_macro_input, parse_quote, punctuated::Punctuated, spanned::Spanned, token::Comma, Data,
-    DeriveInput, Error, Field, Fields, FieldsUnnamed, Ident, Meta, Path, Token, Variant,
-};
-mod bits;
-use bits::BitsConstInternal;
-
-#[cfg(test)]
-mod tests;
-
-fn get_fields<'a>(
-    input: &'a DeriveInput,
-    msg: &str,
-) -> Result<&'a Punctuated<Field, Comma>, Error> {
-    let Data::Struct(ref s) = &input.data else {
-        return Err(Error::new(
-            input.ident.span(),
-            format!("Struct required for {msg}"),
-        ));
-    };
-    let Fields::Named(ref fs) = &s.fields else {
-        return Err(Error::new(
-            input.ident.span(),
-            format!("Named fields required for {msg}"),
-        ));
-    };
-    Ok(&fs.named)
-}
-
-fn get_unnamed_field<'a>(input: &'a DeriveInput, msg: &str) -> Result<&'a Field, Error> {
-    let Data::Struct(ref s) = &input.data else {
-        return Err(Error::new(
-            input.ident.span(),
-            format!("Struct required for {msg}"),
-        ));
-    };
-    let Fields::Unnamed(FieldsUnnamed { ref unnamed, .. }) = &s.fields else {
-        return Err(Error::new(
-            s.fields.span(),
-            format!("Tuple struct required for {msg}"),
-        ));
-    };
-    if unnamed.len() != 1 {
-        return Err(Error::new(
-            s.fields.span(),
-            format!("A single field is required for {msg}"),
-        ));
-    }
-    Ok(&unnamed[0])
-}
-
-fn is_c_repr(input: &DeriveInput, msg: &str) -> Result<(), Error> {
-    let expected = parse_quote! { #[repr(C)] };
-
-    if input.attrs.iter().any(|attr| attr == &expected) {
-        Ok(())
-    } else {
-        Err(Error::new(
-            input.ident.span(),
-            format!("#[repr(C)] required for {msg}"),
-        ))
-    }
-}
-
-fn is_transparent_repr(input: &DeriveInput, msg: &str) -> Result<(), Error> {
-    let expected = parse_quote! { #[repr(transparent)] };
-
-    if input.attrs.iter().any(|attr| attr == &expected) {
-        Ok(())
-    } else {
-        Err(Error::new(
-            input.ident.span(),
-            format!("#[repr(transparent)] required for {msg}"),
-        ))
-    }
-}
-
-fn derive_object_or_error(input: DeriveInput) -> Result<proc_macro2::TokenStream, Error> {
-    is_c_repr(&input, "#[derive(Object)]")?;
-
-    let name = &input.ident;
-    let parent = &get_fields(&input, "#[derive(Object)]")?
-        .get(0)
-        .ok_or_else(|| {
-            Error::new(
-                input.ident.span(),
-                "#[derive(Object)] requires a parent field",
-            )
-        })?
-        .ident;
-
-    Ok(quote! {
-        ::qemu_api::assert_field_type!(#name, #parent,
-            ::qemu_api::qom::ParentField<<#name as ::qemu_api::qom::ObjectImpl>::ParentType>);
-
-        ::qemu_api::module_init! {
-            MODULE_INIT_QOM => unsafe {
-                ::qemu_api::bindings::type_register_static(&<#name as ::qemu_api::qom::ObjectImpl>::TYPE_INFO);
-            }
-        }
-    })
-}
-
-#[proc_macro_derive(Object)]
-pub fn derive_object(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    derive_object_or_error(input)
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}
-
-fn derive_opaque_or_error(input: DeriveInput) -> Result<proc_macro2::TokenStream, Error> {
-    is_transparent_repr(&input, "#[derive(Wrapper)]")?;
-
-    let name = &input.ident;
-    let field = &get_unnamed_field(&input, "#[derive(Wrapper)]")?;
-    let typ = &field.ty;
-
-    Ok(quote! {
-        unsafe impl ::qemu_api::cell::Wrapper for #name {
-            type Wrapped = <#typ as ::qemu_api::cell::Wrapper>::Wrapped;
-        }
-        impl #name {
-            pub unsafe fn from_raw<'a>(ptr: *mut <Self as ::qemu_api::cell::Wrapper>::Wrapped) -> &'a Self {
-                let ptr = ::std::ptr::NonNull::new(ptr).unwrap().cast::<Self>();
-                unsafe { ptr.as_ref() }
-            }
-
-            pub const fn as_mut_ptr(&self) -> *mut <Self as ::qemu_api::cell::Wrapper>::Wrapped {
-                self.0.as_mut_ptr()
-            }
-
-            pub const fn as_ptr(&self) -> *const <Self as ::qemu_api::cell::Wrapper>::Wrapped {
-                self.0.as_ptr()
-            }
-
-            pub const fn as_void_ptr(&self) -> *mut ::core::ffi::c_void {
-                self.0.as_void_ptr()
-            }
-
-            pub const fn raw_get(slot: *mut Self) -> *mut <Self as ::qemu_api::cell::Wrapper>::Wrapped {
-                slot.cast()
-            }
-        }
-    })
-}
-
-#[proc_macro_derive(Wrapper)]
-pub fn derive_opaque(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    derive_opaque_or_error(input)
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}
-
-#[allow(non_snake_case)]
-fn get_repr_uN(input: &DeriveInput, msg: &str) -> Result<Path, Error> {
-    let repr = input.attrs.iter().find(|attr| attr.path().is_ident("repr"));
-    if let Some(repr) = repr {
-        let nested = repr.parse_args_with(Punctuated::<Meta, Token![,]>::parse_terminated)?;
-        for meta in nested {
-            match meta {
-                Meta::Path(path) if path.is_ident("u8") => return Ok(path),
-                Meta::Path(path) if path.is_ident("u16") => return Ok(path),
-                Meta::Path(path) if path.is_ident("u32") => return Ok(path),
-                Meta::Path(path) if path.is_ident("u64") => return Ok(path),
-                _ => {}
-            }
-        }
-    }
-
-    Err(Error::new(
-        input.ident.span(),
-        format!("#[repr(u8/u16/u32/u64) required for {msg}"),
-    ))
-}
-
-fn get_variants(input: &DeriveInput) -> Result<&Punctuated<Variant, Comma>, Error> {
-    let Data::Enum(ref e) = &input.data else {
-        return Err(Error::new(
-            input.ident.span(),
-            "Cannot derive TryInto for union or struct.",
-        ));
-    };
-    if let Some(v) = e.variants.iter().find(|v| v.fields != Fields::Unit) {
-        return Err(Error::new(
-            v.fields.span(),
-            "Cannot derive TryInto for enum with non-unit variants.",
-        ));
-    }
-    Ok(&e.variants)
-}
-
-#[rustfmt::skip::macros(quote)]
-fn derive_tryinto_body(
-    name: &Ident,
-    variants: &Punctuated<Variant, Comma>,
-    repr: &Path,
-) -> Result<proc_macro2::TokenStream, Error> {
-    let discriminants: Vec<&Ident> = variants.iter().map(|f| &f.ident).collect();
-
-    Ok(quote! {
-        #(const #discriminants: #repr = #name::#discriminants as #repr;)*
-        match value {
-            #(#discriminants => core::result::Result::Ok(#name::#discriminants),)*
-            _ => core::result::Result::Err(value),
-        }
-    })
-}
-
-#[rustfmt::skip::macros(quote)]
-fn derive_tryinto_or_error(input: DeriveInput) -> Result<proc_macro2::TokenStream, Error> {
-    let repr = get_repr_uN(&input, "#[derive(TryInto)]")?;
-    let name = &input.ident;
-    let body = derive_tryinto_body(name, get_variants(&input)?, &repr)?;
-    let errmsg = format!("invalid value for {name}");
-
-    Ok(quote! {
-        impl #name {
-            #[allow(dead_code)]
-            pub const fn into_bits(self) -> #repr {
-                self as #repr
-            }
-
-            #[allow(dead_code)]
-            pub const fn from_bits(value: #repr) -> Self {
-                match ({
-                    #body
-                }) {
-                    Ok(x) => x,
-                    Err(_) => panic!(#errmsg),
-                }
-            }
-        }
-        impl core::convert::TryFrom<#repr> for #name {
-            type Error = #repr;
-
-            #[allow(ambiguous_associated_items)]
-            fn try_from(value: #repr) -> Result<Self, #repr> {
-                #body
-            }
-        }
-    })
-}
-
-#[proc_macro_derive(TryInto)]
-pub fn derive_tryinto(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    derive_tryinto_or_error(input)
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}
-
-#[proc_macro]
-pub fn bits_const_internal(ts: TokenStream) -> TokenStream {
-    let ts = proc_macro2::TokenStream::from(ts);
-    let mut it = ts.into_iter();
-
-    BitsConstInternal::parse(&mut it)
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}