mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
pc,virtio: regression fixes
fixes issues from the last pull request: unresolved symbols for taargets without acpi typo in a comment in checkpatch virtio buffer overflow Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmNtZ0gPHG1zdEByZWRo YXQuY29tAAoJECgfDbjSjVRpc/oIAIYNoZZGbAd9kvePlwO9mDiw8mMILNo2ylnh RXNUggqmNy/A4Tiu9WFFUwHlT7CWUQAz6gYTyC3eyr7rz87GhjF16EQ+hMOi9wVr MlgbYyvp+/MBQDdJGbJJVXxL1/wmC4LAQws8S3AVY++dvEegxod7uC2vF8abHUP+ vvihz+SHqhDFL5TSLITNOWQfIp4KIaNIx2ZugHI7mYKUHS7YwW38QC3dScTQlsV/ /qr1YhJ9mGFWBq+dFytBwcQjA+NSKN2wQJtEQadGO7cTzcrBenLewoN1VOKcv2+s jTNAt7Q973HVAQMYWuQB5272S3Xar1ArpUPxm6IwEbYB5Q9OJCg= =me5Q -----END PGP SIGNATURE----- Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging pc,virtio: regression fixes fixes issues from the last pull request: unresolved symbols for taargets without acpi typo in a comment in checkpatch virtio buffer overflow Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # -----BEGIN PGP SIGNATURE----- # # iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmNtZ0gPHG1zdEByZWRo # YXQuY29tAAoJECgfDbjSjVRpc/oIAIYNoZZGbAd9kvePlwO9mDiw8mMILNo2ylnh # RXNUggqmNy/A4Tiu9WFFUwHlT7CWUQAz6gYTyC3eyr7rz87GhjF16EQ+hMOi9wVr # MlgbYyvp+/MBQDdJGbJJVXxL1/wmC4LAQws8S3AVY++dvEegxod7uC2vF8abHUP+ # vvihz+SHqhDFL5TSLITNOWQfIp4KIaNIx2ZugHI7mYKUHS7YwW38QC3dScTQlsV/ # /qr1YhJ9mGFWBq+dFytBwcQjA+NSKN2wQJtEQadGO7cTzcrBenLewoN1VOKcv2+s # jTNAt7Q973HVAQMYWuQB5272S3Xar1ArpUPxm6IwEbYB5Q9OJCg= # =me5Q # -----END PGP SIGNATURE----- # gpg: Signature made Thu 10 Nov 2022 16:04:08 EST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: virtio-net: fix for heap-buffer-overflow display: include dependencies explicitly checkpatch: typo fix Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
commit
67c6597ad1
|
@ -12,6 +12,7 @@
|
|||
#include "ati_regs.h"
|
||||
#include "qemu/log.h"
|
||||
#include "ui/pixel_ops.h"
|
||||
#include "ui/console.h"
|
||||
|
||||
/*
|
||||
* NOTE:
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "ui/pixel_ops.h"
|
||||
#include "cirrus_vga_internal.h"
|
||||
#include "qom/object.h"
|
||||
#include "ui/console.h"
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "hw/isa/isa.h"
|
||||
#include "cirrus_vga_internal.h"
|
||||
#include "qom/object.h"
|
||||
#include "ui/console.h"
|
||||
|
||||
#define TYPE_ISA_CIRRUS_VGA "isa-cirrus-vga"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(ISACirrusVGAState, ISA_CIRRUS_VGA)
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
#include "qemu/timer.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "ui/console.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_ISA_VGA "isa-vga"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "hw/sysbus.h"
|
||||
#include "hw/display/vga.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "ui/console.h"
|
||||
#include "vga_int.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "migration/vmstate.h"
|
||||
#include "vga_int.h"
|
||||
#include "ui/pixel_ops.h"
|
||||
#include "ui/console.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/loader.h"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "vga_int.h"
|
||||
#include "vga_regs.h"
|
||||
#include "ui/pixel_ops.h"
|
||||
#include "ui/console.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/xen/xen.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include "exec/ioport.h"
|
||||
#include "exec/memory.h"
|
||||
#include "ui/console.h"
|
||||
|
||||
#include "hw/display/bochs-vbe.h"
|
||||
#include "hw/acpi/acpi_aml_interface.h"
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "hw/qdev-properties.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "qom/object.h"
|
||||
#include "ui/console.h"
|
||||
|
||||
#undef VERBOSE
|
||||
#define HW_RECT_ACCEL
|
||||
|
|
|
@ -549,7 +549,14 @@ static RxFilterInfo *virtio_net_query_rxfilter(NetClientState *nc)
|
|||
static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
|
||||
{
|
||||
VirtIONet *n = VIRTIO_NET(vdev);
|
||||
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
||||
NetClientState *nc;
|
||||
|
||||
/* validate queue_index and skip for cvq */
|
||||
if (queue_index >= n->max_queue_pairs * 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
||||
|
||||
if (!nc->peer) {
|
||||
return;
|
||||
|
@ -566,9 +573,16 @@ static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
|
|||
static void virtio_net_queue_enable(VirtIODevice *vdev, uint32_t queue_index)
|
||||
{
|
||||
VirtIONet *n = VIRTIO_NET(vdev);
|
||||
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
||||
NetClientState *nc;
|
||||
int r;
|
||||
|
||||
/* validate queue_index and skip for cvq */
|
||||
if (queue_index >= n->max_queue_pairs * 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
|
||||
|
||||
if (!nc->peer || !vdev->vhost_started) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -148,7 +148,9 @@ struct VirtioDeviceClass {
|
|||
void (*set_config)(VirtIODevice *vdev, const uint8_t *config);
|
||||
void (*reset)(VirtIODevice *vdev);
|
||||
void (*set_status)(VirtIODevice *vdev, uint8_t val);
|
||||
/* Device must validate queue_index. */
|
||||
void (*queue_reset)(VirtIODevice *vdev, uint32_t queue_index);
|
||||
/* Device must validate queue_index. */
|
||||
void (*queue_enable)(VirtIODevice *vdev, uint32_t queue_index);
|
||||
/* For transitional devices, this is a bitmap of features
|
||||
* that are only exposed on the legacy interface but not
|
||||
|
|
|
@ -132,6 +132,8 @@ typedef struct Visitor Visitor;
|
|||
typedef struct VMChangeStateEntry VMChangeStateEntry;
|
||||
typedef struct VMStateDescription VMStateDescription;
|
||||
typedef struct DumpState DumpState;
|
||||
typedef struct GraphicHwOps GraphicHwOps;
|
||||
typedef struct QEMUCursor QEMUCursor;
|
||||
|
||||
/*
|
||||
* Pointer types
|
||||
|
|
|
@ -1682,7 +1682,7 @@ sub process {
|
|||
|
||||
# Block comments use /* on a line of its own
|
||||
my $commentline = $rawline;
|
||||
while ($commentline =~ s@^(\+.*)/\*.*\*/@$1@o) { # remove inline #inline /*...*/
|
||||
while ($commentline =~ s@^(\+.*)/\*.*\*/@$1@o) { # remove inline /*...*/
|
||||
}
|
||||
if ($commentline =~ m@^\+.*/\*\*?+[ \t]*[^ \t]@) { # /* or /** non-blank
|
||||
WARN("Block comments use a leading /* on a separate line\n" . $herecurr);
|
||||
|
|
Loading…
Reference in a new issue