Compare commits

..

No commits in common. "971db9eab1c2f4f555427386181c1b8cc633172b" and "a316b6b3dbfa736b3ce0b053338d2c80de9e0e1b" have entirely different histories.

3 changed files with 45 additions and 3 deletions

View File

@ -1,7 +1,7 @@
diff -Naur --no-dereference a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c diff -Naur --no-dereference a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
--- a/arch/x86/kvm/vmx/vmx.c 2024-07-01 21:03:34.000000000 +0300 --- a/arch/x86/kvm/vmx/vmx.c 2024-07-01 21:03:34.000000000 +0300
+++ b/arch/x86/kvm/vmx/vmx.c 2024-07-01 20:24:05.000000000 +0300 +++ b/arch/x86/kvm/vmx/vmx.c 2024-07-01 20:24:05.000000000 +0300
@@ -6128,6 +6128,7 @@ @@ -6137,6 +6137,7 @@
[EXIT_REASON_ENCLS] = handle_encls, [EXIT_REASON_ENCLS] = handle_encls,
[EXIT_REASON_BUS_LOCK] = handle_bus_lock_vmexit, [EXIT_REASON_BUS_LOCK] = handle_bus_lock_vmexit,
[EXIT_REASON_NOTIFY] = handle_notify, [EXIT_REASON_NOTIFY] = handle_notify,
@ -13,7 +13,7 @@ diff -Naur --no-dereference a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
diff -Naur --no-dereference a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c diff -Naur --no-dereference a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
--- a/arch/x86/kvm/vmx/vmx.c 2024-07-01 21:03:34.000000000 +0300 --- a/arch/x86/kvm/vmx/vmx.c 2024-07-01 21:03:34.000000000 +0300
+++ b/arch/x86/kvm/vmx/vmx.c 2024-07-01 20:24:05.000000000 +0300 +++ b/arch/x86/kvm/vmx/vmx.c 2024-07-01 20:24:05.000000000 +0300
@@ -6070,6 +6070,34 @@ @@ -6079,6 +6079,34 @@
return 1; return 1;
} }

View File

@ -0,0 +1,42 @@
diff -Naur --no-dereference a/hw/ide/atapi.c b/hw/ide/atapi.c
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -797,8 +797,8 @@
buf[5] = 0; /* reserved */
buf[6] = 0; /* reserved */
buf[7] = 0; /* reserved */
- padstr8(buf + 8, 8, "QEMU");
- padstr8(buf + 16, 16, "QEMU DVD-ROM");
+ padstr8(buf + 8, 8, "ASUS");
+ padstr8(buf + 16, 16, "ASUS DVD-ROM");
padstr8(buf + 32, 4, s->version);
idx = 36;
}
diff -Naur --no-dereference a/hw/ide/core.c b/hw/ide/core.c
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2627,20 +2627,20 @@
pstrcpy(s->drive_serial_str, sizeof(s->drive_serial_str), dev->serial);
} else {
snprintf(s->drive_serial_str, sizeof(s->drive_serial_str),
- "QM%05d", s->drive_serial);
+ "ASUS%05d", s->drive_serial);
}
if (dev->model) {
pstrcpy(s->drive_model_str, sizeof(s->drive_model_str), dev->model);
} else {
switch (kind) {
case IDE_CD:
- strcpy(s->drive_model_str, "QEMU DVD-ROM");
+ strcpy(s->drive_model_str, "ASUS DVD-ROM");
break;
case IDE_CFATA:
- strcpy(s->drive_model_str, "QEMU MICRODRIVE");
+ strcpy(s->drive_model_str, "ASUS MICRODRIVE");
break;
default:
- strcpy(s->drive_model_str, "QEMU HARDDISK");
+ strcpy(s->drive_model_str, "ASUS HARDDISK");
break;
}
}

@ -1 +1 @@
Subproject commit c91444c32956d98f278eb934250e8d56aa08cb01 Subproject commit 775c9e744e6f9ebd064b5a962e10a72f4a9de642