[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/28] hw/xen: use correct default protocol for xen-block on x
From: |
David Woodhouse |
Subject: |
[PATCH v3 07/28] hw/xen: use correct default protocol for xen-block on x86 |
Date: |
Wed, 25 Oct 2023 15:50:21 +0100 |
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.
Fixes: b6af8926fb85 ("xen: add implementations of xen-block connect and
disconnect functions...")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/block/xen-block.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index a07cd7eb5d..64470fc579 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -117,7 +117,11 @@ static void xen_block_connect(XenDevice *xendev, Error
**errp)
if (xen_device_frontend_scanf(xendev, "protocol", "%ms",
&str) != 1) {
- protocol = BLKIF_PROTOCOL_NATIVE;
+ /* 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.40.1
- Re: [PATCH v3 20/28] net: do not delete nics in net_cleanup(), (continued)
- [PATCH v3 08/28] i386/xen: Ignore VCPU_SSHOTTMR_future flag in set_singleshot_timer(), David Woodhouse, 2023/10/25
- [PATCH v3 10/28] include: update Xen public headers to Xen 4.17.2 release, David Woodhouse, 2023/10/25
- [PATCH v3 24/28] net: add qemu_create_nic_bus_devices(), David Woodhouse, 2023/10/25
- [PATCH v3 15/28] hw/xen: do not repeatedly try to create a failing backend device, David Woodhouse, 2023/10/25
- [PATCH v3 04/28] hw/xen: don't clear map_track[] in xen_gnttab_reset(), David Woodhouse, 2023/10/25
- [PATCH v3 25/28] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2023/10/25
- [PATCH v3 07/28] hw/xen: use correct default protocol for xen-block on x86,
David Woodhouse <=
- [PATCH v3 11/28] i386/xen: advertise XEN_HVM_CPUID_UPCALL_VECTOR in CPUID, David Woodhouse, 2023/10/25
- [PATCH v3 06/28] hw/xen: take iothread mutex in xen_evtchn_reset_op(), David Woodhouse, 2023/10/25
- [PATCH v3 16/28] hw/xen: update Xen console to XenDevice model, David Woodhouse, 2023/10/25
- [PATCH v3 19/28] hw/xen: update Xen PV NIC to XenDevice model, David Woodhouse, 2023/10/25
- [PATCH v3 02/28] i386/xen: fix per-vCPU upcall vector for Xen emulation, David Woodhouse, 2023/10/25
- [PATCH v3 21/28] xen-platform: unplug AHCI disks, David Woodhouse, 2023/10/25