From aef2e3e9560b7964980042f5704367bb30a1d5ef Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Fri, 6 Feb 2026 18:08:35 +0800 Subject: [PATCH] fix(region,host): rename screen dump info structure (#24257) --- pkg/apis/compute/guest_image.go | 2 +- pkg/compute/models/guest_actions.go | 2 +- pkg/compute/models/guestscreendump.go | 2 +- pkg/hostman/guestman/qemu-kvm.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/compute/guest_image.go b/pkg/apis/compute/guest_image.go index 6f8c5c605f..6783d74c04 100644 --- a/pkg/apis/compute/guest_image.go +++ b/pkg/apis/compute/guest_image.go @@ -28,7 +28,7 @@ type SImagesInGuest struct { DataImages []SSubImage } -type SGuestScreenDump struct { +type SGuestScreenDumpInfo struct { S3AccessKey string S3SecretKey string S3Endpoint string diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index d4d743a3a4..36ed2b377b 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -143,7 +143,7 @@ func (self *SGuest) PerformEvent(ctx context.Context, userCred mcclient.TokenCre kwargs := jsonutils.NewDict() kwargs.Set("reason", jsonutils.NewString(event)) if data.Contains("screen_dump_info") { - screenDumpInfo := api.SGuestScreenDump{} + screenDumpInfo := api.SGuestScreenDumpInfo{} if err := data.Unmarshal(&screenDumpInfo, "screen_dump_info"); err != nil { log.Errorf("failed unmarshal screen_dump_info %s", err) } else { diff --git a/pkg/compute/models/guestscreendump.go b/pkg/compute/models/guestscreendump.go index 3bd2eb4398..81bae5f70b 100644 --- a/pkg/compute/models/guestscreendump.go +++ b/pkg/compute/models/guestscreendump.go @@ -77,7 +77,7 @@ func (self *SGuestScreenDump) Delete(ctx context.Context, userCred mcclient.Toke return db.DeleteModel(ctx, userCred, self) } -func (self *SGuest) SaveGuestScreenDump(ctx context.Context, userCred mcclient.TokenCredential, screenDumpInfo *api.SGuestScreenDump) (*SGuestScreenDump, error) { +func (self *SGuest) SaveGuestScreenDump(ctx context.Context, userCred mcclient.TokenCredential, screenDumpInfo *api.SGuestScreenDumpInfo) (*SGuestScreenDump, error) { sd := new(SGuestScreenDump) sd.SetModelManager(GuestScreenDumpManager, sd) sd.GuestId = self.GetId() diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 7dd5f3910f..f5d5c671b4 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -1242,7 +1242,7 @@ func (s *SKVMGuestInstance) eventGuestPaniced(event *monitor.Event) { if err != nil { log.Errorf("faild put screenDumpPath %s to s3 %s", screenDumpPath, err) } else { - screenDumpInfo := api.SGuestScreenDump{ + screenDumpInfo := api.SGuestScreenDumpInfo{ S3AccessKey: options.HostOptions.S3AccessKey, S3SecretKey: options.HostOptions.S3SecretKey, S3Endpoint: options.HostOptions.S3Endpoint,