From 946cef18cba15ee7ae3fb730299fc61340a50c6e Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sun, 8 Sep 2024 18:34:15 -0700 Subject: [PATCH] feat: qemu 9.1.0 --- codegen/src/lib.rs | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- qmp/schema/qapi/rdma.json | 1 - qmp/schema/qapi/vfio.json | 1 + schema | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 120000 qmp/schema/qapi/rdma.json create mode 120000 qmp/schema/qapi/vfio.json diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs index 074a78d..564a271 100644 --- a/codegen/src/lib.rs +++ b/codegen/src/lib.rs @@ -19,7 +19,7 @@ fn type_identifier>(id: S) -> String { fn identifier>(id: S) -> String { let id = id.as_ref(); match id { - "type" | "static" | "virtual" | "abstract" | "in" | "if" | "enum" | "match" => format!("{}_", id), + "type" | "static" | "virtual" | "abstract" | "in" | "if" | "enum" | "match" | "use" => format!("{}_", id), s if s.as_bytes()[0].is_ascii_digit() => format!("_{}", s), id => id.replace("-", "_") } diff --git a/flake.lock b/flake.lock index d4740a4..bef0105 100644 --- a/flake.lock +++ b/flake.lock @@ -95,16 +95,16 @@ "schema": { "flake": false, "locked": { - "lastModified": 1670964877, - "narHash": "sha256-EWLdGsWfnplMH162uN6dMo4ntkV3+Mb6XJd0LpM+2WA=", + "lastModified": 1725380306, + "narHash": "sha256-CT+aY/JV4xuEEC26/e1NBUEPBlw3YQpAy2mm86d1Dn8=", "owner": "arcnmx", "repo": "qemu-qapi-filtered", - "rev": "a6538cf79850854e1d444491fb6a84e200ac4a72", + "rev": "69f820d7ff45927cce1f251a01a1b1a3da8b2d86", "type": "github" }, "original": { "owner": "arcnmx", - "ref": "v7.2.0", + "ref": "v9.1.0", "repo": "qemu-qapi-filtered", "type": "github" } diff --git a/flake.nix b/flake.nix index 48562d8..af89ffe 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ type = "github"; owner = "arcnmx"; repo = "qemu-qapi-filtered"; - ref = "v7.2.0"; # keep in sync with schema submodule + ref = "v9.1.0"; # keep in sync with schema submodule }; rust = { url = "github:arcnmx/nixexprs-rust"; diff --git a/qmp/schema/qapi/rdma.json b/qmp/schema/qapi/rdma.json deleted file mode 120000 index 3592bf0..0000000 --- a/qmp/schema/qapi/rdma.json +++ /dev/null @@ -1 +0,0 @@ -../../../schema/qapi/rdma.json \ No newline at end of file diff --git a/qmp/schema/qapi/vfio.json b/qmp/schema/qapi/vfio.json new file mode 120000 index 0000000..a1a39d3 --- /dev/null +++ b/qmp/schema/qapi/vfio.json @@ -0,0 +1 @@ +../../../schema/qapi/vfio.json \ No newline at end of file diff --git a/schema b/schema index 9f4ce25..69f820d 160000 --- a/schema +++ b/schema @@ -1 +1 @@ -Subproject commit 9f4ce252520ca351e2d269b9dff4f74c02da6983 +Subproject commit 69f820d7ff45927cce1f251a01a1b1a3da8b2d86