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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Gerd Hoffmann
2009-Jun-11 09:32 UTC
[Xen-devel] [PATCH RESEND 1/4] xen_disk: move sanity check to the correct place
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/xen_disk.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index f95e373..659a839 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -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) {
--
1.6.2.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Gerd Hoffmann
2009-Jun-11 09:32 UTC
[Xen-devel] [PATCH RESEND 2/4] xen: adapt to qemu_machine changes
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/xen_machine_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index f59f633..6ae5000 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -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, -- 1.6.2.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Gerd Hoffmann
2009-Jun-11 09:32 UTC
[Xen-devel] [PATCH RESEND 3/4] include inttypes.h in xen.h
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/xen.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/hw/xen.h b/hw/xen.h
index 3c8da41..780dcf7 100644
--- a/hw/xen.h
+++ b/hw/xen.h
@@ -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 {
--
1.6.2.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Gerd Hoffmann
2009-Jun-11 09:32 UTC
[Xen-devel] [PATCH RESEND 4/4] xen nic: check tx queue after connect.
Needed 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.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/xen_nic.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index 9a3c870..e4f71f7 100644
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -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;
}
--
1.6.2.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Blue Swirl
2009-Jun-13 13:41 UTC
[Xen-devel] Re: [Qemu-devel] [PATCH RESEND 0/4] xen: misc fixes.
On 6/11/09, Gerd Hoffmann <kraxel@redhat.com> wrote:> 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. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel