xen: misc fixes.
cover xen: misc fixes.
Hi,
This patch series is a collection of bugfixes for the xen backend drivers.
Can also be pulled from
git://git.et.redhat.com/qemu-kraxel.git (branch xen.v1).
please apply,
Gerd
PATCH RESEND 1/4 xen_disk: move sanity check to the correct place
--- hw/xen_disk.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
hw/xen_disk.c +5 -4
@@ -179,10 +179,6 @@ static int ioreq_parse(struct ioreq *ioreq)switch (ioreq->req.operation) {case BLKIF_OP_READ : ioreq->prot =PROT_WRITE ;/* to memory */ -if (ioreq->req.operation !=BLKIF_OP_READ && blkdev->mode[0 ] !='w' ) { -xen_be_printf (&blkdev->xendev,0 ,"error: write req for ro device\n" ); - goto err; - }break ;case BLKIF_OP_WRITE_BARRIER :if (!syncwrite)
@@ -199,6 +195,11 @@ static int ioreq_parse(struct ioreq *ioreq) goto err; }; +if (ioreq->req.operation !=BLKIF_OP_READ && blkdev->mode[0 ] !='w' ) { +xen_be_printf (&blkdev->xendev,0 ,"error: write req for ro device\n" ); + goto err; + } + ioreq->start = ioreq->req.sector_number * blkdev->file_blk;for (i =0 ; i < ioreq->req.nr_segments; i++) {if (i ==BLKIF_MAX_SEGMENTS_PER_REQUEST ) {
Signature · 1 line
1.6.2.2
PATCH RESEND 2/4 xen: adapt to qemu_machine changes
In reply to Gerd Hoffmann--- hw/xen_machine_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/xen_machine_pv.c +1 -1
@@ -32,7 +32,7 @@uint32_t xen_domid;enum xen_mode xen_mode =XEN_EMULATE ; -static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size, +static void xen_init_pv(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline,
Signature · 1 line
1.6.2.2
PATCH RESEND 3/4 include inttypes.h in xen.h
In reply to Gerd Hoffmann--- hw/xen.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
hw/xen.h +1 -0
@@ -6,6 +6,7 @@* must not depend on any xen headers being present in * /usr/include/xen, so it can be included unconditionally. */ +#include <inttypes.h> /* xen-machine.c */ enum xen_mode {
Signature · 1 line
1.6.2.2
PATCH RESEND 4/4 xen nic: check tx queue after connect.
In reply to Gerd HoffmannNeeded for savevm/loadvm + migration: In that case the queue might already have packets on (re-)connect. The guest wouldn't notify us because notifications are only sent when stuffing a packet into an empty queue.
--- hw/xen_nic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
hw/xen_nic.c +2 -0
@@ -356,6 +356,8 @@ static int net_connect(struct XenDevice *xendev)"remote port %d, local port %d\n" , netdev->tx_ring_ref, netdev->rx_ring_ref, netdev->xendev.remote_port, netdev->xendev.local_port); + +net_tx_packets (netdev);return 0 ; }
Signature · 1 line
1.6.2.2
Blue Swirl
AppliedQuoted 9 lines · Gerd Hoffmann
Hi,
This patch series is a collection of bugfixes for the xen backend drivers.
Can also be pulled from
git://git.et.redhat.com/qemu-kraxel.git(branch xen.v1).please apply,
Thanks, applied.