[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] hw/xen: use correct default protocol for xen-block on x86
From: |
David Woodhouse |
Subject: |
[PULL 7/7] hw/xen: use correct default protocol for xen-block on x86 |
Date: |
Mon, 6 Nov 2023 10:39:55 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Even on x86_64 the default protocol is the x86-32 one if the guest doesn't
specifically ask for x86-64.
Cc: qemu-stable@nongnu.org
Fixes: b6af8926fb85 ("xen: add implementations of xen-block connect and
disconnect functions...")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/block/xen-block.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index a07cd7eb5d..bfa53960c3 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -115,9 +115,13 @@ static void xen_block_connect(XenDevice *xendev, Error
**errp)
return;
}
- if (xen_device_frontend_scanf(xendev, "protocol", "%ms",
- &str) != 1) {
- protocol = BLKIF_PROTOCOL_NATIVE;
+ if (xen_device_frontend_scanf(xendev, "protocol", "%ms", &str) != 1) {
+ /* x86 defaults to the 32-bit protocol even for 64-bit guests. */
+ if (object_dynamic_cast(OBJECT(qdev_get_machine()), "x86-machine")) {
+ protocol = BLKIF_PROTOCOL_X86_32;
+ } else {
+ protocol = BLKIF_PROTOCOL_NATIVE;
+ }
} else {
if (strcmp(str, XEN_IO_PROTO_ABI_X86_32) == 0) {
protocol = BLKIF_PROTOCOL_X86_32;
--
2.41.0
- [PULL 0/7] xenfv-stable queue, David Woodhouse, 2023/11/06
- [PULL 3/7] hw/xen: select kernel mode for per-vCPU event channel upcall vector, David Woodhouse, 2023/11/06
- [PULL 2/7] i386/xen: fix per-vCPU upcall vector for Xen emulation, David Woodhouse, 2023/11/06
- [PULL 4/7] hw/xen: don't clear map_track[] in xen_gnttab_reset(), David Woodhouse, 2023/11/06
- [PULL 1/7] i386/xen: Don't advertise XENFEAT_supervisor_mode_kernel, David Woodhouse, 2023/11/06
- [PULL 7/7] hw/xen: use correct default protocol for xen-block on x86,
David Woodhouse <=
- [PULL 6/7] hw/xen: take iothread mutex in xen_evtchn_reset_op(), David Woodhouse, 2023/11/06
- [PULL 5/7] hw/xen: fix XenStore watch delivery to guest, David Woodhouse, 2023/11/06
- Re: [PULL 0/7] xenfv-stable queue, Stefan Hajnoczi, 2023/11/06